Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 51702: * Reduce difference to the cmake branch, MSVC fixes.
by akhaldi＠svn.reactos.org 13 May '11

13 May '11

Author: akhaldi Date: Fri May 13 17:16:08 2011 New Revision: 51702 URL: http://svn.reactos.org/svn/reactos?rev=51702&view=rev Log: * Reduce difference to the cmake branch, MSVC fixes. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/dll/win32/glu32/libutil/mipmap.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/drivers/base/nmidebug/nmidebug.c trunk/reactos/drivers/bus/acpi/osl.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -10,7 +10,7 @@ LPWSTR pszExeName = L"cmd.exe"; /* Function pointers */ -typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); +typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); @@ -142,7 +142,7 @@ return; } - while ( fgetws(line, MAX_PATH, fp) != NULL) + while ( fgetws(line, MAX_PATH, fp) != NULL) { /* Remove newline character */ WCHAR *end = &line[wcslen(line) - 1]; @@ -191,13 +191,16 @@ int wmain(VOID) { - setlocale(LC_ALL, ""); + WCHAR *pArgStart; + WCHAR *pArgEnd; + HMODULE hKernel32; + + setlocale(LC_ALL, ""); /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - WCHAR *pArgStart; - WCHAR *pArgEnd = GetCommandLine(); - HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll"); + pArgEnd = GetCommandLine(); + hKernel32 = LoadLibraryW(L"kernel32.dll"); /* Get function pointers */ pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Fri May 13 17:16:08 2011 @@ -462,7 +462,7 @@ x = ( i * samples ) / WAVEBAR_CX; - line_h = ( abs(AUD_OUT->nsample( x )) * max_h ) / AUD_OUT->samplevalue_max(); + line_h = ( AUD_OUT->nsample( x ) * max_h ) / AUD_OUT->samplevalue_max(); if ( line_h ) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -54,6 +54,17 @@ RunLoader(); } +#ifdef _MSC_VER +long _ftol2(double f) +{ + return _ftol(f); +} +long _ftol2_sse(double f) +{ + return _ftol(f); +} +#endif + // We need to emulate these, because the original ones don't work in freeldr int __cdecl wctomb(char *mbchar, wchar_t wchar) { Modified: trunk/reactos/dll/win32/glu32/libutil/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libutil/mi… ============================================================================== --- trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -6577,7 +6577,7 @@ * Contributed by Gerk Huisma <gerk(a)five-d.demon.nl>. */ -typedef WINAPI void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, +typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -88,7 +88,10 @@ ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -187,9 +187,13 @@ /* strdup on the process heap */ static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { + INT len; + LPWSTR p; + assert(str); - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -21,7 +21,14 @@ { ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; +#ifdef _MSC_VER + __asm + { + rcr KiBugCheckData[4], 8 + } +#else __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8)); +#endif } BOOLEAN Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -67,6 +67,8 @@ ACPI_STATUS AcpiOsInitialize (void) { + UINT32 i; + DPRINT("AcpiOsInitialize called\n"); #ifndef NDEBUG @@ -74,8 +76,6 @@ AcpiDbgLevel = 0x00FFFFFF; AcpiDbgLayer = 0xFFFFFFFF; #endif - - UINT32 i; for (i = 0; i < NUM_SEMAPHORES; i++) { @@ -209,10 +209,11 @@ AcpiOsAcquireObject ( ACPI_CACHE_T *Cache) { + void* ptr; PNPAGED_LOOKASIDE_LIST List = (PNPAGED_LOOKASIDE_LIST)Cache; + DPRINT("AcpiOsAcquireObject from %p\n", Cache); - void* ptr = - ExAllocateFromNPagedLookasideList(List); + ptr = ExAllocateFromNPagedLookasideList(List); ASSERT(ptr); RtlZeroMemory(ptr,List->L.Size); @@ -692,8 +693,10 @@ UINT64 AcpiOsGetTimer (void) { + LARGE_INTEGER Timer; + DPRINT("AcpiOsGetTimer\n"); - LARGE_INTEGER Timer; + KeQueryTickCount(&Timer); return Timer.QuadPart; @@ -758,9 +761,10 @@ AcpiOsGetRootPointer ( void) { + ACPI_PHYSICAL_ADDRESS pa = 0; + DPRINT("AcpiOsGetRootPointer\n"); - ACPI_PHYSICAL_ADDRESS pa = 0; - + AcpiFindRootPointer(&pa); return pa; } Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -368,6 +368,8 @@ PIO_STACK_LOCATION Stack; ULONG_PTR Information = Irp->IoStatus.Information; NTSTATUS Status = Irp->IoStatus.Status; + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; @@ -513,8 +515,6 @@ case IRP_MN_QUERY_CAPABILITIES: { DPRINT("Ehci: PDO Query Capabilities\n"); - PDEVICE_CAPABILITIES DeviceCapabilities; - ULONG i; DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -194,7 +194,11 @@ return RtlCompareMemory(b1, b2, len); } +#ifndef _MSC_VER + int memcmp(const void *b1, const void *b2, size_t len) { return RtlCompareMemory(b1, b2, len); } + +#endif Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -129,9 +129,10 @@ int proto ) { struct socket *so; - - OSKLock(); - int error = socreate(domain, &so, type, proto); + int error ; + + OSKLock(); + error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; InitializeSocketFlags(so);

1 0

[akhaldi] 51701: * Reduce difference to the cmake branch.
by akhaldi＠svn.reactos.org 13 May '11

13 May '11

Author: akhaldi Date: Fri May 13 16:29:09 2011 New Revision: 51701 URL: http://svn.reactos.org/svn/reactos?rev=51701&view=rev Log: * Reduce difference to the cmake branch. Modified: trunk/reactos/dll/cpl/mmsys/mmsys.spec trunk/reactos/dll/directx/ksproxy/ksproxy.spec trunk/reactos/dll/shellext/deskadp/deskadp.spec trunk/reactos/dll/shellext/deskmon/deskmon.spec trunk/reactos/dll/shellext/fontext/fontext.spec trunk/reactos/dll/shellext/slayer/slayer.spec trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/credui/credui.spec trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/devmgr/devmgr.spec trunk/reactos/dll/win32/initpki/initpki.spec trunk/reactos/dll/win32/inseng/inseng.spec trunk/reactos/dll/win32/itircl/itircl.spec trunk/reactos/dll/win32/itss/itss.spec trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/msisip/msisip.spec trunk/reactos/dll/win32/mssign32/mssign32.spec trunk/reactos/dll/win32/netcfgx/netcfgx.spec trunk/reactos/dll/win32/netshell/netshell.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/printui/printui.spec trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shimgvw/shimgvw.spec trunk/reactos/dll/win32/url/url.spec trunk/reactos/dll/win32/userenv/userenv.spec trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec Modified: trunk/reactos/dll/cpl/mmsys/mmsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.spec?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -4,8 +4,8 @@ @ stdcall mmseRunOnceA(ptr ptr str long) @ stdcall ShowMMCPLPropertySheet(ptr str str str) @ stdcall ShowAudioPropertySheet(ptr ptr str long) -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall ShowDriverSettingsAfterFork(ptr ptr str long) @ stdcall ShowDriverSettingsAfterForkW(ptr ptr wstr long) @ stdcall ShowDriverSettingsAfterForkA(ptr ptr str long) Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall KsGetMediaType(long ptr ptr long) @ stdcall KsGetMediaTypeCount(ptr long ptr) @ stdcall KsGetMultiplePinFactoryItems(ptr long long ptr) Modified: trunk/reactos/dll/shellext/deskadp/deskadp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/deskadp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/deskadp.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ # deskadp.dll exports - 1 stdcall DllCanUnloadNow() - 2 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/shellext/deskmon/deskmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/deskmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/deskmon.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ # deskmon.dll exports - 1 stdcall DllCanUnloadNow() - 2 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/shellext/fontext/fontext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… ============================================================================== --- trunk/reactos/dll/shellext/fontext/fontext.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/fontext.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(long long ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/shellext/slayer/slayer.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(long long ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -1 stdcall -private DllCanUnloadNow() -2 stdcall -private DllGetClassObject(ptr ptr ptr) -3 stdcall -private DllRegisterServer() -4 stdcall -private DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 10 stdcall AtlAdvise(ptr ptr ptr ptr) 11 stdcall AtlUnadvise(ptr ptr long) 12 stdcall AtlFreeMarshalStream(ptr) Modified: trunk/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.sp… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -11,7 +11,7 @@ @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -15,7 +15,7 @@ 15 stub CertSelectCertificateW 16 stdcall CertViewPropertiesA(ptr) 17 stdcall CertViewPropertiesW(ptr) -18 stdcall -private DllRegisterServer() -19 stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) 21 stdcall GetFriendlyNameOfCertW(ptr ptr long) Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -37,8 +37,8 @@ 37 stdcall CryptUIWizImport(long ptr wstr ptr ptr) 38 stub CryptUIWizQueryCertRequestNoDS 39 stub CryptUIWizSubmitCertRequestNoDS -40 stub DllRegisterServer -41 stub DllUnregisterServer +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer 42 stub EnrollmentCOMObjectFactory_getInstance 43 stub I_CryptUIProtect 44 stub I_CryptUIProtectFailure Modified: trunk/reactos/dll/win32/devmgr/devmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.sp… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -21,7 +21,7 @@ 23 stdcall DeviceProblenWizard_RunDLLA(ptr ptr str long) DeviceProblemWizard_RunDLLA 24 stdcall DeviceProblenWizard_RunDLLW(ptr ptr wstr long) DeviceProblemWizard_RunDLLW -25 stub DllCanUnloadNow -26 stub DllGetClassObject -27 stub DllRegisterServer -28 stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/initpki/initpki.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/initpki.… ============================================================================== --- trunk/reactos/dll/win32/initpki/initpki.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/initpki/initpki.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub InitializePKI Modified: trunk/reactos/dll/win32/inseng/inseng.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.sp… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -3,7 +3,7 @@ @ stdcall CheckTrustEx(ptr ptr ptr ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DownloadFile Modified: trunk/reactos/dll/win32/itircl/itircl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl.sp… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itircl/itircl.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stub -private DllGetClassObject @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/itss/itss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.spec?r… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,6 +1,6 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllMain(long long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -24,7 +24,7 @@ 25 stdcall @(ptr long) _MPR_25 @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stub -private DllGetClassObject @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) @ stdcall MultinetGetErrorTextA(long ptr long) Modified: trunk/reactos/dll/win32/msisip/msisip.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/msisip.sp… ============================================================================== --- trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -4,5 +4,5 @@ 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData 10 stub MsiSIPVerifyIndirectData -11 stdcall DllRegisterServer() -12 stdcall DllUnregisterServer() +11 stdcall -private DllRegisterServer() +12 stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/mssign32/mssign32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… ============================================================================== --- trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,5 +1,5 @@ -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer @ stub FreeCryptProvFromCert @ stub GetCryptProvFromCert @ stub PvkFreeCryptProv Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -2 stdcall DllCanUnloadNow() -3 stdcall DllGetClassObject(ptr ptr ptr) -4 stdcall DllRegisterServer() -5 stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 6 stub HrDiAddComponentToINetCfg 7 stub LanaCfgFromCommandArgs 8 stub ModemClassCoInstaller Modified: trunk/reactos/dll/win32/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,9 +1,9 @@ 1 stub DoInitialCleanup -2 stdcall DllCanUnloadNow() -3 stdcall DllGetClassObject(ptr ptr ptr) -4 stdcall DllRegisterServer() -5 stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 6 stub HrCreateDesktopIcon 7 stub HrGetAnswerFileParametersForNetCard 8 stub HrGetExtendedStatusFromNCS Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -98,7 +98,7 @@ @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject (ptr ptr ptr) +@ stdcall DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/printui/printui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,8 +1,8 @@ @ stub ConnectToPrinterDlg @ stub ConnectToPrinterPropertyPage @ stub ConstructPrinterFriendlyName -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject @ stub DocumentPropertiesWrap @ stub PnPInterface @ stub PrintNotifyTray_Exit 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] Fri May 13 16:29:09 2011 @@ -113,16 +113,16 @@ 113 stdcall Control_RunDLLA(ptr ptr str long) 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) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) 118 stdcall DllGetVersion(ptr) 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW -120 stdcall DllInstall(long wstr) +@ stdcall -private DllInstall(long wstr) 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() -124 stdcall DllRegisterServer() -125 stdcall DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -7,8 +7,8 @@ @ stdcall ImageView_PrintToW(ptr ptr wstr long) @ stdcall imageview_fullscreenW(ptr ptr wstr long) ImageView_FullscreenW @ stub ConvertDIBSECTIONToThumbnail -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllInstall -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllInstall +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/url/url.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/url/url.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/url.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ @ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject @ stub DummyEntryPoint @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA Modified: trunk/reactos/dll/win32/userenv/userenv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -2,11 +2,11 @@ 133 stdcall DeleteProfileA(str str str) 134 stdcall DeleteProfileW(wstr wstr wstr) 176 stdcall DestroyEnvironmentBlock(ptr) -177 stub DllCanUnloadNow #stdcall DllCanUnloadNow() -178 stub DllGetClassObject #stdcall DllGetClassObject(ptr ptr ptr) -179 stub DllInstall #stdcall DllInstall(long wstr) -180 stub DllRegisterServer #stdcall DllRegisterServer() -181 stub DllUnregisterServer #stdcall DllUnregisterServer() +@ stub -private DllCanUnloadNow #stdcall DllCanUnloadNow() +@ stub -private DllGetClassObject #stdcall DllGetClassObject(ptr ptr ptr) +@ stub -private DllInstall #stdcall DllInstall(long wstr) +@ stub -private DllRegisterServer #stdcall DllRegisterServer() +@ stub -private DllUnregisterServer #stdcall DllUnregisterServer() 182 stdcall EnterCriticalPolicySection(long) 183 stdcall ExpandEnvironmentStringsForUserA(ptr str str long) 184 stdcall ExpandEnvironmentStringsForUserW(ptr wstr wstr long) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,5 +1,5 @@ -@ stdcall DllInitialize(long) -@ stdcall DllUnload() +@ stdcall -private DllInitialize(long) +@ stdcall -private DllUnload() ; Adapters (adapter.c) @ stdcall PcAddAdapterDevice(ptr ptr ptr long long)

1 0

[ekohl] 51700: [UMPNPMGR] Implement parts of PNP_CreateDevInst.
by ekohl＠svn.reactos.org 13 May '11

13 May '11

Author: ekohl Date: Fri May 13 15:56:50 2011 New Revision: 51700 URL: http://svn.reactos.org/svn/reactos?rev=51700&view=rev Log: [UMPNPMGR] Implement parts of PNP_CreateDevInst. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri May 13 15:56:50 2011 @@ -187,8 +187,7 @@ handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + return CR_SUCCESS; } @@ -197,8 +196,7 @@ handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + return CR_SUCCESS; } @@ -1107,6 +1105,157 @@ } +static VOID +SplitDeviceInstanceID(IN LPWSTR pszDeviceInstanceID, + OUT LPWSTR pszEnumerator, + OUT LPWSTR pszDevice, + OUT LPWSTR pszInstance) +{ + WCHAR szLocalDeviceInstanceID[MAX_DEVICE_ID_LEN]; + LPWSTR lpEnumerator = NULL; + LPWSTR lpDevice = NULL; + LPWSTR lpInstance = NULL; + LPWSTR ptr; + + wcscpy(szLocalDeviceInstanceID, pszDeviceInstanceID); + + *pszEnumerator = 0; + *pszDevice = 0; + *pszInstance = 0; + + lpEnumerator = szLocalDeviceInstanceID; + + ptr = wcschr(lpEnumerator, L'\\'); + if (ptr != NULL) + { + *ptr = 0; + lpDevice = ++ptr; + + ptr = wcschr(lpDevice, L'\\'); + if (ptr != NULL) + { + *ptr = 0; + lpInstance = ++ptr; + } + } + + if (lpEnumerator != NULL) + wcscpy(pszEnumerator, lpEnumerator); + + if (lpDevice != NULL) + wcscpy(pszDevice, lpDevice); + + if (lpInstance != NULL) + wcscpy(pszInstance, lpInstance); +} + + +static CONFIGRET +CreateDeviceInstance(LPWSTR pszDeviceID) +{ + WCHAR szEnumerator[MAX_DEVICE_ID_LEN]; + WCHAR szDevice[MAX_DEVICE_ID_LEN]; + WCHAR szInstance[MAX_DEVICE_ID_LEN]; + HKEY hKeyEnumerator; + HKEY hKeyDevice; + HKEY hKeyInstance; + HKEY hKeyControl; + LONG lError; + + /* Split the instance ID */ + SplitDeviceInstanceID(pszDeviceID, + szEnumerator, + szDevice, + szInstance); + + /* Open or create the enumerator key */ + lError = RegCreateKeyExW(hEnumKey, + szEnumerator, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyEnumerator, + NULL); + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Open or create the device key */ + lError = RegCreateKeyExW(hKeyEnumerator, + szDevice, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyDevice, + NULL); + + /* Close the enumerator key */ + RegCloseKey(hKeyEnumerator); + + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Try to open the instance key and fail if it exists */ + lError = RegOpenKeyExW(hKeyDevice, + szInstance, + 0, + KEY_SET_VALUE, + &hKeyInstance); + if (lError == ERROR_SUCCESS) + { + DPRINT1("Instance %S already exists!\n", szInstance); + RegCloseKey(hKeyInstance); + RegCloseKey(hKeyDevice); + return CR_ALREADY_SUCH_DEVINST; + } + + /* Create a new instance key */ + lError = RegCreateKeyExW(hKeyDevice, + szInstance, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyInstance, + NULL); + + /* Close the device key */ + RegCloseKey(hKeyDevice); + + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Create the 'Control' sub key */ + lError = RegCreateKeyExW(hKeyInstance, + L"Control", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyControl, + NULL); + if (lError == ERROR_SUCCESS) + { + RegCloseKey(hKeyControl); + } + + RegCloseKey(hKeyInstance); + + return (lError == ERROR_SUCCESS) ? CR_SUCCESS : CR_REGISTRY_ERROR; +} + + /* Function 28 */ DWORD PNP_CreateDevInst( handle_t hBinding, @@ -1115,8 +1264,25 @@ PNP_RPC_STRING_LEN ulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_CreateDevInst: %S\n", pszDeviceID); + + if (ulFlags & CM_CREATE_DEVNODE_GENERATE_ID) + { + /* FIXME */ + DPRINT1("CM_CREATE_DEVNODE_GENERATE_ID support not implemented yet!\n", ret); + ret = CR_CALL_NOT_IMPLEMENTED; + goto done; + } + + /* Create the device instance */ + ret = CreateDeviceInstance(pszDeviceID); + +done:; + DPRINT("PNP_CreateDevInst() done (returns %lx)\n", ret); + + return ret; } @@ -1886,7 +2052,6 @@ handle_t hBinding, DWORD ulFlags) { - UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; }

1 0

[gadamopoulos] 51699: [win32k] - Return the correct menu bar rect in GetMenuBarInfo
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 15:36:25 2011 New Revision: 51699 URL: http://svn.reactos.org/svn/reactos?rev=51699&view=rev Log: [win32k] - Return the correct menu bar rect in GetMenuBarInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 13 15:36:25 2011 @@ -1864,8 +1864,8 @@ } Rect.left = Offset.x; Rect.right = Offset.x + MenuObject->MenuInfo.Width; - Rect.top = Offset.y; - Rect.bottom = Offset.y + MenuObject->MenuInfo.Height; + Rect.bottom = Offset.y; + Rect.top = Offset.y - MenuObject->MenuInfo.Height; kmbi.rcBar = Rect; DPRINT("Rect top = %d bottom = %d left = %d right = %d \n", Rect.top, Rect.bottom, Rect.left, Rect.right);

1 0

[ilardig] 51698: [kbdit] - Fix the "divide" key. Thanks to Giannis Adamopoulos for the help. See issue #6250 for more details.
by ilardig＠svn.reactos.org 13 May '11

13 May '11

Author: ilardig Date: Fri May 13 15:16:49 2011 New Revision: 51698 URL: http://svn.reactos.org/svn/reactos?rev=51698&view=rev Log: [kbdit] - Fix the "divide" key. Thanks to Giannis Adamopoulos for the help. See issue #6250 for more details. Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] Fri May 13 15:16:49 2011 @@ -86,7 +86,7 @@ /* 32 */ 'M', /* 33 */ VK_OEM_COMMA, /* 34 */ VK_OEM_PERIOD, -/* 35 */ VK_OEM_MINUS, +/* 35 */ VK_DIVIDE, /* 36 */ VK_RSHIFT, /* 37 */ VK_MULTIPLY, /* 38 */ VK_LMENU,

1 0

[ekohl] 51697: [SETUPAPI] CM_Create_DevNode_ExW: Copy the device id string into a local buffer before passing it to PNP_CreateDevInst because its 2nd argument is an 'in out' string. Using a writabl...
by ekohl＠svn.reactos.org 13 May '11

13 May '11

Author: ekohl Date: Fri May 13 15:15:40 2011 New Revision: 51697 URL: http://svn.reactos.org/svn/reactos?rev=51697&view=rev Log: [SETUPAPI] CM_Create_DevNode_ExW: Copy the device id string into a local buffer before passing it to PNP_CreateDevInst because its 2nd argument is an 'in out' string. Using a writable string buffer prevents exceptions in case the device id passed to CM_Create_DevNode_ExW is a string constant. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Fri May 13 15:15:40 2011 @@ -595,8 +595,9 @@ HSTRING_TABLE StringTable = NULL; LPWSTR lpParentDevInst; CONFIGRET ret = CR_SUCCESS; - - FIXME("%p %s %p %lx %p\n", + WCHAR szLocalDeviceID[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); if (!pSetupIsUserAdmin()) @@ -605,7 +606,7 @@ if (pdnDevInst == NULL) return CR_INVALID_POINTER; - if (pDeviceID == NULL || wcslen(pDeviceID) == 0) + if (pDeviceID == NULL || wcslen(pDeviceID) == 0 || wcslen(pDeviceID) >= MAX_DEVICE_ID_LEN) return CR_INVALID_DEVICE_ID; if (dnParent == 0) @@ -634,10 +635,12 @@ if (lpParentDevInst == NULL) return CR_INVALID_DEVNODE; + wcscpy(szLocalDeviceID, pDeviceID); + RpcTryExcept { ret = PNP_CreateDevInst(BindingHandle, - pDeviceID, + szLocalDeviceID, lpParentDevInst, MAX_DEVICE_ID_LEN, ulFlags);

1 0

[gadamopoulos] 51696: [win32k] - Fix braindead logic that caused GetMenuItemRect to fail in every case
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 14:47:36 2011 New Revision: 51696 URL: http://svn.reactos.org/svn/reactos?rev=51696&view=rev Log: [win32k] - Fix braindead logic that caused GetMenuItemRect to fail in every case Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 13 14:47:36 2011 @@ -2050,7 +2050,6 @@ UINT uItem, PRECTL lprcItem) { - ROSMENUINFO mi; PWND ReferenceWnd; LONG XMove, YMove; RECTL Rect; @@ -2074,15 +2073,12 @@ if(!hWnd) { - if(!UserMenuInfo(Menu, &mi, FALSE)) - RETURN( FALSE); - if(mi.Wnd == 0) - RETURN( FALSE); + hWnd = Menu->MenuInfo.Wnd; } if (lprcItem == NULL) RETURN( FALSE); - if (!(ReferenceWnd = UserGetWindowObject(mi.Wnd))) RETURN( FALSE); + if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE); if(MenuItem->fType & MF_POPUP) {

1 0

[janderwald] 51695: [USBSTOR] - Start implementing write command - Disabled for now as it causes corruptions
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 14:44:24 2011 New Revision: 51695 URL: http://svn.reactos.org/svn/reactos?rev=51695&view=rev Log: [USBSTOR] - Start implementing write command - Disabled for now as it causes corruptions Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 13 14:44:24 2011 @@ -50,14 +50,14 @@ // Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) - { - DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); - - // - // send read command - // - Status = USBSTOR_SendReadCmd(DeviceObject, Irp); + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) + { + DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read / write command + // + Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 14:44:24 2011 @@ -332,6 +332,8 @@ { PIRP_CONTEXT Context; PIO_STACK_LOCATION IoStack; + UCHAR Code; + USBD_PIPE_HANDLE PipeHandle; DPRINT1("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); @@ -351,12 +353,31 @@ if (Context->TransferDataLength) { // + // get command code + // + Code = Context->cbw->CommandBlock[0]; + + if (Code == SCSIOP_WRITE) + { + // + // write request use bulk out pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + } + else + { + // + // default bulk in pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; + } + + // // now initialize the urb for sending data // - UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), - Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + PipeHandle, NULL, Context->TransferBufferMDL, Context->TransferDataLength, @@ -871,11 +892,11 @@ } NTSTATUS -USBSTOR_SendReadCmd( +USBSTOR_SendReadWriteCmd( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UFI_READ_CMD Cmd; + UFI_READ_WRITE_CMD Cmd; NTSTATUS Status; PPDO_DEVICE_EXTENSION PDODeviceExtension; PCDB pCDB; @@ -907,7 +928,12 @@ // // informal debug print // - DPRINT1("USBSTOR_SendReadCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + DPRINT1("USBSTOR_SendReadWriteCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + + // + // sanity check + // + ASSERT(PDODeviceExtension->BlockLength); // // block count @@ -917,8 +943,8 @@ // // initialize read cmd // - RtlZeroMemory(&Cmd, sizeof(UFI_READ_CMD)); - Cmd.Code = SCSIOP_READ; + RtlZeroMemory(&Cmd, sizeof(UFI_READ_WRITE_CMD)); + Cmd.Code = pCDB->AsByte[0]; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); Cmd.LogicalBlockByte0 = pCDB->CDB10.LogicalBlockByte0; @@ -931,7 +957,7 @@ // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 13 14:44:24 2011 @@ -158,11 +158,11 @@ UCHAR Reserved; // reserved 0x00 USHORT ContiguousLogicBlocks; // num of contiguous logical blocks UCHAR Reserved1[3]; // reserved 0x00 -}UFI_READ_CMD; - -C_ASSERT(sizeof(UFI_READ_CMD) == 12); - -#define UFI_READ_CMD_LEN (0xA) +}UFI_READ_WRITE_CMD; + +C_ASSERT(sizeof(UFI_READ_WRITE_CMD) == 12); + +#define UFI_READ_WRITE_CMD_LEN (0xA) //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -375,7 +375,7 @@ IN PIRP Irp); NTSTATUS -USBSTOR_SendReadCmd( +USBSTOR_SendReadWriteCmd( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

1 0

[janderwald] 51694: [USBSTOR] - Fix bug in read command, which uses wrong format. LBA address is stored in the CDB10 struct - Don't build the mdl for nonpaged pool if the driver passes an mdl (i/o ...
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 14:04:38 2011 New Revision: 51694 URL: http://svn.reactos.org/svn/reactos?rev=51694&view=rev Log: [USBSTOR] - Fix bug in read command, which uses wrong format. LBA address is stored in the CDB10 struct - Don't build the mdl for nonpaged pool if the driver passes an mdl (i/o paging requests) - Usbstor can now list disk contents and browse files when used in Windows XP - Need to implement SCSIOP_WRITE to write files Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 14:04:38 2011 @@ -507,6 +507,10 @@ return STATUS_INSUFFICIENT_RESOURCES; } + // + // build mdl for nonpaged pool + // + MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } } else @@ -522,12 +526,12 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // build mdl for nonpaged pool + // + MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } - - // - // build mdl for nonpaged pool - // - MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } // @@ -917,10 +921,12 @@ Cmd.Code = SCSIOP_READ; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); - - RtlCopyMemory(&Cmd.LogicalBlockAddress, pCDB->READ12.LogicalBlock, sizeof(UCHAR) * 4); - - DPRINT1("BlockAddress %lu BlockCount %lu BlockLength %lu\n", NTOHL(Cmd.LogicalBlockAddress), BlockCount, PDODeviceExtension->BlockLength); + Cmd.LogicalBlockByte0 = pCDB->CDB10.LogicalBlockByte0; + Cmd.LogicalBlockByte1 = pCDB->CDB10.LogicalBlockByte1; + Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; + Cmd.LogicalBlockByte3 = pCDB->CDB10.LogicalBlockByte3; + + DPRINT1("BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 13 14:04:38 2011 @@ -151,7 +151,10 @@ { UCHAR Code; // operation code UCHAR LUN; // lun - ULONG LogicalBlockAddress; // logical block address + UCHAR LogicalBlockByte0; // lba byte 0 + UCHAR LogicalBlockByte1; // lba byte 1 + UCHAR LogicalBlockByte2; // lba byte 2 + UCHAR LogicalBlockByte3; // lba byte 3 UCHAR Reserved; // reserved 0x00 USHORT ContiguousLogicBlocks; // num of contiguous logical blocks UCHAR Reserved1[3]; // reserved 0x00

1 0

[janderwald] 51693: [USBSTOR] - Handle SCSIOP_MEDIUM_REMOVAL - Handle paging i/o requests. These request don't provide a data buffer in the srb, but the buffer is stored in the irp' mdl - Fix the h...
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 13:37:50 2011 New Revision: 51693 URL: http://svn.reactos.org/svn/reactos?rev=51693&view=rev Log: [USBSTOR] - Handle SCSIOP_MEDIUM_REMOVAL - Handle paging i/o requests. These request don't provide a data buffer in the srb, but the buffer is stored in the irp' mdl - Fix the hack for unimplemented Mode Sense command - Usbstor now completes initializes and receives read requests - Still need to fix read request, as Windows XP fails to recognize the disk format, WIP Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 13 13:37:50 2011 @@ -53,12 +53,24 @@ else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) { DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); - ASSERT(Request->DataBuffer); // // send read command // Status = USBSTOR_SendReadCmd(DeviceObject, Irp); + } + else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) + { + DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); + + // + // just complete the request + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) { Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 13:37:50 2011 @@ -110,12 +110,34 @@ // Context = (PIRP_CONTEXT)Ctx; + // + // is there a mdl + // if (Context->TransferBufferMDL) { // - // free mdl - // - IoFreeMdl(Context->TransferBufferMDL); + // is there an irp associated + // + if (Context->Irp) + { + // + // did we allocate the mdl + // + if (Context->TransferBufferMDL != Context->Irp->MdlAddress) + { + // + // free mdl + // + IoFreeMdl(Context->TransferBufferMDL); + } + } + else + { + // + // free mdl + // + IoFreeMdl(Context->TransferBufferMDL); + } } if (Context->Irp) @@ -317,7 +339,6 @@ // access context // Context = (PIRP_CONTEXT)Ctx; - // // get next stack location @@ -461,15 +482,46 @@ if (Context->TransferDataLength) { // - // allocate mdl for buffer, buffer must be allocated from NonPagedPool - // - Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); - if (!Context->TransferBufferMDL) + // check if the original request already does not have an mdl associated + // + if (OriginalRequest) { - // - // failed to allocate MDL - // - return STATUS_INSUFFICIENT_RESOURCES; + if (OriginalRequest->MdlAddress != NULL && Context->TransferData == NULL) + { + // + // I/O paging request + // + Context->TransferBufferMDL = OriginalRequest->MdlAddress; + } + else + { + // + // allocate mdl for buffer, buffer must be allocated from NonPagedPool + // + Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); + if (!Context->TransferBufferMDL) + { + // + // failed to allocate MDL + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + } + } + else + { + // + // allocate mdl for buffer, buffer must be allocated from NonPagedPool + // + Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); + if (!Context->TransferBufferMDL) + { + // + // failed to allocate MDL + // + return STATUS_INSUFFICIENT_RESOURCES; + } } // @@ -656,8 +708,26 @@ PCDB pCDB; PUFI_MODE_PARAMETER_HEADER Header; - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + RtlZeroMemory(Request->DataBuffer, Request->DataTransferLength); + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; #if 0 // @@ -808,6 +878,7 @@ ULONG BlockCount; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + PVOID Buffer; // // get current stack location @@ -830,10 +901,9 @@ PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // - // FIXME: support more logical blocks - // - DPRINT1("Request->DataTransferLength %x, PDODeviceExtension->BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); - ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); + // informal debug print + // + DPRINT1("USBSTOR_SendReadCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); // // block count @@ -855,7 +925,7 @@ // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); } NTSTATUS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs