Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 17837: rename variable and change parameters in call to find_last_not_of() to hopefully be a little more accurate to what it's doing
by royce＠svn.reactos.com 13 Sep '05

13 Sep '05

rename variable and change parameters in call to find_last_not_of() to hopefully be a little more accurate to what it's doing Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-13 19:04:24 UTC (rev 17836) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-13 19:11:37 UTC (rev 17837) @@ -863,9 +863,9 @@ token = strtok ( NULL, separators ); } string version = string ( prevtoken ); - int firstSpace = version.find_last_not_of ( " \t" ); - if ( firstSpace != -1 ) - return string ( version, 0, firstSpace); + int lastDigit = version.find_last_not_of ( "\t\r\n" ); + if ( lastDigit != -1 ) + return string ( version, 0, lastDigit+1 ); else return version; }

1 0

[royce] 17836: fix bug in GetBinutilsVersion()
by royce＠svn.reactos.com 13 Sep '05

13 Sep '05

fix bug in GetBinutilsVersion() Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-13 18:08:18 UTC (rev 17835) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-13 19:04:24 UTC (rev 17836) @@ -865,7 +865,7 @@ string version = string ( prevtoken ); int firstSpace = version.find_last_not_of ( " \t" ); if ( firstSpace != -1 ) - return string ( version, 0, firstSpace - 1); + return string ( version, 0, firstSpace); else return version; } @@ -910,7 +910,7 @@ } if ( detectedBinutils ) { - const string& binutilsVersion = GetBinutilsVersion ( binutilsCommand ); + string binutilsVersion = GetBinutilsVersion ( binutilsCommand ); if ( IsSupportedBinutilsVersion ( binutilsVersion ) ) printf ( "detected (%s)\n", binutilsCommand.c_str () ); else

1 0

[hbirr] 17835: - Freed the path string for the keyboard dll.
by hbirr＠svn.reactos.com 13 Sep '05

13 Sep '05

- Freed the path string for the keyboard dll. - Freed some strings in all cases. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-13 18:04:00 UTC (rev 17834) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-13 18:08:18 UTC (rev 17835) @@ -616,8 +616,9 @@ RtlInitUnicodeString(&LayoutValueName,L"Layout File"); Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); + RtlFreeUnicodeString(&LayoutKeyName); + if( !NT_SUCCESS(Status) ) { DPRINT1("Got default locale but not layout file. (%08lx)\n", @@ -627,8 +628,8 @@ { DPRINT("Read registry and got %wZ\n", &LayoutFile); - RtlFreeUnicodeString(&LayoutKeyName); + RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE); DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); @@ -647,7 +648,7 @@ return; } memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, - FullLayoutPath.Length + sizeof(WCHAR)); + FullLayoutPath.Length); KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; kbModule = EngLoadImage(KeyboardLayoutWSTR); @@ -656,6 +657,7 @@ if( !kbModule ) DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + ExFreePool(KeyboardLayoutWSTR); RtlFreeUnicodeString(&FullLayoutPath); } } @@ -694,7 +696,7 @@ #undef XX_STATUS } -PKBDTABLES W32kGetDefaultKeyLayout() +PKBDTABLES W32kGetDefaultKeyLayout(VOID) { PKBDTABLES pkKeyboardLayout = 0; InitKbdLayout( (PVOID) &pkKeyboardLayout );

1 0

[hbirr] 17834: Fixed the declaration of RtlPinAtomInAtomTable.
by hbirr＠svn.reactos.com 13 Sep '05

13 Sep '05

Fixed the declaration of RtlPinAtomInAtomTable. Modified: trunk/reactos/w32api/include/winternl.h _____ Modified: trunk/reactos/w32api/include/winternl.h --- trunk/reactos/w32api/include/winternl.h 2005-09-13 16:49:56 UTC (rev 17833) +++ trunk/reactos/w32api/include/winternl.h 2005-09-13 18:04:00 UTC (rev 17834) @@ -2093,7 +2093,7 @@ NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); DWORD WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); -NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); +NTSTATUS WINAPI RtlPinAtomInAtomTable(PRTL_ATOM_TABLE,RTL_ATOM); BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

[gvg] 17833: SVN maintenance: makefile was replaced by GNUmakefile
by gvg＠svn.reactos.com 13 Sep '05

13 Sep '05

SVN maintenance: makefile was replaced by GNUmakefile Property changes on: trunk/reactos/drivers/usb/miniport/usbohci ___________________________________________________________________ Name: svn:ignore - *.coff *.a *.d *.o *.sym *.sys *.map *.tmp makefile + *.coff *.a *.d *.o *.sym *.sys *.map *.tmp GNUmakefile Property changes on: trunk/reactos/drivers/usb/miniport/usbuhci ___________________________________________________________________ Name: svn:ignore - *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d makefile + *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d GNUmakefile Property changes on: trunk/reactos/drivers/usb/usbhub ___________________________________________________________________ Name: svn:ignore - makefile + GNUmakefile Property changes on: trunk/reactos/drivers/usb/usbport ___________________________________________________________________ Name: svn:ignore - *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d makefile + *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d GNUmakefile

1 0

[blight] 17832: Implement QUERYESCSUPPORT escape in ExtEscape (returns FALSE always)
by blight＠svn.reactos.com 13 Sep '05

13 Sep '05

Implement QUERYESCSUPPORT escape in ExtEscape (returns FALSE always) Modified: trunk/reactos/subsys/win32k/objects/print.c _____ Modified: trunk/reactos/subsys/win32k/objects/print.c --- trunk/reactos/subsys/win32k/objects/print.c 2005-09-13 14:46:00 UTC (rev 17831) +++ trunk/reactos/subsys/win32k/objects/print.c 2005-09-13 14:46:48 UTC (rev 17832) @@ -55,17 +55,20 @@ LPCSTR InData, LPVOID OutData) { + if (Escape == QUERYESCSUPPORT) + return FALSE; + UNIMPLEMENTED; - return 0; + return SP_ERROR; } INT STDCALL NtGdiEscape(HDC hDC, - INT Escape, - INT InSize, - LPCSTR InData, - LPVOID OutData) + INT Escape, + INT InSize, + LPCSTR InData, + LPVOID OutData) { PDC dc; INT ret; @@ -74,7 +77,7 @@ if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; + return SP_ERROR; } /* TODO FIXME - don't pass umode buffer to an Int function */ @@ -94,10 +97,10 @@ INT OutSize, LPVOID OutData) { - if (Escape == 0x1101) - return 0; + if (Escape == QUERYESCSUPPORT) + return FALSE; - DPRINT1("IntEngExtEscape is nimplemented. - Keep going and have a nice day\n"); + DPRINT1("IntEngExtEscape is unimplemented. - Keep going and have a nice day\n"); return -1; }

1 0

[blight] 17831: Query support for opengl-driver-info escape before calling it and some other minor changes.
by blight＠svn.reactos.com 13 Sep '05

13 Sep '05

Query support for opengl-driver-info escape before calling it and some other minor changes. Modified: trunk/reactos/lib/opengl32/opengl32.c Modified: trunk/reactos/lib/opengl32/opengl32.h Modified: trunk/reactos/lib/opengl32/wgl.c _____ Modified: trunk/reactos/lib/opengl32/opengl32.c --- trunk/reactos/lib/opengl32/opengl32.c 2005-09-13 14:34:48 UTC (rev 17830) +++ trunk/reactos/lib/opengl32/opengl32.c 2005-09-13 14:46:00 UTC (rev 17831) @@ -78,10 +78,11 @@ static void OPENGL32_ThreadDetach() { - /* FIXME - do we need to release some HDC or something? */ GLTHREADDATA* lpData = NULL; PROC *dispatchTable = NULL; + rosglMakeCurrent( NULL, NULL ); + lpData = (GLTHREADDATA*)TlsGetValue( OPENGL32_tls ); if (lpData != NULL) { _____ Modified: trunk/reactos/lib/opengl32/opengl32.h --- trunk/reactos/lib/opengl32/opengl32.h 2005-09-13 14:34:48 UTC (rev 17830) +++ trunk/reactos/lib/opengl32/opengl32.h 2005-09-13 14:46:00 UTC (rev 17831) @@ -33,10 +33,12 @@ /* debug flags */ #if !defined(NDEBUG) # define DEBUG_OPENGL32 -/*# define DEBUG_OPENGL32_BRKPTS*/ /* enable breakpoints */ -# define DEBUG_OPENGL32_ICD_EXPORTS /* dumps the list of (un)supported glXXX - functions when an ICD is loaded. */ -# define DEBUG_OPENGL32_TRACE /* prints much information about whats going on */ +/* enable breakpoints */ +/*# define DEBUG_OPENGL32_BRKPTS*/ +/* dumps the list of (un)supported glXXX functions when an ICD is loaded. */ +# define DEBUG_OPENGL32_ICD_EXPORTS +/* prints much information about whats going on */ +# define DEBUG_OPENGL32_TRACE #endif /* !NDEBUG */ /* debug macros */ @@ -196,8 +198,8 @@ /* function prototypes */ GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver ); BOOL OPENGL32_UnloadICD( GLDRIVERDATA *icd ); +BOOL APIENTRY rosglMakeCurrent( HDC hdc, HGLRC hglrc ); - /* empty gl functions from gl.c */ int STDCALL glEmptyFunc0(); int STDCALL glEmptyFunc4( long ); _____ Modified: trunk/reactos/lib/opengl32/wgl.c --- trunk/reactos/lib/opengl32/wgl.c 2005-09-13 14:34:48 UTC (rev 17830) +++ trunk/reactos/lib/opengl32/wgl.c 2005-09-13 14:46:00 UTC (rev 17831) @@ -26,13 +26,13 @@ #endif -#define EXT_GET_DRIVERINFO 0x1101 /*!< ExtEscape code to get driver info */ -typedef struct tagEXTDRIVERINFO +#define EXT_QUERY_OPENGLDRIVERINFO 0x1101 /*!< ExtEscape code to get driver info */ +typedef struct tagEXT_OPENGLDRIVERINFO { DWORD version; /*!< Driver interface version */ DWORD driver_version; /*!< Driver version */ WCHAR driver_name[256]; /*!< Driver name */ -} EXTDRIVERINFO; +} EXT_OPENGLDRIVERINFO; /*! \brief Append OpenGL Rendering Context (GLRC) to list @@ -93,11 +93,12 @@ if (p->next == glrc) { p->next = glrc->next; - return; + break; } p = p->next; } - DBGPRINT( "Error: GLRC 0x%08x not found in list!", glrc ); + if (p == NULL) + DBGPRINT( "Error: GLRC 0x%08x not found in list!", glrc ); } /* release mutex */ @@ -165,6 +166,7 @@ ROSGL_ContainsContext( GLRC *glrc ) { GLRC *p; + BOOL found = FALSE; /* synchronize */ if (WaitForSingleObject( OPENGL32_processdata.glrc_mutex, INFINITE ) == @@ -178,7 +180,10 @@ while (p != NULL) { if (p == glrc) - return TRUE; + { + found = TRUE; + break; + } p = p->next; } @@ -186,7 +191,7 @@ if (!ReleaseMutex( OPENGL32_processdata.glrc_mutex )) DBGPRINT( "Error: ReleaseMutex() failed (%d)", GetLastError() ); - return FALSE; + return found; } @@ -206,6 +211,14 @@ { GLDCDATA *data; + /* check hdc */ + if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) + { + DBGPRINT( "Error: hdc is not a DC handle!" ); + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + /* synchronize */ if (WaitForSingleObject( OPENGL32_processdata.dcdata_mutex, INFINITE ) == WAIT_FAILED) @@ -281,17 +294,24 @@ if (dcdata->icd == NULL) { LPCWSTR driverName; - EXTDRIVERINFO info; + EXT_OPENGLDRIVERINFO info; driverName = _wgetenv( L"OPENGL32_DRIVER" ); if (driverName == NULL) { - DWORD dwInput = 0; + DWORD dwInput; LONG ret; /* get driver name */ - ret = ExtEscape( hdc, EXT_GET_DRIVERINFO, sizeof (dwInput), (LPCSTR)&dwInput, - sizeof (EXTDRIVERINFO), (LPSTR)&info ); + dwInput = EXT_QUERY_OPENGLDRIVERINFO; + ret = ExtEscape( hdc, QUERYESCSUPPORT, sizeof (dwInput), (LPCSTR)&dwInput, 0, NULL ); + if (ret > 0) + { + dwInput = 0; + ret = ExtEscape( hdc, EXT_QUERY_OPENGLDRIVERINFO, sizeof (dwInput), + (LPCSTR)&dwInput, sizeof (EXT_OPENGLDRIVERINFO), + (LPSTR)&info ); + } if (ret <= 0) { HKEY hKey; @@ -299,11 +319,10 @@ if (ret < 0) { - DBGPRINT( "Warning: ExtEscape to get the drivername failed!!! (%d)", GetLastError() ); + DBGPRINT( "Warning: ExtEscape to get the drivername failed! (%d)", GetLastError() ); if (MessageBox( WindowFromDC( hdc ), L"Couldn't get installable client driver name!\nUsing default driver.", L"OPENGL32.dll: Warning", MB_OKCANCEL | MB_ICONWARNING ) == IDCANCEL) { - SetLastError( 0 ); return NULL; } } @@ -337,12 +356,12 @@ dcdata->icd = OPENGL32_LoadICD( info.driver_name ); if (dcdata->icd == NULL) { - WCHAR Buffer[256]; - snwprintf(Buffer, sizeof(Buffer)/sizeof(WCHAR), - L"Couldn't load driver \"%s\".", driverName); + WCHAR Buffer[256]; + snwprintf(Buffer, sizeof(Buffer)/sizeof(WCHAR), + L"Couldn't load driver \"%s\".", driverName); MessageBox(WindowFromDC( hdc ), Buffer, L"OPENGL32.dll: Warning", - MB_OK | MB_ICONWARNING); + MB_OK | MB_ICONWARNING); } } @@ -381,7 +400,7 @@ size = sizeof (PROC) * table->num_funcs; memcpy( tebTable, table->dispatch_table, size ); memset( tebTable + table->num_funcs, 0, - sizeof (table->dispatch_table) - size ); + sizeof (table->dispatch_table) - size ); } else { @@ -390,19 +409,19 @@ } /* put in empty functions as long as we dont have a fallback */ - #define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ - if (tebTable[icdidx] == NULL) \ - { \ - if (table != NULL) \ - DBGPRINT( "Warning: GL proc '%s' is NULL", #func ); \ - tebTable[icdidx] = (PROC)glEmptyFunc##stack; \ + #define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ + if (tebTable[icdidx] == NULL) \ + { \ + if (table != NULL) \ + DBGPRINT( "Warning: GL proc '%s' is NULL", #func ); \ + tebTable[icdidx] = (PROC)glEmptyFunc##stack; \ } GLFUNCS_MACRO #undef X /* fill teb->glDispatchTable for fast calls */ - #define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ - if (tebidx >= 0) \ + #define X(func, ret, typeargs, args, icdidx, tebidx, stack) \ + if (tebidx >= 0) \ tebDispatchTable[tebidx] = tebTable[icdidx]; GLFUNCS_MACRO #undef X @@ -453,7 +472,7 @@ /* check input */ if (pfd->nSize != sizeof (PIXELFORMATDESCRIPTOR) || pfd->nVersion != 1) { - SetLastError( 0 ); /* FIXME: use appropriate errorcode */ + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } @@ -544,18 +563,21 @@ if (!ROSGL_ContainsContext( src )) { DBGPRINT( "Error: src GLRC not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } if (!ROSGL_ContainsContext( dst )) { DBGPRINT( "Error: dst GLRC not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } /* I think this is only possible within one ICD */ if (src->icd != src->icd) { DBGPRINT( "Error: src and dst GLRC use different ICDs!" ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } @@ -599,6 +621,7 @@ icd = ROSGL_ICDForHDC( hdc ); if (icd == NULL) { + ROSGL_DeleteContext( glrc ); DBGPRINT( "Couldn't get ICD by HDC :-(" ); /* FIXME: fallback? */ return NULL; @@ -663,14 +686,16 @@ if (!ROSGL_ContainsContext( glrc )) { DBGPRINT( "Error: hglrc not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } /* make sure GLRC is not current for some thread */ if (glrc->is_current) { DBGPRINT( "Error: GLRC is current for DC 0x%08x", glrc->hdc ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_FUNCTION ); + return FALSE; } /* release ICD's context */ @@ -694,6 +719,7 @@ UINT nBytes, LPLAYERPLANEDESCRIPTOR plpd ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -722,6 +748,10 @@ if (ret == 0) DBGPRINT( "Error: DrvDescribePixelFormat(format=%d) failed (%d)", iFormat, GetLastError() ); } + else + { + SetLastError( ERROR_INVALID_FUNCTION ); + } return ret; } @@ -763,6 +793,7 @@ int cEntries, COLORREF *pcr ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; } @@ -807,37 +838,26 @@ APIENTRY rosglGetProcAddress( LPCSTR proc ) { + PROC func; + GLDRIVERDATA *icd; + if (OPENGL32_threaddata->glrc == NULL) { DBGPRINT( "Error: No current GLRC!" ); + SetLastError( ERROR_INVALID_FUNCTION ); return NULL; } - if (proc[0] == 'g' && proc[1] == 'l' && proc[2] != 'u') /* glXXX */ + icd = OPENGL32_threaddata->glrc->icd; + func = icd->DrvGetProcAddress( proc ); + if (func != NULL) { - PROC glXXX = NULL; - GLDRIVERDATA *icd = OPENGL32_threaddata->glrc->icd; - glXXX = icd->DrvGetProcAddress( proc ); - if (glXXX) - { - DBGPRINT( "Info: Proc \"%s\" loaded from ICD.", proc ); - return glXXX; - } - - /* FIXME: go through own functions? */ - DBGPRINT( "Warning: Unsupported GL extension: %s", proc ); + DBGPRINT( "Info: Proc \"%s\" loaded from ICD.", proc ); + return func; } - if (proc[0] == 'w' && proc[1] == 'g' && proc[2] == 'l') /* wglXXX */ - { - /* FIXME: support wgl extensions? (there are such IIRC) */ - DBGPRINT( "Warning: Unsupported WGL extension: %s", proc ); - } - if (proc[0] == 'g' && proc[1] == 'l' && proc[2] == 'u') /* gluXXX */ - { - /* FIXME: do we support these as well? */ - DBGPRINT( "Warning: GLU extension %s requested, returning NULL", proc ); - } + /* FIXME: Should we return wgl/gl 1.1 functions? */ + SetLastError( ERROR_PROC_NOT_FOUND ); return NULL; } @@ -882,6 +902,7 @@ if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) { DBGPRINT( "Error: hdc is not a DC handle!" ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } @@ -889,20 +910,23 @@ if (!ROSGL_ContainsContext( glrc )) { DBGPRINT( "Error: hglrc not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } /* check if it is available */ if (glrc->is_current && glrc->thread_id != GetCurrentThreadId()) /* used by another thread */ { DBGPRINT( "Error: hglrc is current for thread 0x%08x", glrc->thread_id ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } /* call the ICD */ if (glrc->hglrc != NULL) { DBGPRINT( "Info: Calling DrvSetContext!" ); + SetLastError( ERROR_SUCCESS ); icdTable = glrc->icd->DrvSetContext( hdc, glrc->hglrc, ROSGL_SetContextCallBack ); if (icdTable == NULL) @@ -936,6 +960,7 @@ rosglRealizeLayerPalette( HDC hdc, int iLayerPlane, BOOL bRealize ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -946,6 +971,7 @@ int cEntries, CONST COLORREF *pcr ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; } @@ -1018,18 +1044,21 @@ if (!ROSGL_ContainsContext( glrc1 )) { DBGPRINT( "Error: hglrc1 not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } if (!ROSGL_ContainsContext( glrc2 )) { DBGPRINT( "Error: hglrc2 not found!" ); - return FALSE; /* FIXME: SetLastError() */ + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } /* I think this is only possible within one ICD */ if (glrc1->icd != glrc2->icd) { DBGPRINT( "Error: hglrc1 and hglrc2 use different ICDs!" ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } @@ -1063,6 +1092,7 @@ } /* FIXME: implement own functionality? */ + SetLastError( ERROR_INVALID_FUNCTION ); return FALSE; } @@ -1072,6 +1102,7 @@ rosglSwapLayerBuffers( HDC hdc, UINT fuPlanes ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1081,6 +1112,7 @@ rosglUseFontBitmapsA( HDC hdc, DWORD first, DWORD count, DWORD listBase ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1090,6 +1122,7 @@ rosglUseFontBitmapsW( HDC hdc, DWORD first, DWORD count, DWORD listBase ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1101,6 +1134,7 @@ GLYPHMETRICSFLOAT *pgmf ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1112,6 +1146,7 @@ GLYPHMETRICSFLOAT *pgmf ) { UNIMPLEMENTED; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; }

1 0

[royce] 17830: copy&paste enhancement
by royce＠svn.reactos.com 13 Sep '05

13 Sep '05

copy&paste enhancement patch by "brbak" (see bug 749) Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-13 11:57:50 UTC (rev 17829) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-13 14:34:48 UTC (rev 17830) @@ -516,7 +516,7 @@ ModifierState |= fsModifiers; if (ModifierState == fsModifiers && - (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN)) + (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN || fsModifiers == MOD_CONTROL)) { /* First send out special notifications * (For alt, the message that turns on accelerator @@ -637,7 +637,29 @@ else msg.message = WM_SYSKEYUP; } - else + else if (ModifierState & MOD_CONTROL) + { + if(NextKeyInput.MakeCode == 0x2E)/* Ctrl-C */ + { + DPRINT1("Ctrl-C pressed\n"); + co_MsqPostKeyboardMessage(WM_COPY,0,0); + continue; + } + else if(NextKeyInput.MakeCode == 0x2F) /* Ctrl-V */ + { + DPRINT1("Ctrl-V pressed\n"); + co_MsqPostKeyboardMessage(WM_PASTE,0,0); + continue; + } + else + { + DPRINT1("Ctrl with unknown combination %04x\n",NextKeyInput.MakeCode); + if (!(KeyInput.Flags & KEY_BREAK)) + msg.message = WM_KEYDOWN; + else + msg.message = WM_KEYUP; + } + }else { if (!(KeyInput.Flags & KEY_BREAK)) msg.message = WM_KEYDOWN;

1 0

[royce] 17829: fix crash in 'make msvc'
by royce＠svn.reactos.com 13 Sep '05

13 Sep '05

fix crash in 'make msvc' Modified: trunk/reactos/tools/rbuild/XML.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-09-13 03:51:18 UTC (rev 17828) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-09-13 11:57:50 UTC (rev 17829) @@ -230,6 +230,11 @@ } if ( include_last && strcmp ( prev, "." ) ) out.push_back ( prev ); + // special-case where path only has "." + // don't move this check up higher as it might miss + // some funny paths... + if ( !out.size() && !strcmp ( prev, "." ) ) + out.push_back ( "." ); } XMLFile::XMLFile()

1 0

[sedwards] 17828: added LGPL license header to the code from Wine and Patrik Stridvall and Royce Mitchell III as authors
by sedwards＠svn.reactos.com 13 Sep '05

13 Sep '05

added LGPL license header to the code from Wine and Patrik Stridvall and Royce Mitchell III as authors Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-09-13 03:46:22 UTC (rev 17827) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-09-13 03:51:18 UTC (rev 17828) @@ -2,6 +2,7 @@ * Copyright (C) 2005 Trevor McCort * Copyright (C) 2005 Casper S. Hornstrup * Copyright (C) 2005 Steven Edwards + * Copyright (C) 2005 Royce Mitchell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-09-13 03:46:22 UTC (rev 17827) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-09-13 03:51:18 UTC (rev 17828) @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2002 Patrik Stridvall + * Copyright (C) 2005 Royce Mitchell III + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #ifdef _MSC_VER #pragma warning ( disable : 4786 ) #endif//_MSC_VER _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-09-13 03:46:22 UTC (rev 17827) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-09-13 03:51:18 UTC (rev 17828) @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2002 Patrik Stridvall + * Copyright (C) 2005 Royce Mitchell III + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #ifdef _MSC_VER #pragma warning ( disable : 4786 ) #endif//_MSC_VER

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