Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[sedwards] 14105: Use the new ReactOS icon for the boot cd.

by sedwards＠svn.reactos.com

Use the new ReactOS icon for the boot cd. Modified: trunk/reactos/bootdata/icon.ico _____ Modified: trunk/reactos/bootdata/icon.ico (Binary files differ)

19 years, 6 months

[gvg] 14104: Francois Gouget <fgouget@free.fr>

by gvg＠svn.reactos.com

Francois Gouget <fgouget(a)free.fr> - Add a comment explaining why CDLGetLongPathName[AW] and IsJITInProgress have hardcoded ordinals. Modified: trunk/reactos/lib/urlmon/urlmon.spec _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-03-15 21:36:47 UTC (rev 14103) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-03-15 21:38:57 UTC (rev 14104) @@ -1,5 +1,10 @@ +# Up until Windows 2000 these APIs have hardcoded ordinals. +# Keep it that way for compatibility. 1 stub CDLGetLongPathNameA 2 stub CDLGetLongPathNameW +# IsJITInProgress has a hardcoded ordinal on WinME and Windows 2000 +#3 stub IsJITInProgress + @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit @ stub BindAsyncMoniker

19 years, 6 months

[gvg] 14103: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Fix prototypes of GetClassLongA/W, GetClassLongPtrA/W and SetClassLongA/W according to SDK definitions. - Add prototypes for SetClassLongPtrA/W, protect some GWL_ and GCL_ constants from using in Wine or in _WIN64 mode. - Fix all places in Wine affected by the above changes. Jon Griffiths <jon_p_griffiths(a)yahoo.com> - Documentation spelling fixes. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - Forward to user32 when appropriate. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. Modified: trunk/reactos/lib/shlwapi/assoc.c Modified: trunk/reactos/lib/shlwapi/msgbox.c Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc Modified: trunk/reactos/lib/shlwapi/string.c _____ Modified: trunk/reactos/lib/shlwapi/assoc.c --- trunk/reactos/lib/shlwapi/assoc.c 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/assoc.c 2005-03-15 21:36:47 UTC (rev 14103) @@ -43,7 +43,7 @@ * when you right-click on a file). * * HELPERS - * You can use this object tranparently by calling the helper functions + * You can use this object transparently by calling the helper functions * AssocQueryKeyA(), AssocQueryStringA() and AssocQueryStringByKeyA(). These * create an IQueryAssociations object, perform the requested actions * and then dispose of the object. Alternatively, you can create an instance _____ Modified: trunk/reactos/lib/shlwapi/msgbox.c --- trunk/reactos/lib/shlwapi/msgbox.c 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/msgbox.c 2005-03-15 21:36:47 UTC (rev 14103) @@ -62,7 +62,7 @@ /* Dialogue procedure for general message boxes */ static INT_PTR CALLBACK SHDlgProcEx(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - DLGDATAEX *d = (DLGDATAEX *)GetWindowLongW(hDlg, DWL_USER); + DLGDATAEX *d = (DLGDATAEX *)GetWindowLongPtrW(hDlg, DWLP_USER); TRACE("(%p,%u,%d,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d); @@ -71,7 +71,7 @@ case WM_INITDIALOG: { /* FIXME: Not sure where native stores its lParam */ - SetWindowLongW(hDlg, DWL_USER, lParam); + SetWindowLongPtrW(hDlg, DWLP_USER, lParam); d = (DLGDATAEX *)lParam; TRACE("WM_INITDIALOG: %p, %s,%p,%p\n", hDlg, debugstr_w(d->lpszId), d->dlgProc, (void*)d->lParam); _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-03-15 21:36:47 UTC (rev 14103) @@ -2397,7 +2397,7 @@ hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongA(hWnd, DWL_MSGRESULT, z); + SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z); if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); @@ -2684,7 +2684,7 @@ hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongW(hWnd, DWL_MSGRESULT, z); + SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z); if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2005-03-15 21:36:47 UTC (rev 14103) @@ -368,9 +368,9 @@ 368 stdcall @(wstr wstr ptr long wstr) kernel32.GetPrivateProfileStructW 369 stdcall @(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW 370 stdcall -noname ExtractIconWrapW(long wstr long) -371 stdcall DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW -372 stdcall DdeCreateStringHandleWrapW(long ptr long) user32.DdeCreateStringHandleW -373 stdcall DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW +371 stdcall -noname DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW +372 stdcall -noname DdeCreateStringHandleWrapW(long ptr long) user32.DdeCreateStringHandleW +373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW 374 stub -noname SHCheckDiskForMediaA 375 stub -noname SHCheckDiskForMediaW 376 stdcall -noname MLGetUILanguage() # kernel32.GetUserDefaultUILanguage @@ -389,7 +389,7 @@ 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) -392 stdcall EndDialogWrap(ptr ptr) user32.EndDialog +392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog 393 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamW 394 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamA 395 stub -noname MLWinHelpA @@ -456,8 +456,8 @@ 456 stdcall -noname PathIsValidCharW(long long) 457 stub -noname GetLongPathNameWrapW 458 stub -noname GetLongPathNameWrapA -459 stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA -460 stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW +459 stdcall -noname SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA +460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW 461 stdcall -noname SHGetAppCompatFlags(long) 462 stub -noname UrlFixupW 463 stub -noname SHExpandEnvironmentStringsForUserA _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc --- trunk/reactos/lib/shlwapi/shlwapi_Es.rc 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/shlwapi_Es.rc 2005-03-15 21:36:47 UTC (rev 14103) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/shlwapi/string.c --- trunk/reactos/lib/shlwapi/string.c 2005-03-15 21:30:32 UTC (rev 14102) +++ trunk/reactos/lib/shlwapi/string.c 2005-03-15 21:36:47 UTC (rev 14103) @@ -534,7 +534,7 @@ /*********************************************************************** ** * StrRStrIA [SHLWAPI.@] * - * Find the last occurence of a substring within a string. + * Find the last occurrence of a substring within a string. * * PARAMS * lpszStr [I] String to search in @@ -542,7 +542,7 @@ * lpszSearch [I] String to look for * * RETURNS - * The last occurence lpszSearch within lpszStr, or NULL if not found. + * The last occurrence lpszSearch within lpszStr, or NULL if not found. */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { @@ -711,7 +711,7 @@ * NOTES * Leading whitespace, '-' and '+' are allowed before the number. If * dwFlags includes STIF_SUPPORT_HEX, hexadecimal numbers are allowed, if - * preceeded by '0x'. If this flag is not set, or there is no '0x' prefix, + * preceded by '0x'. If this flag is not set, or there is no '0x' prefix, * the string is treated as a decimal string. A leading '-' is ignored for * hexadecimal numbers. */ @@ -1171,7 +1171,7 @@ /*********************************************************************** *** * StrRChrA [SHLWAPI.@] * - * Find the last occurence of a character in string. + * Find the last occurrence of a character in string. * * PARAMS * lpszStr [I] String to search in @@ -1205,7 +1205,7 @@ /*********************************************************************** *** * StrRChrIA [SHLWAPI.@] * - * Find the last occurence of a character in string, ignoring case. + * Find the last occurrence of a character in string, ignoring case. * * PARAMS * lpszStr [I] String to search in

19 years, 6 months

[gvg] 14102: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - Add French resources. Henning Gerhardt <henning.gerhardt(a)web.de> - Add/updated German resources. Marcelo Duarte <wine-devel(a)bol.com.br> - Update the resources for Portuguese. - Use "MS Shell Dlg" everywhere except for Japanese. Juan Lang <juan_lang(a)yahoo.com> - Fix a crash if the Mozilla ActiveX control doesn't implement DllCanUnloadNow. Added: trunk/reactos/lib/shdocvw/De.rc Added: trunk/reactos/lib/shdocvw/En.rc Added: trunk/reactos/lib/shdocvw/Fr.rc Added: trunk/reactos/lib/shdocvw/Pt.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.rc Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Copied: trunk/reactos/lib/shdocvw/De.rc (from rev 14101, vendor/wine/dlls/shdocvw/current/De.rc) Property changes on: trunk/reactos/lib/shdocvw/De.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/shdocvw/En.rc (from rev 14101, vendor/wine/dlls/shdocvw/current/En.rc) Property changes on: trunk/reactos/lib/shdocvw/En.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/shdocvw/Fr.rc (from rev 14101, vendor/wine/dlls/shdocvw/current/Fr.rc) Property changes on: trunk/reactos/lib/shdocvw/Fr.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/shdocvw/Pt.rc (from rev 14101, vendor/wine/dlls/shdocvw/current/Pt.rc) Property changes on: trunk/reactos/lib/shdocvw/Pt.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.rc --- trunk/reactos/lib/shdocvw/shdocvw.rc 2005-03-15 19:40:22 UTC (rev 14101) +++ trunk/reactos/lib/shdocvw/shdocvw.rc 2005-03-15 21:30:32 UTC (rev 14102) @@ -23,21 +23,7 @@ #include "version.rc" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Downloading the Mozilla Active X control" -FONT 8, "Helv" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "This application is requesting an ActiveX browser object\n" \ - "but the Mozilla Active X control is currently not installed." \ - "Do you wish to download and install it?" -END +#include "De.rc" +#include "En.rc" +#include "Fr.rc" +#include "Pt.rc" _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-03-15 19:40:22 UTC (rev 14101) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-03-15 21:30:32 UTC (rev 14102) @@ -130,17 +130,16 @@ */ HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) { - HRESULT moz_can_unload = S_FALSE; + HRESULT moz_can_unload = S_OK; fnCanUnloadNow pCanUnloadNow; if (hMozCtl) { pCanUnloadNow = (fnCanUnloadNow) GetProcAddress(hMozCtl, "DllCanUnloadNow"); - moz_can_unload = pCanUnloadNow(); + if (pCanUnloadNow) + moz_can_unload = pCanUnloadNow(); } - else - moz_can_unload = S_OK; if (moz_can_unload == S_OK && SHDOCVW_refCount == 0) return S_OK;

19 years, 6 months

[gdalsnes] 14101: fixed GetTempFileNameA/W by ripping from wine

by gdalsnes＠svn.reactos.com

fixed GetTempFileNameA/W by ripping from wine impl. GetLongPathNameA/W by ripping from wine impl. EnumResourceNamesA/W by ripping from wine Use common routines for filename A2W/W2A conversion (wine inspired) impl. ReadDirectoryChangesW (kmode part is not workin yet) fixed RtlSetCurrentDirectory_U (dont convert to long path) Modified: trunk/reactos/include/ddk/ldrfuncs.h Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/curdir.c Modified: trunk/reactos/lib/kernel32/file/dir.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/file/hardlink.c Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/misc/res.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/rtl/path.c _____ Modified: trunk/reactos/include/ddk/ldrfuncs.h --- trunk/reactos/include/ddk/ldrfuncs.h 2005-03-15 17:38:54 UTC (rev 14100) +++ trunk/reactos/include/ddk/ldrfuncs.h 2005-03-15 19:40:22 UTC (rev 14101) @@ -14,12 +14,12 @@ IN ULONG Level, OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry); -/*NTSTATUS STDCALL +NTSTATUS STDCALL LdrFindResourceDirectory_U( IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, + IN PLDR_RESOURCE_INFO ResourceInfo, IN ULONG Level, OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory); -*/ + NTSTATUS STDCALL LdrEnumResources(IN PVOID BaseAddress, IN PLDR_RESOURCE_INFO ResourceInfo, _____ Modified: trunk/reactos/lib/kernel32/file/cnotify.c --- trunk/reactos/lib/kernel32/file/cnotify.c 2005-03-15 17:38:54 UTC (rev 14100) +++ trunk/reactos/lib/kernel32/file/cnotify.c 2005-03-15 19:40:22 UTC (rev 14101) @@ -42,34 +42,14 @@ DWORD dwNotifyFilter ) { - UNICODE_STRING PathNameU; - ANSI_STRING PathName; - HANDLE hNotify; + PWCHAR PathNameW; - RtlInitAnsiString (&PathName, - (LPSTR)lpPathName); + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) + return INVALID_HANDLE_VALUE; - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - { - RtlAnsiStringToUnicodeString (&PathNameU, - &PathName, - TRUE); - } - else - { - RtlOemStringToUnicodeString (&PathNameU, - &PathName, - TRUE); - } - - hNotify = FindFirstChangeNotificationW (PathNameU.Buffer, + return FindFirstChangeNotificationW (PathNameW , bWatchSubtree, dwNotifyFilter); - - RtlFreeUnicodeString(&PathNameU); - - return hNotify; } @@ -90,13 +70,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDir; - /* - RtlDosPathNameToNtPathName takes a fully qualified file name "C:\Projects\LoadLibrary\Debug\TestDll.dll" - and returns something like "\??\C:\Projects\LoadLibrary\Debug\TestDll.dll." - If the file name cannot be interpreted, then the routine returns STATUS_OBJECT_PATH_SYNTAX_BAD and - ends execution. - */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, &NtPathU, NULL, @@ -106,9 +79,11 @@ return INVALID_HANDLE_VALUE; } + + InitializeObjectAttributes (&ObjectAttributes, &NtPathU, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -119,6 +94,23 @@ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_DIRECTORY_FILE); + /* + FIXME: I think we should use FILE_OPEN_FOR_BACKUP_INTENT. See M$ Q188321 + -Gunnar + */ + + + + /* FIXME: We free the string alloced by RtlDosPathNameToNtPathName_U, but what + * about the special case where the user can pass a \\?\ path? We must not free + * the users buffer!. But should we even call RtlDosPathNameToNtPathName_U in that + * case??? -Gunnar + */ + + RtlFreeUnicodeString( &NtPathU); + + + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); @@ -157,15 +149,16 @@ NTSTATUS Status; Status = NtNotifyChangeDirectoryFile(hChangeHandle, - NULL, - NULL, - NULL, - &IoStatus, - NULL,//Buffer, - 0,//BufferLength, - FILE_NOTIFY_CHANGE_SECURITY,//meaningless for subsequent calls, but must contain a valid flag(s) - 0//meaningless for subsequent calls - ); + NULL, + NULL, + NULL, + &IoStatus, + NULL,//Buffer, + 0,//BufferLength, + FILE_NOTIFY_CHANGE_SECURITY,//meaningless/ignored for subsequent calls, but must contain a valid flag + 0 //meaningless/ignored for subsequent calls + ); + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); @@ -175,4 +168,62 @@ return TRUE; } + +extern VOID STDCALL +(ApcRoutine)(PVOID ApcContext, + struct _IO_STATUS_BLOCK* IoStatusBlock, + ULONG Reserved); + + +/* + * @implemented + */ +BOOL +STDCALL +ReadDirectoryChangesW( + HANDLE hDirectory, + LPVOID lpBuffer OPTIONAL, + DWORD nBufferLength, + BOOL bWatchSubtree, + DWORD dwNotifyFilter, + LPDWORD lpBytesReturned, /* undefined for asych. operations */ + LPOVERLAPPED lpOverlapped OPTIONAL, + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine /* OPTIONAL???????? */ + ) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + + if (lpOverlapped ) + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtNotifyChangeDirectoryFile( + hDirectory, + lpOverlapped ? lpOverlapped->hEvent : NULL, + lpCompletionRoutine ? ApcRoutine : NULL, /* ApcRoutine OPTIONAL???? */ + lpCompletionRoutine, /* ApcContext */ + lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped : &IoStatus, + lpBuffer, + nBufferLength, + dwNotifyFilter, + bWatchSubtree + ); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + + /* NOTE: lpBytesReturned is undefined for asynch. operations */ + *lpBytesReturned = IoStatus.Information; + + return TRUE; +} + + + + + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-03-15 17:38:54 UTC (rev 14100) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-03-15 19:40:22 UTC (rev 14101) @@ -25,6 +25,9 @@ /* FUNCTIONS *****************************************************************/ + + + /* * @implemented */ @@ -35,71 +38,19 @@ LPSTR lpBuffer ) { - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - ULONG Length; + WCHAR BufferW[MAX_PATH]; + DWORD ret; - /* allocate buffer for unicode string */ - UnicodeString.Length = 0; - UnicodeString.MaximumLength = nBufferLength * sizeof(WCHAR); - if (nBufferLength > 0) - { - UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - UnicodeString.MaximumLength); + ret = GetCurrentDirectoryW(MAX_PATH, BufferW); - /* initialize ansi string */ - AnsiString.Length = 0; - AnsiString.MaximumLength = nBufferLength; - AnsiString.Buffer = lpBuffer; - } - else - { - UnicodeString.Buffer = NULL; - } - - /* get current directory */ - UnicodeString.Length = RtlGetCurrentDirectory_U (UnicodeString.MaximumLength, - UnicodeString.Buffer); - DPRINT("UnicodeString.Buffer %wZ\n", &UnicodeString); - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - { - Length = RtlUnicodeStringToAnsiSize (&UnicodeString); - if (Length > nBufferLength) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); - return Length-1; - } - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - } - else - { - Length = RtlUnicodeStringToOemSize (&UnicodeString); - if (Length > nBufferLength) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); - return Length-1; - } - RtlUnicodeStringToOemString (&AnsiString, - &UnicodeString, - FALSE); - } - DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer); - - /* free unicode string */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); - - return AnsiString.Length; + if (!ret) return 0; + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); } @@ -122,6 +73,7 @@ } + /* * @implemented */ @@ -131,27 +83,16 @@ LPCSTR lpPathName ) { - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; + PUNICODE_STRING PathNameU; NTSTATUS Status; - RtlInitAnsiString (&AnsiString, - (LPSTR)lpPathName); + DPRINT("setcurrdir: %s\n",lpPathName); - /* convert ansi (or oem) to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&UnicodeString, - &AnsiString, - TRUE); - else - RtlOemStringToUnicodeString (&UnicodeString, - &AnsiString, - TRUE); + if (!(PathNameU = FilenameA2U(lpPathName, FALSE))) + return FALSE; - Status = RtlSetCurrentDirectory_U (&UnicodeString); + Status = RtlSetCurrentDirectory_U(PathNameU); - RtlFreeUnicodeString (&UnicodeString); - if (!NT_SUCCESS(Status)) { SetLastErrorByStatus (Status); @@ -190,6 +131,8 @@ /* * @implemented + * + * NOTE: Windows returns a dos/short (8.3) path */ DWORD STDCALL @@ -198,138 +141,82 @@ LPSTR lpBuffer ) { - UNICODE_STRING UnicodeString; - ANSI_STRING AnsiString; - DWORD Length; + WCHAR BufferW[MAX_PATH]; + DWORD ret; - AnsiString.Length = 0; - AnsiString.MaximumLength = nBufferLength; - AnsiString.Buffer = lpBuffer; + ret = GetTempPathW(MAX_PATH, BufferW); - /* initialize allocate unicode string */ - UnicodeString.Length = 0; - if(nBufferLength > 0) - { - UnicodeString.MaximumLength = (nBufferLength + 1) * sizeof(WCHAR); - UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - UnicodeString.MaximumLength); - if (UnicodeString.Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - } - else - { - UnicodeString.MaximumLength = 0; - UnicodeString.Buffer = NULL; - } + if (!ret) + return 0; - Length = GetTempPathW (nBufferLength, - UnicodeString.Buffer); + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } - if (nBufferLength >= Length) - { - /* only touch the buffer if the supplied buffer length is at least - the length that GetTempPathW returned! */ - UnicodeString.Length = Length * sizeof(WCHAR); - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - else - RtlUnicodeStringToOemString (&AnsiString, - &UnicodeString, - FALSE); - } - - /* free unicode string buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); - - return Length; + return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); } /* * @implemented + * + * ripped from wine */ DWORD STDCALL GetTempPathW ( - DWORD nBufferLength, - LPWSTR lpBuffer + DWORD count, + LPWSTR path ) { - UNICODE_STRING Name; - PUNICODE_STRING Value; - PTEB Teb; - DWORD Length; - NTSTATUS Status; + WCHAR tmp_path[MAX_PATH]; + WCHAR tmp_full_path[MAX_PATH]; + UINT ret; - Teb = NtCurrentTeb(); - Teb->StaticUnicodeString.Length = 0; - Teb->StaticUnicodeString.MaximumLength = MAX_PATH * sizeof(WCHAR); - Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; - Value = &Teb->StaticUnicodeString; + DPRINT("GetTempPathW(%lu,%p)\n", nBufferLength, lpBuffer); - RtlRosInitUnicodeStringFromLiteral (&Name, - L"TMP"); + if (!(ret = GetEnvironmentVariableW( L"TMP", tmp_path, MAX_PATH ))) + if (!(ret = GetEnvironmentVariableW( L"TEMP", tmp_path, MAX_PATH ))) + if (!(ret = GetCurrentDirectoryW( MAX_PATH, tmp_path ))) + return 0; - Status = RtlQueryEnvironmentVariable_U (NULL, - &Name, - Value); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { - RtlRosInitUnicodeStringFromLiteral (&Name, - L"TEMP"); + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } - Status = RtlQueryEnvironmentVariable_U (NULL, - &Name, - Value); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { - Value->Length = RtlGetCurrentDirectory_U(Value->MaximumLength, - Value->Buffer); - } - } + ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_full_path, NULL); + if (!ret) return 0; - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return 0; - } + if (ret > MAX_PATH - 2) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } - Length = Value->Length / sizeof(WCHAR) + 1; - if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) - Length++; + if (tmp_full_path[ret-1] != '\\') + { + tmp_full_path[ret++] = '\\'; + tmp_full_path[ret] = '\0'; + } - if (nBufferLength >= Value->Length /sizeof(WCHAR) + 1) - { - if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) - { - memcpy (lpBuffer, - Value->Buffer, - nBufferLength * sizeof(WCHAR)); - } - else - { - memcpy (lpBuffer, - Value->Buffer, - Value->Length); - lpBuffer[Value->Length / sizeof(WCHAR)] = L'\\'; - lpBuffer[Value->Length / sizeof(WCHAR) + 1] = 0; - } - } else if (nBufferLength > 0) - { - lpBuffer[0] = L'\0'; - } + ret++; /* add space for terminating 0 */ - return Length; + if (count) + { + lstrcpynW(path, tmp_full_path, count); + if (count >= ret) + ret--; /* return length without 0 */ + else if (count < 4) + path[0] = 0; /* avoid returning ambiguous "X:" */ + } + + DPRINT("GetTempPathW returning %u, %s\n", ret, path); + return ret; + } @@ -343,37 +230,7 @@ UINT uSize ) { - ANSI_STRING String; - ULONG Length; - NTSTATUS Status; - - Length = RtlUnicodeStringToAnsiSize (&SystemDirectory); //len of ansi str incl. nullchar - - if (lpBuffer == NULL) - return Length; - - if (uSize >= Length){ - String.Length = 0; - String.MaximumLength = uSize; - String.Buffer = lpBuffer; - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - Status = RtlUnicodeStringToAnsiString (&String, - &SystemDirectory, - FALSE); - else - Status = RtlUnicodeStringToOemString (&String, - &SystemDirectory, - FALSE); - if (!NT_SUCCESS(Status) ) - return 0; - - return Length-1; //good: ret chars excl. nullchar - - } - - return Length; //bad: ret space needed incl. nullchar + return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); } @@ -416,38 +273,7 @@ UINT uSize ) { - ANSI_STRING String; - ULONG Length; - NTSTATUS Status; - - Length = RtlUnicodeStringToAnsiSize (&WindowsDirectory); //len of ansi str incl. nullchar - - if (lpBuffer == NULL) - return Length; - - if (uSize >= Length){ - - String.Length = 0; - String.MaximumLength = uSize; - String.Buffer = lpBuffer; - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - Status = RtlUnicodeStringToAnsiString (&String, - &WindowsDirectory, - FALSE); - else - Status = RtlUnicodeStringToOemString (&String, - &WindowsDirectory, - FALSE); - - if (!NT_SUCCESS(Status)) - return 0; - - return Length-1; //good: ret chars excl. nullchar - } - - return Length; //bad: ret space needed incl. nullchar + return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); } _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-03-15 17:38:54 UTC (rev 14100) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-03-15 19:40:22 UTC (rev 14101) @@ -50,65 +50,26 @@ LPCSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - UNICODE_STRING TmplDirU; - UNICODE_STRING NewDirU; - ANSI_STRING TmplDir; - ANSI_STRING NewDir; - BOOL Result; + PWCHAR TemplateDirectoryW; + PWCHAR NewDirectoryW; + BOOL ret; - RtlInitUnicodeString (&TmplDirU, - NULL); + if (!(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, FALSE))) + return FALSE; + + if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, TRUE))) + return FALSE; + + ret = CreateDirectoryExW (TemplateDirectoryW, + NewDirectoryW, + lpSecurityAttributes); - RtlInitUnicodeString (&NewDirU, - NULL); + if (lpNewDirectory != NULL) + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NewDirectoryW); - if (lpTemplateDirectory != NULL) - { - RtlInitAnsiString (&TmplDir, - (LPSTR)lpTemplateDirectory); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&TmplDirU, - &TmplDir, - TRUE); - else - RtlOemStringToUnicodeString (&TmplDirU, - &TmplDir, - TRUE); - } - - if (lpNewDirectory != NULL) - { - RtlInitAnsiString (&NewDir, - (LPSTR)lpNewDirectory); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&NewDirU, - &NewDir, - TRUE); - else - RtlOemStringToUnicodeString (&NewDirU, - &NewDir, - TRUE); - } - - Result = CreateDirectoryExW (TmplDirU.Buffer, - NewDirU.Buffer, - lpSecurityAttributes); - - if (lpTemplateDirectory != NULL) - RtlFreeHeap (RtlGetProcessHeap (), - 0, - TmplDirU.Buffer); - - if (lpNewDirectory != NULL) - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NewDirU.Buffer); - - return Result; + return ret; } @@ -215,30 +176,14 @@ LPCSTR lpPathName ) { - UNICODE_STRING PathNameU; - ANSI_STRING PathName; - BOOL Result; + PWCHAR PathNameW; + + DPRINT("RemoveDirectoryA(%s)\n",lpPathName); - RtlInitAnsiString (&PathName, - (LPSTR)lpPathName); + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) + return FALSE; - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&PathNameU, - &PathName, - TRUE); - else - RtlOemStringToUnicodeString (&PathNameU, - &PathName, - TRUE); - - Result = RemoveDirectoryW (PathNameU.Buffer); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - PathNameU.Buffer); - - return Result; + return RemoveDirectoryW (PathNameW); } @@ -337,70 +282,49 @@ LPSTR *lpFilePart ) { - UNICODE_STRING nameW; - WCHAR bufferW[MAX_PATH]; - DWORD ret; - LPWSTR FilePart = NULL; + WCHAR BufferW[MAX_PATH]; + PWCHAR FileNameW; + DWORD ret; + LPWSTR FilePartW = NULL; - DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); + DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " + "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - if (!lpFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + if (!lpFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } - if (!RtlCreateUnicodeStringFromAsciiz(&nameW, (LPSTR)lpFileName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + return 0; - if (lpFilePart) - { - *lpFilePart = NULL; - } + ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); + + if (!ret) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); + + if (ret < nBufferLength && lpFilePart) + { + /* if the path closed with '\', FilePart is NULL */ + if (!FilePartW) + *lpFilePart=NULL; + else + *lpFilePart = (FilePartW - BufferW) + lpBuffer; + } + + DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", + lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); - ret = GetFullPathNameW(nameW.Buffer, MAX_PATH, bufferW, &FilePart); - - if (MAX_PATH < ret) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - ret = 0; - } - else if (0 < ret) - { - if (ret < nBufferLength) - { - ANSI_STRING AnsiBuffer; - UNICODE_STRING UnicodeBuffer; - - UnicodeBuffer.Length = wcslen(bufferW) * sizeof(WCHAR); - UnicodeBuffer.MaximumLength = MAX_PATH * sizeof(WCHAR); - UnicodeBuffer.Buffer = bufferW; - AnsiBuffer.MaximumLength = nBufferLength; - AnsiBuffer.Length = 0; - AnsiBuffer.Buffer = lpBuffer; - RtlUnicodeStringToAnsiString(&AnsiBuffer, &UnicodeBuffer, FALSE); - - if (lpFilePart && FilePart != NULL) - { - *lpFilePart = (FilePart - bufferW) + lpBuffer; - } - } - else - { - ret++; - } - } - - RtlFreeUnicodeString(&nameW); - - DPRINT("lpBuffer %s lpFilePart %s Length %ld\n", - lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart, nameW.Length); - - return ret; + return ret; } @@ -426,17 +350,10 @@ lpBuffer, lpFilePart); - DPRINT("lpBuffer %S lpFilePart %S Length %ld\n", + DPRINT("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", lpBuffer, (lpFilePart == NULL) ? L"NULL" : *lpFilePart, Length / sizeof(WCHAR)); - Length = Length / sizeof(WCHAR); - if (nBufferLength < Length + 1) - { - DPRINT("Adjusting Length for terminator\n"); - Length++; - } - - return Length; + return Length/sizeof(WCHAR); } @@ -452,9 +369,9 @@ DWORD shortlen ) { - UNICODE_STRING longpathW; - WCHAR shortpathW[MAX_PATH]; - DWORD ret, retW; + PWCHAR LongPathW; + WCHAR ShortPathW[MAX_PATH]; + DWORD ret; if (!longpath) { @@ -462,33 +379,21 @@ return 0; } - if (!RtlCreateUnicodeStringFromAsciiz(&longpathW, longpath)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } + if (!(LongPathW = FilenameA2W(longpath, FALSE))) + return 0; - retW = GetShortPathNameW(longpathW.Buffer, shortpathW, MAX_PATH); + ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); - if (!retW) - ret = 0; - else if (retW > PATH_MAX) + if (!ret) + return 0; + + if (ret > MAX_PATH) { SetLastError(ERROR_FILENAME_EXCED_RANGE); - ret = 0; + return 0; } - else - { - ret = WideCharToMultiByte(CP_ACP, 0, shortpathW, -1, NULL, 0, NULL, NULL); - if (ret <= shortlen) - { - WideCharToMultiByte(CP_ACP, 0, shortpathW, -1, shortpath, shortlen, NULL, NULL); - ret--; /* length without 0 */ - } - } - - RtlFreeUnicodeString(&longpathW); - return ret; + + return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); } @@ -513,6 +418,8 @@ UNICODE_STRING ustr; WCHAR ustr_buf[8+1+3+1]; + DPRINT("GetShortPathNameW: %S\n",longpath); + if (!longpath) { SetLastError(ERROR_INVALID_PARAMETER); @@ -931,38 +838,18 @@ BOOL STDCALL SetDllDirectoryA( - LPCSTR lpPathName + LPCSTR lpPathName /* can be NULL */ ) { - UNICODE_STRING PathNameU; - ANSI_STRING PathNameA; - BOOL Ret; + PWCHAR PathNameW=NULL; - if(lpPathName != NULL) + if(lpPathName) { - RtlInitAnsiString(&PathNameA, lpPathName); - if(bIsFileApiAnsi) - { - RtlAnsiStringToUnicodeString(&PathNameU, &PathNameA, TRUE); - } - else - { - RtlOemStringToUnicodeString(&PathNameU, &PathNameA, TRUE); - } + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) + return FALSE; } - else - { - PathNameU.Buffer = NULL; - } - Ret = SetDllDirectoryW(PathNameU.Buffer); - - if(lpPathName != NULL) - { - RtlFreeUnicodeString(&PathNameU); - } - - return Ret; + return SetDllDirectoryW(PathNameW); } /* @@ -1012,51 +899,21 @@ LPSTR lpBuffer ) { - UNICODE_STRING PathNameU; - ANSI_STRING PathNameA; - DWORD Ret; - - if(nBufferLength > 0) - { - if(!(PathNameU.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - nBufferLength * sizeof(WCHAR)))) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); [truncated at 1000 lines; 1806 more skipped]

19 years, 6 months

[hbirr] 14100: On smp machines, unmap all low memory pages (except page 2 and 3).

by hbirr＠svn.reactos.com

On smp machines, unmap all low memory pages (except page 2 and 3). Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-03-15 17:35:27 UTC (rev 14099) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-03-15 17:38:54 UTC (rev 14100) @@ -386,10 +386,22 @@ /* * Unmap low memory */ -#ifndef CONFIG_SMP - /* In SMP mode we unmap the low memory in MmInit3. +#ifdef CONFIG_SMP + /* In SMP mode we unmap the low memory pagetable in MmInit3. The APIC needs the mapping of the first pages - while the processors are starting up. */ + while the processors are starting up. + We unmap all pages except page 2 and 3. */ + for (MappingAddress = 0; + MappingAddress < 1024 * PAGE_SIZE; + MappingAddress += PAGE_SIZE) + { + if (MappingAddress != 2 * PAGE_SIZE && + MappingAddress != 3 * PAGE_SIZE) + { + MmRawDeleteVirtualMapping((PVOID)MappingAddress); + } + } +#else MmDeletePageTable(NULL, 0); #endif

19 years, 6 months

[hbirr] 14099: Prevent from accessing DpcEvent in the KPCR structure, because it is currently a NULL pointer.

by hbirr＠svn.reactos.com

Prevent from accessing DpcEvent in the KPCR structure, because it is currently a NULL pointer. Modified: trunk/reactos/ntoskrnl/ke/dpc.c _____ Modified: trunk/reactos/ntoskrnl/ke/dpc.c --- trunk/reactos/ntoskrnl/ke/dpc.c 2005-03-15 15:58:36 UTC (rev 14098) +++ trunk/reactos/ntoskrnl/ke/dpc.c 2005-03-15 17:35:27 UTC (rev 14099) @@ -35,7 +35,13 @@ KeInitDpc(PKPRCB Prcb) { InitializeListHead(&Prcb->DpcData[0].DpcListHead); +#if 0 + /* + * FIXME: + * Prcb->DpcEvent is a NULL pointer. + */ KeInitializeEvent(Prcb->DpcEvent, 0, 0); +#endif KeInitializeSpinLock(&Prcb->DpcData[0].DpcLock); Prcb->MaximumDpcQueueDepth = 4; Prcb->MinimumDpcRate = 3; @@ -428,6 +434,11 @@ /* Set DPC Event if requested */ if (Prcb->DpcSetEventRequest) { + /* + * FIXME: + * Prcb->DpcEvent is not initialized. + */ + KEBUGCHECK(0); KeSetEvent(Prcb->DpcEvent, 0, 0); }

19 years, 6 months

[navaraf] 14098: Fix debug messages.

by navaraf＠svn.reactos.com

Fix debug messages. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-03-15 15:57:45 UTC (rev 14097) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-03-15 15:58:36 UTC (rev 14098) @@ -671,13 +671,14 @@ return FALSE; } + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, TRUE); + /* attach monitor */ IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); SurfObj->dhpdev = PrimarySurface.PDev; SurfSize = SurfObj->sizlBitmap; - SurfSize = SurfObj->sizlBitmap; SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.right = SurfObj->sizlBitmap.cx; SurfaceRect.bottom = SurfObj->sizlBitmap.cy; @@ -760,7 +761,7 @@ if (Driver != NULL && Driver->Buffer != NULL) { - DPRINT("NAME: %ws\n", Driver); // FIXME: Should not crash if NULL + DPRINT("NAME: %wZ\n", Driver); // FIXME: Should not crash if NULL } /* Allocate a DC object */

19 years, 6 months

[navaraf] 14097: Cleanup misleading code.

by navaraf＠svn.reactos.com

Cleanup misleading code. Modified: trunk/reactos/lib/user32/windows/nonclient.c _____ Modified: trunk/reactos/lib/user32/windows/nonclient.c --- trunk/reactos/lib/user32/windows/nonclient.c 2005-03-15 14:47:41 UTC (rev 14096) +++ trunk/reactos/lib/user32/windows/nonclient.c 2005-03-15 15:57:45 UTC (rev 14097) @@ -376,7 +376,7 @@ } /* Now the other bit of the frame */ - if (Style & WS_CAPTION || ExStyle & WS_EX_DLGMODALFRAME) + if (Style & (WS_DLGFRAME | WS_BORDER) || ExStyle & WS_EX_DLGMODALFRAME) { DWORD Width = GetSystemMetrics(SM_CXBORDER); DWORD Height = GetSystemMetrics(SM_CYBORDER);

19 years, 6 months

[hpoussin] 14096: Disable serial driver as it is in conflit with sermouse and debug output

by hpoussin＠svn.reactos.com

Disable serial driver as it is in conflit with sermouse and debug output Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-03-15 14:02:22 UTC (rev 14095) +++ trunk/reactos/bootdata/hivesys.inf 2005-03-15 14:47:41 UTC (rev 14096) @@ -674,7 +674,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x0001000 1,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Base " HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000004 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 ;hard coded values HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"ACP I\PNP0501"

19 years, 6 months

← Newer
1
...
27
28
29
30
31
32
33
...
61
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 March 2005