Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 39387: - Change "pollchar" to also empty the keyboard buffer after polling the character and rename it to "pollchar_and_empty" accordingly. This fixes a bug revealed by silverblade's FOSDEM CD: If you boot FreeLoader with a boot menu from CD and press a key after that "Press any key to boot from CD" message, that keypress was forwarded to FreeLoader as well. - Remove the already unused and now unsynchronized "pollchar" from the regression testing boot sector.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Feb 4 07:13:21 2009 New Revision: 39387 URL: http://svn.reactos.org/svn/reactos?rev=39387&view=rev Log: - Change "pollchar" to also empty the keyboard buffer after polling the character and rename it to "pollchar_and_empty" accordingly. This fixes a bug revealed by silverblade's FOSDEM CD: If you boot FreeLoader with a boot menu from CD and press a key after that "Press any key to boot from CD" message, that keypress was forwarded to FreeLoader as well. - Remove the already unused and now unsynchronized "pollchar" from the regression testing boot sector. Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Wed Feb 4 07:13:21 2009 @@ -132,12 +132,7 @@ ; Make sure the keyboard buffer is empty %ifdef WAIT_FOR_KEY -.kbd_buffer_test: - call pollchar - jz .kbd_buffer_empty - call getchar - jmp .kbd_buffer_test -.kbd_buffer_empty: + call pollchar_and_empty ; Check for MBR on harddisk pusha @@ -166,7 +161,7 @@ add eax, 19 ; .poll_again: - call pollchar + call pollchar_and_empty jnz .boot_cdrom mov ebx, [BIOS_timer] @@ -921,12 +916,24 @@ ; -; pollchar: check if we have an input character pending (ZF = 0) -; -pollchar: +; pollchar_and_empty: check if we have an input character pending (ZF = 0) and empty the input buffer afterwards +; +pollchar_and_empty: pushad - mov ah,1 ; Poll keyboard + mov ah, 1 ; Poll keyboard int 16h + jz .end +.empty_buffer: + mov ah, 0 ; Read from keyboard + int 16h + + mov ah, 1 ; Poll keyboard again + int 16h + jz .buffer_emptied + jmp .empty_buffer +.buffer_emptied: + and ax, ax ; ZF = 0 +.end: popad ret Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Wed Feb 4 07:13:21 2009 @@ -887,18 +887,6 @@ ret -; -; pollchar: check if we have an input character pending (ZF = 0) -; -pollchar: - pushad - mov ah,1 ; Poll keyboard - int 16h - popad - ret - - - isolinux_banner db CR, LF, 'Loading IsoBoot...', CR, LF, 0 copyright_str db ' Copyright (C) 1994-2002 H. Peter Anvin', CR, LF, 0 presskey_msg db 'Press any key to boot from CD', 0

16 years, 5 months

[dchapyshev] 39386: - Fix build

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 4 07:12:35 2009 New Revision: 39386 URL: http://svn.reactos.org/svn/reactos?rev=39386&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Wed Feb 4 07:12:35 2009 @@ -249,7 +249,7 @@ 249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW 250 stdcall -noname PathRemoveExtension(wstr) PathRemoveExtensionW 251 stdcall -noname PathRemoveArgs(wstr) PathRemoveArgsW -252 stdcall -noname PathIsURL(wstr) # Fixme +252 stdcall -noname PathIsURL(wstr) shell32.PathIsURL # Fixme 253 stub -noname SHIsCurrentProcessConsoleSession 254 stub -noname DisconnectWindowsDialog 255 stdcall Options_RunDLLA(ptr ptr str long)

16 years, 5 months

[dchapyshev] 39385: - More stub implementation - Fix params for LogoffWindowsDialog

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 4 06:51:47 2009 New Revision: 39385 URL: http://svn.reactos.org/svn/reactos?rev=39385&view=rev Log: - More stub implementation - Fix params for LogoffWindowsDialog Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.c trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Wed Feb 4 06:51:47 2009 @@ -607,10 +607,10 @@ } /************************************************************************* - * LogoffWindowsDialog [SHELL32.54] - */ - -int WINAPI LogoffWindowsDialog(DWORD uFlags) + * LogoffWindowsDialog [SHELL32.54] + */ + +int WINAPI LogoffWindowsDialog(HWND hWndOwner) { UNIMPLEMENTED; ExitWindowsEx(EWX_LOGOFF, 0); Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Wed Feb 4 06:51:47 2009 @@ -4,14 +4,14 @@ 4 stdcall SHChangeNotifyDeregister(long) 5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) 6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) -7 stub -noname SHLookupIconIndexA -8 stub -noname SHLookupIconIndexW -9 stub PifMgr_OpenProperties -10 stub PifMgr_GetProperties -11 stub PifMgr_SetProperties -12 stub -noname SHStartNetConnectionDialogA -13 stub PifMgr_CloseProperties -14 stub SHStartNetConnectionDialogW +7 stdcall -noname SHLookupIconIndexA(str long long) +8 stdcall -noname SHLookupIconIndexW(wstr long long) +9 stdcall PifMgr_OpenProperties(wstr wstr long long) +10 stdcall PifMgr_GetProperties(ptr wstr ptr long long) +11 stdcall PifMgr_SetProperties(ptr wstr ptr long long) +12 stdcall -noname SHStartNetConnectionDialogA(ptr str long) +13 stdcall PifMgr_CloseProperties(ptr long) +14 stdcall SHStartNetConnectionDialogW(ptr wstr long) 15 stdcall -noname ILGetDisplayName(ptr ptr) 16 stdcall ILFindLastID(ptr) 17 stdcall ILRemoveLastID(ptr) @@ -19,7 +19,7 @@ 19 stdcall ILCloneFirst(ptr) 20 stdcall -noname ILGlobalClone(ptr) 21 stdcall ILIsEqual(ptr ptr) -22 stub DAD_DragEnterEx2 +22 stdcall DAD_DragEnterEx2(ptr long long ptr) 23 stdcall ILIsParent(ptr ptr long) 24 stdcall ILFindChild(ptr ptr) 25 stdcall ILCombine(ptr ptr) @@ -50,8 +50,8 @@ 50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(wstr) PathGetArgsW -53 stub -noname IsSuspendAllowed -54 stub -noname LogoffWindowsDialog +53 stdcall -noname IsSuspendAllowed() +54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW 56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW 57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW @@ -66,22 +66,22 @@ 66 stdcall IsNetDrive(long) 67 stdcall Shell_MergeMenus(long long long long long long) 68 stdcall SHGetSetSettings(ptr long long) -69 stub -noname SHGetNetResource # Fixme +69 stdcall -noname SHGetNetResource(ptr long ptr long) 70 stdcall -noname SHCreateDefClassObject(long long long long long) 71 stdcall -noname Shell_GetImageLists(ptr ptr) 72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW 73 stdcall SHShellFolderView_Message(long long long) 74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) 75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) -76 stub DragQueryInfo # Fixme +76 stdcall DragQueryInfo(ptr ptr) 77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) 78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme 79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme 80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) 81 stdcall OpenAs_RunDLLA(long long str long) -82 stub -noname DDECreatePostNotify +82 stdcall -noname DDECreatePostNotify(ptr) 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) -84 stub SHIsBadInterfacePtr # Fixme +84 stdcall SHIsBadInterfacePtr(ptr long) # Fixme 85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA 86 stdcall -noname SHRegisterDragDrop(long ptr) 87 stdcall -noname SHRevokeDragDrop(long) @@ -101,8 +101,8 @@ 101 stdcall OpenAs_RunDLLW(long long wstr long) 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) 103 stdcall SignalFileOpen(long) -104 stub Activate_RunDLL -105 stub AppCompat_RunDLLW +104 stdcall Activate_RunDLL(long ptr ptr ptr) +105 stdcall AppCompat_RunDLLW(ptr ptr wstr long) 106 stdcall CheckEscapesA(str long) 107 stdcall CheckEscapesW(wstr long) 108 stdcall CommandLineToArgvW(wstr ptr) @@ -111,7 +111,7 @@ 111 stdcall Control_FillCache_RunDLLW(long long long long) 112 stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA 113 stdcall Control_RunDLLA(ptr ptr str long) -114 stub Control_RunDLLAsUserW +114 stdcall Control_RunDLLAsUserW(ptr ptr wstr long) 115 stdcall Control_RunDLLW(ptr ptr wstr long) 116 stdcall DllCanUnloadNow() 117 stdcall DllGetClassObject(ptr ptr ptr) @@ -139,7 +139,7 @@ 139 stdcall DragFinish(long) 140 stdcall DragQueryFile(long long ptr long) DragQueryFileA 141 stdcall DragQueryFileA(long long ptr long) -142 stub DragQueryFileAorW +142 stdcall DragQueryFileAorW(ptr long wstr long long long) 143 stdcall DragQueryFileW(long long ptr long) 144 stdcall DragQueryPoint(long ptr) 145 stdcall -noname PathFindOnPath(wstr wstr) PathFindOnPathW @@ -157,7 +157,7 @@ 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(wstr long long) SHPathGetExtensionW 159 stdcall -noname PathIsDirectory(wstr) PathIsDirectoryW -160 stub SHNetConnectionDialog # Fixme +160 stdcall SHNetConnectionDialog(ptr wstr long) # Fixme 161 stdcall SHRunControlPanel(long long) 162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # Fixme 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # Fixme @@ -174,7 +174,7 @@ 174 stdcall SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathW 176 stdcall SHSetInstanceExplorer(long) -177 stub DAD_SetDragImageFromListView +177 stdcall DAD_SetDragImageFromListView(ptr long long) 178 stdcall SHObjectProperties(long long wstr wstr) 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) @@ -182,9 +182,9 @@ 182 varargs ShellMessageBoxA(long long str str long) 183 varargs ShellMessageBoxW(long long wstr wstr long) 184 stdcall -noname ArrangeWindows(long long long long long) # Fixme -185 stub -noname SHHandleDiskFull # Fixme +185 stdcall -noname SHHandleDiskFull(ptr long) # Fixme 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) -187 stub -noname ILGetPseudoNameW # Fixme +187 stdcall -noname ILGetPseudoNameW(ptr ptr wstr long) # Fixme 188 stdcall -noname ShellDDEInit(long) 189 stdcall ILCreateFromPathA(str) 190 stdcall ILCreateFromPathW(wstr) @@ -194,7 +194,7 @@ 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) 195 stdcall SHFree(ptr) 196 stdcall SHAlloc(long) -197 stub -noname SHGlobalDefect +197 stdcall -noname SHGlobalDefect(long) 198 stdcall -noname SHAbortInvokeCommand() 199 stdcall ExtractAssociatedIconA(long str ptr) 200 stdcall -noname SHLocalAlloc(long long) @@ -206,10 +206,10 @@ 206 stdcall ExtractAssociatedIconExA(long str long long) 207 stdcall ExtractAssociatedIconExW(long wstr long long) 208 stdcall ExtractAssociatedIconW(long wstr ptr) -209 stub -noname Int64ToString # Fixme -210 stub -noname LargeIntegerToString # Fixme -211 stub -noname Printers_GetPidl # Fixme -212 stub -noname Printers_AddPrinterPropPages +209 stdcall -noname Int64ToString(double wstr long long ptr long) # Fixme +210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) # Fixme +211 stdcall -noname Printers_GetPidl(ptr str) # Fixme +212 stdcall -noname Printers_AddPrinterPropPages(ptr ptr) 213 stdcall -noname Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall -noname Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) @@ -217,39 +217,39 @@ 217 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA 218 stdcall ExtractIconExA(str long ptr ptr long) 219 stdcall ExtractIconExW(wstr long ptr ptr long) -220 stub ExtractIconResInfoA -221 stub ExtractIconResInfoW +220 stdcall ExtractIconResInfoA(ptr str long ptr ptr) +221 stdcall ExtractIconResInfoW(ptr wstr long ptr ptr) 222 stdcall ExtractIconW(long wstr long) -223 stub ExtractVersionResource16W -224 stub FindExeDlgProc +223 stdcall ExtractVersionResource16W(wstr ptr) +224 stdcall FindExeDlgProc(ptr long ptr ptr) 225 stdcall FindExecutableA(str str ptr) 226 stdcall FindExecutableW(wstr wstr ptr) 227 stdcall FreeIconList(long) -228 stub InternalExtractIconListA -229 stub InternalExtractIconListW -230 stub -noname FirstUserLogon -231 stub -noname SHSetFolderPathA -232 stub -noname SHSetFolderPathW -233 stub -noname SHGetUserPicturePathW -234 stub -noname SHSetUserPicturePathW -235 stub -noname SHOpenEffectiveToken -236 stub -noname SHTestTokenPrivilegeW -237 stub -noname SHShouldShowWizards +228 stdcall InternalExtractIconListA(ptr str ptr) +229 stdcall InternalExtractIconListW(ptr wstr ptr) +230 stdcall -noname FirstUserLogon(wstr wstr) +231 stdcall -noname SHSetFolderPathA(long ptr long str) +232 stdcall -noname SHSetFolderPathW(long ptr long wstr) +233 stdcall -noname SHGetUserPicturePathW(wstr long ptr) +234 stdcall -noname SHSetUserPicturePathW(wstr long ptr) +235 stdcall -noname SHOpenEffectiveToken(ptr) +236 stdcall -noname SHTestTokenPrivilegeW(ptr ptr) +237 stdcall -noname SHShouldShowWizards(ptr) 238 stdcall Options_RunDLL(ptr ptr str long) -239 stub PathIsSlowW -240 stub PathIsSlowA -241 stub -noname SHGetUserDisplayName -242 stub -noname SHGetProcessDword +239 stdcall PathIsSlowW(wstr long) +240 stdcall PathIsSlowA(str long) +241 stdcall -noname SHGetUserDisplayName(wstr ptr) +242 stdcall -noname SHGetProcessDword(long long) 243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx 244 stdcall -noname SHInitRestricted(ptr ptr) -245 stub SHTestTokenMembership +245 stdcall SHTestTokenMembership(ptr ptr) 246 stub -noname SHInvokePrivilegedFunctionW 247 stub -noname SHGetActiveConsoleSessionId -248 stub -noname SHGetUserSessionId # Fixme +248 stdcall -noname SHGetUserSessionId(ptr) # Fixme 249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW 250 stdcall -noname PathRemoveExtension(wstr) PathRemoveExtensionW 251 stdcall -noname PathRemoveArgs(wstr) PathRemoveArgsW -252 stub -noname PathIsURL # Fixme +252 stdcall -noname PathIsURL(wstr) # Fixme 253 stub -noname SHIsCurrentProcessConsoleSession 254 stub -noname DisconnectWindowsDialog 255 stdcall Options_RunDLLA(ptr ptr str long) Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Wed Feb 4 06:51:47 2009 @@ -854,3 +854,566 @@ FIXME("SHGetShellFolderViewCB() stub\n"); return NULL; } + +/* + * Unimplemented + */ +INT +WINAPI +SHLookupIconIndexA(LPCSTR lpName, INT iIndex, UINT uFlags) +{ + FIXME("SHLookupIconIndexA() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +INT +WINAPI +SHLookupIconIndexW(LPCWSTR lpName, INT iIndex, UINT uFlags) +{ + FIXME("SHLookupIconIndexW() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +HANDLE +WINAPI +PifMgr_OpenProperties(LPWSTR lpAppPath, LPWSTR lpPifPath, UINT hInfIndex, UINT uUnknown) +{ + FIXME("PifMgr_OpenProperties() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +INT +WINAPI +PifMgr_GetProperties(HANDLE hHandle, LPWSTR lpName, LPVOID lpUnknown, INT iUnknown, UINT uUnknown) +{ + FIXME("PifMgr_GetProperties() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +INT +WINAPI +PifMgr_SetProperties(HANDLE hHandle, LPWSTR lpName, LPVOID lpUnknown, INT iUnknown, UINT uUnknown) +{ + FIXME("PifMgr_SetProperties() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHStartNetConnectionDialogA(HWND hwnd, + LPCSTR pszRemoteName, + DWORD dwType) +{ + FIXME("SHStartNetConnectionDialogA() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHStartNetConnectionDialogW(HWND hwnd, + LPCWSTR pszRemoteName, + DWORD dwType) +{ + FIXME("SHStartNetConnectionDialogW() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HANDLE +WINAPI +PifMgr_CloseProperties(HANDLE hHandle, UINT uUnknown) +{ + FIXME("PifMgr_CloseProperties() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +DAD_DragEnterEx2(HWND hwndTarget, + const POINT ptStart, + IDataObject *pdtObject) +{ + FIXME("DAD_DragEnterEx2() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +IsSuspendAllowed(VOID) +{ + FIXME("IsSuspendAllowed() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +UINT +WINAPI +SHGetNetResource(LPVOID lpUnknown1, UINT iIndex, LPVOID lpUnknown2, UINT cchMax) +{ + FIXME("SHGetNetResource() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +DragQueryInfo(HDROP hDrop, DRAGINFO *pDragInfo) +{ + FIXME("DragQueryInfo() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +LPVOID +WINAPI +DDECreatePostNotify(LPVOID lpUnknown) +{ + FIXME("DDECreatePostNotify() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHIsBadInterfacePtr(LPVOID pv, UINT ucb) +{ + FIXME("SHIsBadInterfacePtr() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +Activate_RunDLL(DWORD dwProcessId, LPVOID lpUnused1, LPVOID lpUnused2, LPVOID lpUnused3) +{ + FIXME("Activate_RunDLL() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +VOID +WINAPI +AppCompat_RunDLLW(HWND hwnd, HINSTANCE hInstance, LPWSTR pszCmdLine, int nCmdShow) +{ + FIXME("AppCompat_RunDLLW() stub\n"); +} + +/* + * Unimplemented + */ +VOID +WINAPI +Control_RunDLLAsUserW(HWND hwnd, HINSTANCE hInstance, LPWSTR pszCmdLine, int nCmdShow) +{ + FIXME("Control_RunDLLAsUserW() stub\n"); +} + +/* + * Unimplemented + */ +UINT +WINAPI +DragQueryFileAorW(HDROP hDrop, UINT iIndex, LPWSTR lpFile, UINT ucb, BOOL bUnicode, BOOL bShorten) +{ + FIXME("DragQueryFileAorW() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +DWORD +WINAPI +SHNetConnectionDialog(HWND hwndOwner, + LPCWSTR lpstrRemoteName, + DWORD dwType) +{ + FIXME("SHNetConnectionDialog() stub\n"); + return ERROR_INVALID_PARAMETER; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +DAD_SetDragImageFromListView(HWND hwnd, POINT pt) +{ + FIXME("DAD_SetDragImageFromListView() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +void +WINAPI +SHHandleDiskFull(HWND hwndOwner, UINT uDrive) +{ + FIXME("SHHandleDiskFull() stub\n"); +} + +/* + * Unimplemented + */ +BOOL +WINAPI +ILGetPseudoNameW(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, LPWSTR szStr, INT iUnknown) +{ + FIXME("ILGetPseudoNameW() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +VOID +WINAPI +SHGlobalDefect(DWORD dwUnknown) +{ + /* Unimplemented in WinXP SP3 */ + TRACE("SHGlobalDefect() stub\n"); +} + +/* + * Unimplemented + */ +LPITEMIDLIST +WINAPI +Printers_GetPidl(LPCITEMIDLIST pidl, LPCWSTR lpName) +{ + FIXME("Printers_GetPidl() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +INT +WINAPI +Int64ToString(LONGLONG llInt64, + LPWSTR lpOut, + UINT uSize, + BOOL bUseFormat, + NUMBERFMT *pNumberFormat, + DWORD dwNumberFlags) +{ + FIXME("Int64ToString() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +INT +WINAPI +LargeIntegerToString(LARGE_INTEGER *pLargeInt, + LPWSTR lpOut, + UINT uSize, + BOOL bUseFormat, + NUMBERFMT *pNumberFormat, + DWORD dwNumberFlags) +{ + FIXME("LargeIntegerToString() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +LONG +WINAPI +Printers_AddPrinterPropPages(LPVOID lpUnknown1, LPVOID lpUnknown2) +{ + FIXME("Printers_AddPrinterPropPages() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +WORD +WINAPI +ExtractIconResInfoA(HANDLE hHandle, + LPSTR lpFile, + WORD wIndex, + LPWORD lpSize, + LPHANDLE lpIcon) +{ + FIXME("ExtractIconResInfoA() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +WORD +WINAPI +ExtractIconResInfoW(HANDLE hHandle, + LPWSTR lpFile, + WORD wIndex, + LPWORD lpSize, + LPHANDLE lpIcon) +{ + FIXME("ExtractIconResInfoW() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +DWORD +WINAPI +ExtractVersionResource16W(LPWSTR lpName, LPHANDLE lpHandle) +{ + FIXME("ExtractVersionResource16W() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +BOOL* +WINAPI +FindExeDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + FIXME("FindExeDlgProc() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +HANDLE +WINAPI +InternalExtractIconListW(HANDLE hHandle, + LPWSTR lpFileName, + LPINT lpCount) +{ + FIXME("InternalExtractIconListW() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +HANDLE +WINAPI +InternalExtractIconListA(HANDLE hHandle, + LPSTR lpFileName, + LPINT lpCount) +{ + FIXME("InternalExtractIconListA() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +FirstUserLogon(LPWSTR lpUnknown1, LPWSTR lpUnknown2) +{ + FIXME("FirstUserLogon() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHSetFolderPathA(int csidl, + HANDLE hToken, + DWORD dwFlags, + LPCSTR pszPath) +{ + FIXME("SHSetFolderPathA() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHSetFolderPathW(int csidl, + HANDLE hToken, + DWORD dwFlags, + LPCWSTR pszPath) +{ + FIXME("SHSetFolderPathW() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHGetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) +{ + FIXME("SHGetUserPicturePathW() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHSetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) +{ + FIXME("SHGetUserPicturePathA() stub\n"); + return E_FAIL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHOpenEffectiveToken(LPVOID Token) +{ + FIXME("SHOpenEffectiveToken() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHTestTokenPrivilegeW(HANDLE hToken, LPDWORD ReturnLength) +{ + FIXME("SHTestTokenPrivilegeW() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHShouldShowWizards(LPVOID lpUnknown) +{ + FIXME("SHShouldShowWizards() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +PathIsSlowW(LPCWSTR pszFile, DWORD dwFileAttr) +{ + FIXME("PathIsSlowW() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +PathIsSlowA(LPCSTR pszFile, DWORD dwFileAttr) +{ + FIXME("PathIsSlowA() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +DWORD +WINAPI +SHGetUserDisplayName(LPWSTR lpName, PULONG puSize) +{ + FIXME("SHGetUserDisplayName() stub\n"); + wcscpy(lpName, L"UserName"); + return ERROR_SUCCESS; +} + +/* + * Unimplemented + */ +DWORD +WINAPI +SHGetProcessDword(DWORD dwUnknown1, DWORD dwUnknown2) +{ + /* Unimplemented in WinXP SP3 */ + TRACE("SHGetProcessDword() stub\n"); + return 0; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHTestTokenMembership(HANDLE TokenHandle, PSID SidToCheck) +{ + FIXME("SHTestTokenMembership() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +LPVOID +WINAPI +SHGetUserSessionId(HANDLE hHandle) +{ + FIXME("SHGetUserSessionId() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +PathIsURL(LPCWSTR pszPath) +{ + FIXME("PathIsURL() stub\n"); + return FALSE; +} Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Wed Feb 4 06:51:47 2009 @@ -119,7 +119,7 @@ DWORD WINAPI SHNetConnectionDialog( HWND hwndOwner, - LPCSTR lpstrRemoteName, + LPCWSTR lpstrRemoteName, DWORD dwType); /****************************************************************************

16 years, 5 months

[cwittich] 39384: add wcsncpy_s, strcat_s (from wine) and _ftol2 and _ftol2_sse required by vmware tools

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 4 04:09:48 2009 New Revision: 39384 URL: http://svn.reactos.org/svn/reactos?rev=39384&view=rev Log: add wcsncpy_s, strcat_s (from wine) and _ftol2 and _ftol2_sse required by vmware tools Added: trunk/reactos/lib/sdk/crt/string/string.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Wed Feb 4 04:09:48 2009 @@ -848,5 +848,9 @@ wscanf @842 _mbsnbcpy_s - + wcsncpy_s + _ftol2=_ftol + _ftol2_sse=_ftol + strcat_s + _swprintf=swprintf Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Feb 4 04:09:48 2009 @@ -399,6 +399,7 @@ <file>strdup.c</file> <file>strerror.c</file> <file>stricmp.c</file> + <file>string.c</file> <file>strlwr.c</file> <file>strncoll.c</file> <file>strnicmp.c</file> Added: trunk/reactos/lib/sdk/crt/string/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/string.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/string.c (added) +++ trunk/reactos/lib/sdk/crt/string/string.c [iso-8859-1] Wed Feb 4 04:09:48 2009 @@ -1,0 +1,64 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: lib/sdk/crt/string/string.c + * PURPOSE: string CRT functions + * PROGRAMMERS: Wine team + * Ported to ReactOS by Christoph von Wittich (christoph_vw(a)reactos.org) + */ + +/* + * msvcrt.dll string functions + * + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <precomp.h> + + +/********************************************************************* + * strcat_s (MSVCRT.@) + */ +int CDECL strcat_s( char* dst, size_t elem, const char* src ) +{ + size_t i, j; + if(!dst) return EINVAL; + if(elem == 0) return EINVAL; + if(!src) + { + dst[0] = '\0'; + return EINVAL; + } + + for(i = 0; i < elem; i++) + { + if(dst[i] == '\0') + { + for(j = 0; (j + i) < elem; j++) + { + if((dst[j + i] = src[j]) == '\0') return 0; + } + } + } + /* Set the first element to 0, not the first element after the skipped part */ + dst[0] = '\0'; + return ERANGE; +} Propchange: trunk/reactos/lib/sdk/crt/string/string.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Wed Feb 4 04:09:48 2009 @@ -1138,3 +1138,36 @@ return 0; } #endif + +/****************************************************************** + * wcsncpy_s (MSVCRT.@) + */ +INT CDECL wcsncpy_s( wchar_t* wcDest, size_t numElement, const wchar_t *wcSrc, + size_t count ) +{ + size_t size = 0; + + if (!wcDest || !numElement) + return EINVAL; + + wcDest[0] = 0; + + if (!wcSrc) + { + return EINVAL; + } + + size = min(strlenW(wcSrc), count); + + if (size >= numElement) + { + return ERANGE; + } + + memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + wcDest[size] = '\0'; + + return 0; +} + +

16 years, 5 months

[sedwards] 39383: Warning cleanup: - disable the unused service related functions for now - comment out a bunch of unused variables - cast a few things to shut up compiler warnings for now

by sedwards＠svn.reactos.org

Author: sedwards Date: Wed Feb 4 04:01:42 2009 New Revision: 39383 URL: http://svn.reactos.org/svn/reactos?rev=39383&view=rev Log: Warning cleanup: - disable the unused service related functions for now - comment out a bunch of unused variables - cast a few things to shut up compiler warnings for now Modified: trunk/rosapps/applications/sysutils/telnetd/serviceentry.c trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/serviceentry.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/serviceentry.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/serviceentry.c [iso-8859-1] Wed Feb 4 04:01:42 2009 @@ -20,7 +20,7 @@ /* FUNCTIONS *****************************************************************/ - +#if 0 static DWORD WINAPI ServiceControlHandler(DWORD dwControl, DWORD dwEventType, @@ -54,7 +54,7 @@ DPRINT("ServiceMain() done\n"); } - +#endif int main(int argc, CHAR *argv[]) @@ -73,8 +73,7 @@ StartServiceCtrlDispatcher(ServiceTable); #endif - - telnetd_main(); + telnetd_main(); DPRINT("TelnetD: main() done\n"); @@ -84,3 +83,4 @@ } /* EOF */ + Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Wed Feb 4 04:01:42 2009 @@ -89,7 +89,7 @@ static int DoTelnetHandshake(int sock); static int ReceiveLine(int sock, char *buffer, int len, EchoMode echo); static void RunShell(client_t *client); -static BOOL CreateChildProcess(const char *); +//static BOOL CreateChildProcess(const char *); static DWORD WINAPI MonitorChildThread(LPVOID); static DWORD WINAPI WriteToPipeThread(LPVOID); static DWORD WINAPI ReadFromPipeThread(LPVOID); @@ -224,8 +224,8 @@ char welcome[256]; char hostname[64] = "Unknown"; char *pwdPrompt = "\r\npass:"; - char *logonPrompt = "\r\nLogin OK, please wait..."; - char *byebye = "\r\nWrong! bye bye...\r\n"; + //char *logonPrompt = "\r\nLogin OK, please wait..."; + //char *byebye = "\r\nWrong! bye bye...\r\n"; char userID[USERID_SIZE]; char password[USERID_SIZE]; int received; @@ -321,7 +321,7 @@ return 0; } /* no error and no timeout, we have data in our sock */ - received = recv(sock, client_reply, sizeof(client_reply), 0); + received = recv(sock, (char *) client_reply, sizeof(client_reply), 0); if (received <= 0) { return -1; } @@ -466,7 +466,7 @@ NULL, // process security attributes NULL, // primary thread security attributes TRUE, // handles are inherited - //DETACHED_PROCESS + // creation flags + DETACHED_PROCESS + // creation flags CREATE_NEW_PROCESS_GROUP, NULL, // use parent's environment NULL, // use parent's current directory @@ -507,7 +507,7 @@ WaitForSingleObject(client->hProcess, INFINITE); GetExitCodeProcess(client->hProcess, &exitCode); - printf("Child process terminated with code %d\n", exitCode); + printf("Child process terminated with code %lx\n", exitCode); /* signal the other threads to give up */ client->bTerminate = TRUE; @@ -589,7 +589,7 @@ CHAR chBuf[BUFSIZE]; CHAR txBuf[BUFSIZE*2]; DWORD from,to; - char warning[] = "warning: rl_prep_terminal: cannot get terminal settings"; + //char warning[] = "warning: rl_prep_terminal: cannot get terminal settings"; client_t *client = (client_t *) data;

16 years, 5 months

[gedmurphy] 39382: - Implement SERVICE_CONFIG_DESCRIPTION and SERVICE_CONFIG_FAILURE_ACTIONS for RChangeServiceConfig2A - Christoph requires this for the vmware tools installer

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Feb 4 03:34:05 2009 New Revision: 39382 URL: http://svn.reactos.org/svn/reactos?rev=39382&view=rev Log: - Implement SERVICE_CONFIG_DESCRIPTION and SERVICE_CONFIG_FAILURE_ACTIONS for RChangeServiceConfig2A - Christoph requires this for the vmware tools installer Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Feb 4 03:34:05 2009 @@ -3985,13 +3985,115 @@ } +// +// WARNING: This function is untested +// /* Function 36 */ DWORD RChangeServiceConfig2A( SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOA Info) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + SC_RPC_CONFIG_INFOW InfoW; + DWORD dwRet, dwLength; + PVOID ptr = NULL; + + DPRINT("RChangeServiceConfig2A() called\n"); + DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel); + + InfoW.dwInfoLevel = Info.dwInfoLevel; + + if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) + { + LPSERVICE_DESCRIPTIONW lpServiceDesriptonW; + LPSERVICE_DESCRIPTIONA lpServiceDesriptonA; + + lpServiceDesriptonA = Info.psd; + + if (lpServiceDesriptonA && + lpServiceDesriptonA->lpDescription) + { + dwLength = (strlen(lpServiceDesriptonA->lpDescription) + 1) * sizeof(WCHAR); + + lpServiceDesriptonW = HeapAlloc(GetProcessHeap(), + 0, + dwLength + sizeof(SERVICE_DESCRIPTIONW)); + if (!lpServiceDesriptonW) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpServiceDesriptonA->lpDescription, + -1, + lpServiceDesriptonW->lpDescription, + dwLength); + + ptr = lpServiceDesriptonW; + } + } + else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) + { + LPSERVICE_FAILURE_ACTIONSW lpServiceFailureActionsW; + LPSERVICE_FAILURE_ACTIONSA lpServiceFailureActionsA; + DWORD dwRebootLen = 0; + DWORD dwCommandLen = 0; + + lpServiceFailureActionsA = Info.psfa; + + if (lpServiceFailureActionsA) + { + if (lpServiceFailureActionsA->lpRebootMsg) + { + dwRebootLen = (strlen(lpServiceFailureActionsA->lpRebootMsg) + 1) * sizeof(WCHAR); + } + if (lpServiceFailureActionsA->lpCommand) + { + dwCommandLen = (strlen(lpServiceFailureActionsA->lpCommand) + 1) * sizeof(WCHAR); + } + dwLength = dwRebootLen + dwCommandLen + sizeof(SERVICE_FAILURE_ACTIONSW); + + lpServiceFailureActionsW = HeapAlloc(GetProcessHeap(), + 0, + dwLength); + if (!lpServiceFailureActionsW) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + lpServiceFailureActionsW->cActions = lpServiceFailureActionsA->cActions; + lpServiceFailureActionsW->dwResetPeriod = lpServiceFailureActionsA->dwResetPeriod; + CopyMemory(lpServiceFailureActionsW->lpsaActions, lpServiceFailureActionsA->lpsaActions, sizeof(SC_ACTION)); + + if (lpServiceFailureActionsA->lpRebootMsg) + { + MultiByteToWideChar(CP_ACP, + 0, + lpServiceFailureActionsA->lpRebootMsg, + -1, + lpServiceFailureActionsW->lpRebootMsg, + dwRebootLen); + } + + if (lpServiceFailureActionsA->lpCommand) + { + MultiByteToWideChar(CP_ACP, + 0, + lpServiceFailureActionsA->lpCommand, + -1, + lpServiceFailureActionsW->lpCommand, + dwCommandLen); + } + + ptr = lpServiceFailureActionsW; + } + } + + dwRet = RChangeServiceConfig2W(hService, InfoW); + + HeapFree(GetProcessHeap(), 0, ptr); + + return dwRet; } @@ -4048,7 +4150,7 @@ if (dwError != ERROR_SUCCESS) goto done; - if (Info.dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + if (Info.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { LPSERVICE_DESCRIPTIONW lpServiceDescription; @@ -4069,7 +4171,7 @@ goto done; } } - else if (Info.dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) + else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { UNIMPLEMENTED; dwError = ERROR_CALL_NOT_IMPLEMENTED;

16 years, 5 months

[cwittich] 39381: hackfix .spec file to prevent a broken export table

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 4 01:01:47 2009 New Revision: 39381 URL: http://svn.reactos.org/svn/reactos?rev=39381&view=rev Log: hackfix .spec file to prevent a broken export table Modified: trunk/reactos/dll/win32/spoolss/spoolss.spec Modified: trunk/reactos/dll/win32/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.spec [iso-8859-1] Wed Feb 4 01:01:47 2009 @@ -47,7 +47,13 @@ @ stub EnumJobsW @ stub EnumMonitorsW @ stub EnumPerMachineConnectionsW -@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW + +;FIXME: something is seriously broken here +; the forwarder will break the export table + +;@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW +@ stub EnumPortsW + @ stub EnumPrintProcessorDatatypesW @ stub EnumPrintProcessorsW @ stub EnumPrinterDataExW

16 years, 5 months

[sedwards] 39380: Hacks to get telnetd to work in XP and Wine - turn off unicode in rbuild file and serviceentry.c Its not unicode yet anyway - Disable authentication stuff

by sedwards＠svn.reactos.org

Author: sedwards Date: Wed Feb 4 00:35:57 2009 New Revision: 39380 URL: http://svn.reactos.org/svn/reactos?rev=39380&view=rev Log: Hacks to get telnetd to work in XP and Wine - turn off unicode in rbuild file and serviceentry.c Its not unicode yet anyway - Disable authentication stuff Modified: trunk/rosapps/applications/sysutils/telnetd/serviceentry.c trunk/rosapps/applications/sysutils/telnetd/telnetd.c trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild Modified: trunk/rosapps/applications/sysutils/telnetd/serviceentry.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/serviceentry.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/serviceentry.c [iso-8859-1] Wed Feb 4 00:35:57 2009 @@ -57,8 +57,9 @@ int -wmain(int argc, WCHAR *argv[]) +main(int argc, CHAR *argv[]) { +#if 0 SERVICE_TABLE_ENTRY ServiceTable[2] = { {SERVICE_NAME, ServiceMain}, @@ -71,6 +72,7 @@ DPRINT("TelnetD: main() started\n"); StartServiceCtrlDispatcher(ServiceTable); +#endif telnetd_main(); Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Wed Feb 4 00:35:57 2009 @@ -262,6 +262,8 @@ return 0; } received = ReceiveLine(client->socket, password, sizeof(password), Password ); + +#if 0 if (received < 0) { closesocket(client->socket); free(client); @@ -271,18 +273,20 @@ *terminator = '\0'; } } - +#endif /* TODO: do authentication here */ printf("User '%s' logged on\n", userID); +#if 0 strcpy(client->userID, userID); if (send(client->socket, logonPrompt, strlen(logonPrompt), 0) < 0) { closesocket(client->socket); free(client); return 0; } +#endif RunShell(client); return 0; } Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild [iso-8859-1] Wed Feb 4 00:35:57 2009 @@ -1,4 +1,4 @@ -<module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" allowwarnings="true" unicode="yes"> +<module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" allowwarnings="true" unicode="no"> <include base="reactos"></include> <include base="telnetd">..</include>

16 years, 5 months

[cwittich] 39379: set version to 7, 0, 2600, 2180 otherwise some apps will try to overwrite it

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 4 00:29:23 2009 New Revision: 39379 URL: http://svn.reactos.org/svn/reactos?rev=39379&view=rev Log: set version to 7,0,2600,2180 otherwise some apps will try to overwrite it Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rc Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rc… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rc [iso-8859-1] Wed Feb 4 00:29:23 2009 @@ -1,5 +1,8 @@ -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "MSVCRT.DLL Compatibility Library\0" #define REACTOS_STR_INTERNAL_NAME "msvcrt\0" #define REACTOS_STR_ORIGINAL_FILENAME "msvcrt.dll\0" + +#define REACTOS_FILEVERSION 7,0,2600,2180 +#define REACTOS_FILEVERSION_STR "7.0.2600" + #include <reactos/version.rc>

16 years, 5 months

[cwittich] 39378: disable dprints

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 4 00:10:19 2009 New Revision: 39378 URL: http://svn.reactos.org/svn/reactos?rev=39378&view=rev Log: disable dprints Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Wed Feb 4 00:10:19 2009 @@ -31,7 +31,7 @@ #include "cdfs.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Wed Feb 4 00:10:19 2009 @@ -30,7 +30,7 @@ #include "cdfs.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Wed Feb 4 00:10:19 2009 @@ -30,7 +30,7 @@ #include "cdfs.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/

16 years, 5 months

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