Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[cfinck] 30903: Change "ca-CA" to "ca-ES" again, forgot about that when committing some Catalan translations from Bugzilla

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Nov 30 01:19:15 2007 New Revision: 30903 URL: http://svn.reactos.org/svn/reactos?rev=30903&view=rev Log: Change "ca-CA" to "ca-ES" again, forgot about that when committing some Catalan translations from Bugzilla Added: trunk/reactos/base/applications/logoff/lang/ca-ES.rc - copied unchanged from r30902, trunk/reactos/base/applications/logoff/lang/ca-CA.rc trunk/reactos/base/applications/mmc/lang/ca-ES.rc - copied unchanged from r30902, trunk/reactos/base/applications/mmc/lang/ca-CA.rc trunk/reactos/base/applications/mstsc/lang/ca-ES.rc - copied unchanged from r30902, trunk/reactos/base/applications/mstsc/lang/ca-CA.rc Removed: trunk/reactos/base/applications/logoff/lang/ca-CA.rc trunk/reactos/base/applications/mmc/lang/ca-CA.rc trunk/reactos/base/applications/mstsc/lang/ca-CA.rc Modified: trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc Removed: trunk/reactos/base/applications/logoff/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/logoff/lang/ca-CA.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - -IDS_USAGE, "Finalitza una sessió.\n\n\ - /v\t\tMostra informació en quant a les accions dutes a terme.\n\ - /?\t\tMostra aquesta informació.\n\n" - -IDS_LOGOFF_REMOTE, "Finalitzant sessió en un equip remot." -IDS_LOGOFF_LOCAL, "Finalitzant la sessió actual en aquesta equip." - -IDS_ILLEGAL_PARAM, "Parametre(s) no vàlid(s)\n" -} -/* EOF */ Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc Fri Nov 30 01:19:15 2007 @@ -2,7 +2,7 @@ #include "resource.h" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Removed: trunk/reactos/base/applications/mmc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/mmc/lang/ca-CA.rc (removed) @@ -1,21 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -IDM_CONSOLEROOT MENU DISCARDABLE -BEGIN - POPUP "&Fitxer" - BEGIN - MENUITEM SEPARATOR - MENUITEM "&Sortida\tAlt+F4", ID_FILE_EXIT - END - - POPUP "&Ajuda" - BEGIN - MENUITEM "&En quant a Consola d'administracio de ReactOS...", ID_HELP_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "Consola d'administracio de ReactOS" - IDS_CONSOLETITLE "Consola%1!u!" -END Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Fri Nov 30 01:19:15 2007 @@ -1,9 +1,8 @@ - #include <windows.h> #include "resource.h" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Removed: trunk/reactos/base/applications/mstsc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ca-CA.rc (removed) @@ -1,63 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -IDD_GENERAL DIALOGEX 0, 0, 242, 175 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Paràmetres d'entrada",IDC_STATIC,7,7,228,89 - GROUPBOX "Paràmetres de connexió",IDC_STATIC,7,103,228,65 - ICON "", IDC_LOGONICON, 15,19,20,20 - LTEXT "Entreu l'adreça del servidor",IDC_STATIC,47,24,81,8 - LTEXT "Servidor:",IDC_STATIC,47,41,25,8 - LTEXT "Nom d'usuari:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Desa",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Desa com...",IDC_SAVEAS,123,139,50,14 - PUSHBUTTON "Obre...",IDC_OPEN,177,139,50,14 - ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Guarda els paràmetres de la connexió actual o obre una configuració existent",IDC_STATIC,50,115,172,20 -END - -IDD_DISPLAY DIALOGEX 0, 0, 242, 175 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Tamany de l'escriptori Remot",IDC_STATIC,7,7,228,68 - GROUPBOX "Colors",IDC_STATIC,7,83,228,85 - ICON "", IDC_REMICON, 15,19,20,20 - ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Trieu el tamany de pantalla del escriptori remot. Arrossegueu el cursor al extrem dret per a pantalla complerta",IDC_STATIC,53,22,175,21 - CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 - COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "Nota: La configuració del equip remot pot canviar aquestes configuracions.",IDC_STATIC,56,143,165,18 - LTEXT "Menys",IDC_STATIC,35,42,15,8 - LTEXT "Més",IDC_STATIC,189,42,17,8 - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER -END - -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remote Desktop Connection" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Connectar",IDOK,147,245,50,14 - PUSHBUTTON "Cancel·lar",IDCANCEL,203,245,50,14 - CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 -END - - -STRINGTABLE -BEGIN - IDS_TAB_GENERAL "General" - IDS_TAB_DISPLAY "Pantalla" - IDS_256COLORS "256 Colors" - IDS_HIGHCOLOR15 "High Color (15 bit)" - IDS_HIGHCOLOR16 "High Color (16 bit)" - IDS_HIGHCOLOR24 "Color Real (24 bit)" - IDS_PIXEL "%lux%lu Pixels" - IDS_FULLSCREEN "Pantalla Complerta" - IDS_BROWSESERVER "<Navega per més...>" - IDS_HEADERTEXT1 "Remote Desktop" - IDS_HEADERTEXT2 "Connection" -END Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Fri Nov 30 01:19:15 2007 @@ -14,7 +14,7 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc"

16 years, 9 months

[greatlrd] 30902: fixed almost all case for wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfvARB full support of them are not done yet. documations over it is found at http://msdn2.microsoft.com/EN-US/library/ms537569.aspx and http://developer.3dlabs.com/documents/WGLmanpages/wglgetpixelformatattribarb.htm This change was done by me (Magnus Olsen magnus at greatlord dot com) and Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) we done this toghter

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Nov 30 00:30:21 2007 New Revision: 30902 URL: http://svn.reactos.org/svn/reactos?rev=30902&view=rev Log: fixed almost all case for wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfvARB full support of them are not done yet. documations over it is found at http://msdn2.microsoft.com/EN-US/library/ms537569.aspx and http://developer.3dlabs.com/documents/WGLmanpages/wglgetpixelformatattribar… This change was done by me (Magnus Olsen magnus at greatlord dot com) and Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) we done this toghter Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Fri Nov 30 00:30:21 2007 @@ -772,7 +772,20 @@ /* WGL_ARB_pixel_format */ #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +#define WGL_DRAW_TO_WINDOW_ARB 0x2001 +#define WGL_DRAW_TO_BITMAP_ARB 0x2002 +#define WGL_ACCELERATION_ARB 0x2003 +#define WGL_NEED_PALETTE_ARB 0x2004 +#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 +#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 +#define WGL_SWAP_METHOD_ARB 0x2007 +#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 +#define WGL_TRANSPARENT_ARB 0x200A +#define WGL_SHARE_DEPTH_ARB 0x200C +#define WGL_SHARE_ACCUM_ARB 0x200E +#define WGL_SUPPORT_GDI_ARB 0x200F #define WGL_SUPPORT_OPENGL_ARB 0x2010 +#define WGL_DOUBLE_BUFFER_ARB 0x2011 #define WGL_STEREO_ARB 0x2012 #define WGL_PIXEL_TYPE_ARB 0x2013 #define WGL_COLOR_BITS_ARB 0x2014 @@ -791,6 +804,17 @@ #define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 #define WGL_DEPTH_BITS_ARB 0x2022 #define WGL_STENCIL_BITS_ARB 0x2023 +#define WGL_AUX_BUFFERS_ARB 0x2024 +#define WGL_NO_ACCELERATION_ARB 0x2025 +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 +#define WGL_DRAW_TO_PBUFFER_ARB 0x202D +#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E +#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F +#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 +#define WGL_SAMPLES_ARB 0x2042 + GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, @@ -801,43 +825,503 @@ int *piValues) { BOOL retVal = FALSE; + BOOL Count = 0; int i; for (i=0;i<nAttributes;i++) { switch (piAttributes[i]) { + + case WGL_ACCELERATION_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ( ( pfd[iPixelFormat - 1].pfd.dwFlags & PFD_GENERIC_FORMAT ) == PFD_GENERIC_FORMAT) + { + piValues[i] = WGL_NO_ACCELERATION_ARB; // or WGL_GENERIC_ACCELERATION_ARB ? + } + + else if ( ( pfd[iPixelFormat - 1].pfd.dwFlags & PFD_GENERIC_FORMAT ) == PFD_GENERIC_ACCELERATED) + { + piValues[i] = WGL_GENERIC_ACCELERATION_ARB; // or WGL_FULL_ACCELERATION_ARB ? + } + else + { + piValues[i] = WGL_FULL_ACCELERATION_ARB; // or WGL_NO_ACCELERATION_ARB ? + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + /* note from http://developer.3dlabs.com/documents/WGLmanpages/wglgetpixelformatattribar… + * + * WGL_NO_ACCELERATION_ARB + * Only the software renderer supports this pixel format. + * + * WGL_GENERIC_ACCELERATION_ARB + * The pixel format is supported by an MCD driver. + * + * WGL_FULL_ACCELERATION_ARB + * The pixel format is supported by an ICD driver. + */ + break; + + case WGL_ACCUM_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_ALPHA_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumAlphaBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + + case WGL_ACCUM_BLUE_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumBlueBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_GREEN_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumGreenBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_RED_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumRedBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ALPHA_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ALPHA_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_AUX_BUFFERS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_BLUE_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_BLUE_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_COLOR_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cColorBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_DEPTH_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cDepthBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_DRAW_TO_BITMAP_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_DRAW_TO_BITMAP; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_DRAW_TO_WINDOW_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_DRAW_TO_WINDOW; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_DRAW_TO_PBUFFER_ARB : + piValues[i] = GL_TRUE; + break; + + case WGL_DOUBLE_BUFFER_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_DOUBLEBUFFER) == PFD_DOUBLEBUFFER) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_GREEN_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_GREEN_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + + case WGL_MAX_PBUFFER_PIXELS_ARB : + // FIXME + break; + + case WGL_MAX_PBUFFER_WIDTH_ARB : + // FIXME + break; + + case WGL_MAX_PBUFFER_HEIGHT_ARB : + // FIXME + break; + + case WGL_NEED_PALETTE_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_NEED_PALETTE) == PFD_NEED_PALETTE) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_NEED_SYSTEM_PALETTE_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_NEED_PALETTE) == PFD_NEED_SYSTEM_PALETTE) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + case WGL_NUMBER_PIXEL_FORMATS_ARB : piValues[i] = (int)npfd; - retVal = TRUE; - - case WGL_SUPPORT_OPENGL_ARB: - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL; - retVal = TRUE; + Count++; + break; + + case WGL_NUMBER_UNDERLAYS_ARB : + // FIXME + break; +/* + case WGL_OPTIMAL_PBUFFER_WIDTH_ARB + // FIXME + break; + + case WGL_OPTIMAL_PBUFFER_HEIGHT_ARB + // FIXME + break; +*/ + case WGL_PIXEL_TYPE_ARB : + // FIXME break; case WGL_RED_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedBits; - break; - - case WGL_GREEN_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenBits; - break; - - case WGL_BLUE_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueBits; - break; - - case WGL_ALPHA_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaBits; - break; - - case WGL_DEPTH_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cDepthBits; + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_RED_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_SAMPLES_ARB : + // FIXME + break; + + case WGL_SAMPLE_BUFFERS_ARB : + // FIXME + break; + + case WGL_SHARE_ACCUM_ARB : + // FIXME - True if the layer plane shares the accumulation buffer with the main planes. If iLayerPlane is zero, this is always true. + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if (iLayerPlane == 0) + { + piValues[i] = GL_TRUE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SHARE_DEPTH_ARB : + // FIXME - True if the layer plane shares the depth buffer with the main planes. If iLayerPlane is zero, this is always true. + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if (iLayerPlane == 0) + { + piValues[i] = GL_TRUE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; break; case WGL_STENCIL_BITS_ARB : - piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cStencilBits ; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_STEREO_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_STEREO) == PFD_STEREO) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SUPPORT_GDI_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_GDI) == PFD_SUPPORT_GDI) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SUPPORT_OPENGL_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_OPENGL) == PFD_SUPPORT_OPENGL) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SWAP_LAYER_BUFFERS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_OPENGL) == PFD_SWAP_LAYER_BUFFERS) + { + piValues[i] = GL_TRUE; + } + else + { + piValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SWAP_METHOD_ARB : + // FIXME + break; + + case WGL_TRANSPARENT_ARB : + //FIXME after WGL_TRANSPARENT_VALUE been implement piValues[i] = GL_TRUE; + piValues[i] = GL_FALSE; + Count++; break; default : @@ -846,7 +1330,17 @@ } } - return retVal; + if(GetObjectType(hdc) != OBJ_DC) + { + SetLastError(ERROR_DC_NOT_FOUND); + } + else if (Count == nAttributes) + { + retVal = TRUE; + } + + + return retVal; } GLAPI BOOL GLAPIENTRY @@ -858,43 +1352,502 @@ FLOAT *pfValues) { BOOL retVal = FALSE; + BOOL Count = 0; int i; for (i=0;i<nAttributes;i++) { switch (piAttributes[i]) { + + case WGL_ACCELERATION_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ( ( pfd[iPixelFormat - 1].pfd.dwFlags & PFD_GENERIC_FORMAT ) == PFD_GENERIC_FORMAT) + { + pfValues[i] = WGL_NO_ACCELERATION_ARB; // or WGL_GENERIC_ACCELERATION_ARB ? + } + + else if ( ( pfd[iPixelFormat - 1].pfd.dwFlags & PFD_GENERIC_FORMAT ) == PFD_GENERIC_ACCELERATED) + { + pfValues[i] = WGL_GENERIC_ACCELERATION_ARB; // or WGL_FULL_ACCELERATION_ARB ? + } + else + { + pfValues[i] = WGL_FULL_ACCELERATION_ARB; // or WGL_NO_ACCELERATION_ARB ? + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + /* note from http://developer.3dlabs.com/documents/WGLmanpages/wglgetpixelformatattribar… + * + * WGL_NO_ACCELERATION_ARB + * Only the software renderer supports this pixel format. + * + * WGL_GENERIC_ACCELERATION_ARB + * The pixel format is supported by an MCD driver. + * + * WGL_FULL_ACCELERATION_ARB + * The pixel format is supported by an ICD driver. + */ + break; + + case WGL_ACCUM_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_ALPHA_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumAlphaBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + + case WGL_ACCUM_BLUE_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumBlueBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_GREEN_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumGreenBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ACCUM_RED_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAccumRedBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ALPHA_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_ALPHA_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_AUX_BUFFERS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_BLUE_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_BLUE_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_COLOR_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cColorBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_DEPTH_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cDepthBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_DRAW_TO_BITMAP_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_DRAW_TO_BITMAP; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_DRAW_TO_WINDOW_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_DRAW_TO_WINDOW; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_DRAW_TO_PBUFFER_ARB : + pfValues[i] = GL_TRUE; + break; + + case WGL_DOUBLE_BUFFER_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_DOUBLEBUFFER) == PFD_DOUBLEBUFFER) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_GREEN_BITS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_GREEN_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + + case WGL_MAX_PBUFFER_PIXELS_ARB : + // FIXME + break; + + case WGL_MAX_PBUFFER_WIDTH_ARB : + // FIXME + break; + + case WGL_MAX_PBUFFER_HEIGHT_ARB : + // FIXME + break; + + case WGL_NEED_PALETTE_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_NEED_PALETTE) == PFD_NEED_PALETTE) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_NEED_SYSTEM_PALETTE_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_NEED_PALETTE) == PFD_NEED_SYSTEM_PALETTE) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + case WGL_NUMBER_PIXEL_FORMATS_ARB : - pfValues[i] = (FLOAT)npfd; - retVal = TRUE; - - case WGL_SUPPORT_OPENGL_ARB: - pfValues[i] = (FLOAT) (pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL); - retVal = TRUE; + pfValues[i] = (int)npfd; + Count++; + break; + + case WGL_NUMBER_UNDERLAYS_ARB : + // FIXME + break; +/* + case WGL_OPTIMAL_PBUFFER_WIDTH_ARB + // FIXME + break; + + case WGL_OPTIMAL_PBUFFER_HEIGHT_ARB + // FIXME + break; +*/ + case WGL_PIXEL_TYPE_ARB : + // FIXME break; case WGL_RED_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cRedBits; - break; - - case WGL_GREEN_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cGreenBits; - break; - - case WGL_BLUE_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cBlueBits; - break; - - case WGL_ALPHA_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAlphaBits; - break; - - case WGL_DEPTH_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cDepthBits; + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedBits; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_RED_SHIFT_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedShift; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + + break; + + case WGL_SAMPLES_ARB : + // FIXME + break; + + case WGL_SAMPLE_BUFFERS_ARB : + // FIXME + break; + + case WGL_SHARE_ACCUM_ARB : + // FIXME - True if the layer plane shares the accumulation buffer with the main planes. If iLayerPlane is zero, this is always true. + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if (iLayerPlane == 0) + { + pfValues[i] = GL_TRUE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SHARE_DEPTH_ARB : + // FIXME - True if the layer plane shares the depth buffer with the main planes. If iLayerPlane is zero, this is always true. + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if (iLayerPlane == 0) + { + pfValues[i] = GL_TRUE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } break; case WGL_STENCIL_BITS_ARB : - pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + pfValues[i] = (int)pfd[iPixelFormat - 1].pfd.cStencilBits ; + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_STEREO_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_STEREO) == PFD_STEREO) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SUPPORT_GDI_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_GDI) == PFD_SUPPORT_GDI) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SUPPORT_OPENGL_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_OPENGL) == PFD_SUPPORT_OPENGL) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SWAP_LAYER_BUFFERS_ARB : + if ((iPixelFormat > 0) && (iPixelFormat<=npfd)) + { + if ((pfd[iPixelFormat - 1].pfd.dwFlags & PFD_SUPPORT_OPENGL) == PFD_SWAP_LAYER_BUFFERS) + { + pfValues[i] = GL_TRUE; + } + else + { + pfValues[i] = GL_FALSE; + } + Count++; + } + else + { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + } + break; + + case WGL_SWAP_METHOD_ARB : + // FIXME + break; + + case WGL_TRANSPARENT_ARB : + //FIXME after WGL_TRANSPARENT_VALUE been implement piValues[i] = GL_TRUE; + pfValues[i] = GL_FALSE; + Count++; break; default : @@ -903,8 +1856,18 @@ } } + if(GetObjectType(hdc) != OBJ_DC) + { + SetLastError(ERROR_DC_NOT_FOUND); + } + else if (Count == nAttributes) + { + retVal = TRUE; + } + return retVal; } + GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, @@ -1029,3 +1992,6 @@ return FALSE; } + + +

16 years, 9 months

[cwittich] 30901: remove ros specific hack

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Nov 29 23:50:06 2007 New Revision: 30901 URL: http://svn.reactos.org/svn/reactos?rev=30901&view=rev Log: remove ros specific hack Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/listview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Thu Nov 29 23:50:06 2007 @@ -1,19 +1,3 @@ -Index: listview.c -=================================================================== ---- listview.c (revision 23123) -+++ listview.c (working copy) -@@ -3810,9 +3810,8 @@ - if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) - { - TRACE("iImage=%d\n", lvItem.iImage); -+ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, -+ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); -- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, -- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, -- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); - } - - /* Don't bother painting item being edited */ Index: propsheet.c =================================================================== --- propsheet.c (revision 25766) Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Thu Nov 29 23:50:06 2007 @@ -3810,8 +3810,9 @@ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */

16 years, 9 months

[cwittich] 30900: correctly set the desktop bkcolor

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Nov 29 23:47:33 2007 New Revision: 30900 URL: http://svn.reactos.org/svn/reactos?rev=30900&view=rev Log: correctly set the desktop bkcolor Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Nov 29 23:47:33 2007 @@ -355,7 +355,10 @@ if (0) SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); else + { SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); + SendMessageW(This->hWndList, LVM_SETBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); + } SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); }

16 years, 9 months

[cwittich] 30899: remove the const from the DrawShadowText function to be compatible to PSDK

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Nov 29 19:04:38 2007 New Revision: 30899 URL: http://svn.reactos.org/svn/reactos?rev=30899&view=rev Log: remove the const from the DrawShadowText function to be compatible to PSDK Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Thu Nov 29 19:04:38 2007 @@ -1,16 +1,3 @@ -Index: commctrl.c -=================================================================== ---- commctrl.c (revision 23123) -+++ commctrl.c (working copy) -@@ -1620,7 +1620,7 @@ - * - * Draw text with shadow. - */ -+int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *rect, DWORD dwFlags, --int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, - COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) - { - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, Index: listview.c =================================================================== --- listview.c (revision 23123) Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Thu Nov 29 19:04:38 2007 @@ -1620,7 +1620,7 @@ * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *rect, DWORD dwFlags, +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) { FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h (original) +++ trunk/reactos/include/psdk/commctrl.h Thu Nov 29 19:04:38 2007 @@ -715,7 +715,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR); LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); -int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int); +int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int); /* Header control */

16 years, 9 months

[jimtabor] 30897: Add Region object types and one Dc that was missed. Thanks Thomas!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Nov 29 16:07:38 2007 New Revision: 30897 URL: http://svn.reactos.org/svn/reactos?rev=30897&view=rev Log: Add Region object types and one Dc that was missed. Thanks Thomas! Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/enhmfile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/enhmfile.c Thu Nov 29 16:07:38 2007 @@ -31,7 +31,7 @@ mDC = NtGdiCreateMetafileDC( hDC ); // Basically changes the handle from 1xxxx to 46xxxx. // If hDC == NULL, works just like createdc in win32k. - if ( !GdiGetHandleUserData((HGDIOBJ) mDC, (PVOID) &Dc_Attr)) + if ( !GdiGetHandleUserData((HGDIOBJ) mDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) { SetLastError (ERROR_INVALID_PARAMETER); return NULL; // need to delete the handle? Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Nov 29 16:07:38 2007 @@ -87,7 +87,7 @@ #if 0 PREGION_ATTR Rgn_Attr; - if ((GdiGetHandleUserData((HGDIOBJ) hRgn, (PVOID) &Rgn_Attr)) && + if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && ( Rgn_Attr != NULL )) { PTEB pTeb = NtCurrentTeb(); @@ -151,8 +151,7 @@ #if 0 PREGION_ATTR Rgn_Attr; - if (!(GdiGetHandleUserData((HGDIOBJ) hrgn, (PVOID) &Rgn_Attr)) || - (GDI_HANDLE_GET_TYPE(hrgn) != GDI_OBJECT_TYPE_REGION)) + if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) #endif return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); #if 0

16 years, 9 months

[winesync] 30896: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Thu Nov 29 15:54:54 2007 New Revision: 30896 URL: http://svn.reactos.org/svn/reactos?rev=30896&view=rev Log: Autosyncing with Wine HEAD Added: trunk/rostests/winetests/advpack/ (with props) trunk/rostests/winetests/advpack/advpack.c (with props) trunk/rostests/winetests/advpack/advpack.rbuild (with props) trunk/rostests/winetests/advpack/files.c (with props) trunk/rostests/winetests/advpack/install.c (with props) trunk/rostests/winetests/advpack/testlist.c (with props) trunk/rostests/winetests/browseui/ (with props) trunk/rostests/winetests/browseui/autocomplete.c (with props) trunk/rostests/winetests/browseui/browseui.rbuild (with props) trunk/rostests/winetests/browseui/testlist.c (with props) trunk/rostests/winetests/cabinet/fdi.c (with props) trunk/rostests/winetests/comcat/ (with props) trunk/rostests/winetests/comcat/comcat.c (with props) trunk/rostests/winetests/comcat/comcat.rbuild (with props) trunk/rostests/winetests/comcat/testlist.c (with props) trunk/rostests/winetests/mapi32/imalloc.c (with props) trunk/rostests/winetests/mapi32/mapi32.rbuild (with props) trunk/rostests/winetests/mapi32/prop.c (with props) trunk/rostests/winetests/mapi32/testlist.c (with props) trunk/rostests/winetests/mapi32/util.c (with props) trunk/rostests/winetests/netapi32/access.c (with props) trunk/rostests/winetests/netapi32/apibuf.c (with props) trunk/rostests/winetests/netapi32/ds.c (with props) trunk/rostests/winetests/netapi32/netapi32.rbuild (with props) trunk/rostests/winetests/netapi32/testlist.c (with props) trunk/rostests/winetests/netapi32/wksta.c (with props) trunk/rostests/winetests/odbccp32/ (with props) trunk/rostests/winetests/odbccp32/misc.c (with props) trunk/rostests/winetests/odbccp32/odbccp32.rbuild (with props) trunk/rostests/winetests/odbccp32/testlist.c (with props) trunk/rostests/winetests/ole32/clipboard.c (with props) trunk/rostests/winetests/ole32/compobj.c (with props) trunk/rostests/winetests/ole32/dragdrop.c (with props) trunk/rostests/winetests/ole32/errorinfo.c (with props) trunk/rostests/winetests/ole32/hglobalstream.c (with props) trunk/rostests/winetests/ole32/marshal.c (with props) trunk/rostests/winetests/ole32/moniker.c (with props) trunk/rostests/winetests/ole32/ole2.c (with props) trunk/rostests/winetests/ole32/ole32.rbuild (with props) trunk/rostests/winetests/ole32/propvariant.c (with props) trunk/rostests/winetests/ole32/stg_prop.c (with props) trunk/rostests/winetests/ole32/storage32.c (with props) trunk/rostests/winetests/ole32/testlist.c (with props) trunk/rostests/winetests/ole32/usrmarshal.c (with props) trunk/rostests/winetests/oleaut32/oleaut32.rbuild (with props) trunk/rostests/winetests/oleaut32/olefont.c (with props) trunk/rostests/winetests/oleaut32/olepicture.c (with props) trunk/rostests/winetests/oleaut32/safearray.c (with props) trunk/rostests/winetests/oleaut32/test_tlb.idl (with props) trunk/rostests/winetests/oleaut32/testlist.c (with props) trunk/rostests/winetests/oleaut32/tmarshal.c (with props) trunk/rostests/winetests/oleaut32/tmarshal.idl (with props) trunk/rostests/winetests/oleaut32/tmarshal.rc (with props) trunk/rostests/winetests/oleaut32/tmarshal_dispids.h (with props) trunk/rostests/winetests/oleaut32/typelib.c (with props) trunk/rostests/winetests/oleaut32/usrmarshal.c (with props) trunk/rostests/winetests/oleaut32/varformat.c (with props) trunk/rostests/winetests/oleaut32/vartest.c (with props) trunk/rostests/winetests/oleaut32/vartype.c (with props) trunk/rostests/winetests/riched20/editor.c (with props) trunk/rostests/winetests/riched20/riched20.rbuild (with props) trunk/rostests/winetests/riched20/testlist.c (with props) trunk/rostests/winetests/rsabase/rsabase.c (with props) trunk/rostests/winetests/rsabase/rsabase.rbuild (with props) trunk/rostests/winetests/rsabase/testlist.c (with props) trunk/rostests/winetests/rsaenh/rsaenh.c (with props) trunk/rostests/winetests/rsaenh/rsaenh.rbuild (with props) trunk/rostests/winetests/rsaenh/testlist.c (with props) trunk/rostests/winetests/shlwapi/url.c (with props) trunk/rostests/winetests/urlmon/generated.c (with props) trunk/rostests/winetests/urlmon/misc.c (with props) trunk/rostests/winetests/urlmon/protocol.c (with props) trunk/rostests/winetests/urlmon/stream.c (with props) trunk/rostests/winetests/urlmon/testlist.c (with props) trunk/rostests/winetests/urlmon/url.c (with props) trunk/rostests/winetests/urlmon/urlmon.rbuild (with props) trunk/rostests/winetests/uxtheme/ (with props) trunk/rostests/winetests/uxtheme/system.c (with props) trunk/rostests/winetests/uxtheme/testlist.c (with props) trunk/rostests/winetests/uxtheme/uxtheme.rbuild (with props) trunk/rostests/winetests/version/install.c (with props) trunk/rostests/winetests/version/version.rc (with props) trunk/rostests/winetests/wininet/ftp.c (with props) trunk/rostests/winetests/wininet/generated.c (with props) trunk/rostests/winetests/wininet/http.c (with props) trunk/rostests/winetests/wininet/internet.c (with props) trunk/rostests/winetests/wininet/testlist.c (with props) trunk/rostests/winetests/wininet/url.c (with props) trunk/rostests/winetests/wininet/wininet.rbuild (with props) trunk/rostests/winetests/wininet/wininet_test.h (with props) Modified: trunk/rostests/winetests/cabinet/cabinet.rbuild trunk/rostests/winetests/cabinet/extract.c trunk/rostests/winetests/cabinet/testlist.c trunk/rostests/winetests/comdlg32/comdlg32.rbuild (contents, props changed) trunk/rostests/winetests/comdlg32/filedlg.c (contents, props changed) trunk/rostests/winetests/comdlg32/printdlg.c (contents, props changed) trunk/rostests/winetests/comdlg32/testlist.c (contents, props changed) trunk/rostests/winetests/directory.rbuild trunk/rostests/winetests/lz32/lz32.rbuild trunk/rostests/winetests/lz32/lzexpand_main.c trunk/rostests/winetests/mlang/mlang.c trunk/rostests/winetests/mlang/mlang.rbuild trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/shlwapi.rbuild trunk/rostests/winetests/shlwapi/shreg.c trunk/rostests/winetests/shlwapi/string.c trunk/rostests/winetests/shlwapi/testlist.c trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/testlist.c trunk/rostests/winetests/version/version.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… Added: trunk/rostests/winetests/advpack/advpack.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… Added: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… Added: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… Added: trunk/rostests/winetests/advpack/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/testlis… Added: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… Added: trunk/rostests/winetests/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/browse… Added: trunk/rostests/winetests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/testli… Modified: trunk/rostests/winetests/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/cabinet… Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… Added: trunk/rostests/winetests/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?r… Modified: trunk/rostests/winetests/cabinet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/testlis… Added: trunk/rostests/winetests/comcat/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.c… Added: trunk/rostests/winetests/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.r… Added: trunk/rostests/winetests/comcat/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/testlist… Modified: trunk/rostests/winetests/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/comdlg… Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… Modified: trunk/rostests/winetests/comdlg32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/testli… Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Modified: trunk/rostests/winetests/lz32/lz32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lz32.rbuil… Modified: trunk/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m… Added: trunk/rostests/winetests/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/imalloc.… Added: trunk/rostests/winetests/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/mapi32.r… Added: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?r… Added: trunk/rostests/winetests/mapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/testlist… Added: trunk/rostests/winetests/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/util.c?r… Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… Modified: trunk/rostests/winetests/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.rbu… Added: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… Added: trunk/rostests/winetests/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/apibuf… Added: trunk/rostests/winetests/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/ds.c?r… Added: trunk/rostests/winetests/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/netapi… Added: trunk/rostests/winetests/netapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/testli… Added: trunk/rostests/winetests/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/wksta.… Added: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… Added: trunk/rostests/winetests/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/odbccp… Added: trunk/rostests/winetests/odbccp32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/testli… Added: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… Added: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… Added: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… Added: trunk/rostests/winetests/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/errorinfo… Added: trunk/rostests/winetests/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/hglobalst… Added: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… Added: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… Added: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… Added: trunk/rostests/winetests/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole32.rbu… Added: trunk/rostests/winetests/ole32/propvariant.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/propvaria… Added: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… Added: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… Added: trunk/rostests/winetests/ole32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/testlist.… Added: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… Added: trunk/rostests/winetests/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/oleaut… Added: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… Added: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… Added: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… Added: trunk/rostests/winetests/oleaut32/test_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_t… Added: trunk/rostests/winetests/oleaut32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/testli… Added: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Added: trunk/rostests/winetests/oleaut32/tmarshal.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Added: trunk/rostests/winetests/oleaut32/tmarshal.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Added: trunk/rostests/winetests/oleaut32/tmarshal_dispids.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Added: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… Added: trunk/rostests/winetests/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/usrmar… Added: trunk/rostests/winetests/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/varfor… Added: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… Added: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… Added: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… Added: trunk/rostests/winetests/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/riched… Added: trunk/rostests/winetests/riched20/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/testli… Added: trunk/rostests/winetests/rsabase/rsabase.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsabase/rsabase… Added: trunk/rostests/winetests/rsabase/rsabase.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsabase/rsabase… Added: trunk/rostests/winetests/rsabase/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsabase/testlis… Added: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… Added: trunk/rostests/winetests/rsaenh/rsaenh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.r… Added: trunk/rostests/winetests/rsaenh/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/testlist… Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… Modified: trunk/rostests/winetests/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shlwapi… Modified: trunk/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shreg.c… Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… Modified: trunk/rostests/winetests/shlwapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/testlis… Added: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… Added: trunk/rostests/winetests/urlmon/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/generate… Added: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… Added: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… Added: trunk/rostests/winetests/urlmon/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/stream.c… Added: trunk/rostests/winetests/urlmon/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/testlist… Added: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… Added: trunk/rostests/winetests/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/urlmon.r… Added: trunk/rostests/winetests/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/system.… Added: trunk/rostests/winetests/uxtheme/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/testlis… Added: trunk/rostests/winetests/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/uxtheme… Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… Added: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install… Modified: trunk/rostests/winetests/version/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/testlis… Modified: trunk/rostests/winetests/version/version.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/version… Added: trunk/rostests/winetests/version/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/version… Added: trunk/rostests/winetests/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/ftp.c?r… Added: trunk/rostests/winetests/wininet/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/generat… Added: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… Added: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… Added: trunk/rostests/winetests/wininet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/testlis… Added: trunk/rostests/winetests/wininet/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/url.c?r… Added: trunk/rostests/winetests/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/wininet… Added: trunk/rostests/winetests/wininet/wininet_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/wininet…

16 years, 9 months

[hpoussin] 30895: Fix build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Nov 29 15:52:29 2007 New Revision: 30895 URL: http://svn.reactos.org/svn/reactos?rev=30895&view=rev Log: Fix build Modified: trunk/reactos/include/psdk/wininet.h Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h (original) +++ trunk/reactos/include/psdk/wininet.h Thu Nov 29 15:52:29 2007 @@ -605,6 +605,9 @@ #define FTP_TRANSFER_TYPE_BINARY 0x00000002 #define FTP_TRANSFER_TYPE_MASK (FTP_TRANSFER_TYPE_ASCII | FTP_TRANSFER_TYPE_BINARY) +BOOLAPI FtpCommandA(HINTERNET, BOOL, DWORD, LPCSTR, DWORD_PTR, HINTERNET *); +BOOLAPI FtpCommandW(HINTERNET, BOOL, DWORD, LPCWSTR, DWORD_PTR, HINTERNET *); +#define FtpCommand WINELIB_NAME_AW(FtpCommand) INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET ,LPCSTR lpszSearchFile , LPWIN32_FIND_DATAA lpFindFileData ,DWORD ,DWORD); @@ -1358,7 +1361,8 @@ #define ERROR_INTERNET_SEC_INVALID_CERT (INTERNET_ERROR_BASE + 169) #define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170) #define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171) -#define INTERNET_ERROR_LAST ERROR_INTERNET_FAILED_DUETOSECURITYCHECK +#define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172) +#define INTERNET_ERROR_LAST ERROR_INTERNET_NOT_INITIALIZED #define NORMAL_CACHE_ENTRY 0x00000001 @@ -1440,10 +1444,6 @@ BOOLAPI RetrieveUrlCacheEntryFileW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD ,DWORD); #define RetrieveUrlCacheEntryFile WINELIB_NAME_AW(RetrieveUrlCacheEntryFile) -BOOLAPI SetUrlCacheConfigInfoA(LPDWORD,DWORD); -BOOLAPI SetUrlCacheConfigInfoW(LPDWORD,DWORD); -#define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo) - BOOLAPI UnlockUrlCacheEntryFileA(LPCSTR ,DWORD); BOOLAPI UnlockUrlCacheEntryFileW(LPCWSTR ,DWORD); #define UnlockUrlCacheEntryFile WINELIB_NAME_AW(UnlockUrlCacheEntryFile)

16 years, 9 months

[winesync] 30894: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Thu Nov 29 15:52:01 2007 New Revision: 30894 URL: http://svn.reactos.org/svn/reactos?rev=30894&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/wininet/wininet_Eo.rc (with props) trunk/reactos/dll/win32/wininet/wininet_Sv.rc (with props) trunk/reactos/dll/win32/wininet/wininet_ros.diff (with props) Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/gopher.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/resource.h trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/version.rc trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/gopher.c… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/version.… Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Added: trunk/reactos/dll/win32/wininet/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Added: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Added: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_…

16 years, 9 months

[winesync] 30893: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Thu Nov 29 14:52:28 2007 New Revision: 30893 URL: http://svn.reactos.org/svn/reactos?rev=30893&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c Thu Nov 29 14:52:28 2007 @@ -204,3 +204,21 @@ FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); return FALSE; } + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); + return FALSE; +} + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) +{ + FIXME("Stub %p\n", hWnd); + return FALSE; +} Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild Thu Nov 29 14:52:28 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true"> <importlibrary definition="wtsapi32.spec.def" /> <include base="wtsapi32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>kernel32</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec Thu Nov 29 14:52:28 2007 @@ -14,6 +14,7 @@ @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) @ stub WTSQueryUserConfigA @ stub WTSQueryUserConfigW +@ stdcall WTSRegisterSessionNotification(long long) @ stub WTSSendMessageA @ stub WTSSendMessageW @ stub WTSSetSessionInformationA @@ -22,6 +23,7 @@ @ stub WTSSetUserConfigW @ stub WTSShutdownSystem @ stub WTSTerminateProcess +@ stdcall WTSUnRegisterSessionNotification(long) @ stub WTSVirtualChannelClose @ stub WTSVirtualChannelOpen @ stub WTSVirtualChannelPurgeInput

16 years, 9 months

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 November 2007