Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50432: [CMAKE] define _CRT_NONSTDC_NO_DEPRECATE for libmpg123 to silence a warning
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:35:09 2011 New Revision: 50432 URL: http://svn.reactos.org/svn/reactos?rev=50432&view=rev Log: [CMAKE] define _CRT_NONSTDC_NO_DEPRECATE for libmpg123 to silence a warning Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Wed Jan 19 13:35:09 2011 @@ -8,6 +8,7 @@ -Dlseek=_lseek -Dread=_read -Dstrdup=_strdup + -D_CRT_NONSTDC_NO_DEPRECATE -D_DLL -D__USE_CRTIMP) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)

1 0

[tkreuzer] 50431: [CMAKE] Move secure api functions from external file into string.h and use standard macros. Fixes 2 warnings.
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:33:48 2011 New Revision: 50431 URL: http://svn.reactos.org/svn/reactos?rev=50431&view=rev Log: [CMAKE] Move secure api functions from external file into string.h and use standard macros. Fixes 2 warnings. Modified: branches/cmake-bringup/include/crt/string.h Modified: branches/cmake-bringup/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/strin… ============================================================================== --- branches/cmake-bringup/include/crt/string.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/string.h [iso-8859-1] Wed Jan 19 13:33:48 2011 @@ -82,6 +82,17 @@ _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); + _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); + _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); @@ -102,27 +113,15 @@ _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); -#endif _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); @@ -151,6 +150,20 @@ _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); + _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); + _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); + _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); + _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); + _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); @@ -171,8 +184,6 @@ } #endif -#include <sec_api/string_s.h> - // HACK #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -180,3 +191,4 @@ #define wcsicmp _wcsicmp #endif +

1 0

[tkreuzer] 50430: [CMAKE] Include stdio.h into strsafe.h to silence a warning
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 12:05:18 2011 New Revision: 50430 URL: http://svn.reactos.org/svn/reactos?rev=50430&view=rev Log: [CMAKE] Include stdio.h into strsafe.h to silence a warning Modified: branches/cmake-bringup/include/psdk/strsafe.h Modified: branches/cmake-bringup/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/strs… ============================================================================== --- branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] Wed Jan 19 12:05:18 2011 @@ -1,6 +1,7 @@ #ifndef __STRSAFE_H_ #define __STRSAFE_H_ +#include <stdio.h> #include <stdlib.h> #include <stdarg.h>

1 0

[tkreuzer] 50429: [CMAKE] prevent macro refefinition
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:58:42 2011 New Revision: 50429 URL: http://svn.reactos.org/svn/reactos?rev=50429&view=rev Log: [CMAKE] prevent macro refefinition Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Wed Jan 19 11:58:42 2011 @@ -1,6 +1,7 @@ #include <stubs.h> +#undef UNIMPLEMENTED #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type()

1 0

[tkreuzer] 50428: [CMAKE] Add missing strcpy_s and strcat_s prototypes to silence some warnings
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:55:45 2011 New Revision: 50428 URL: http://svn.reactos.org/svn/reactos?rev=50428&view=rev Log: [CMAKE] Add missing strcpy_s and strcat_s prototypes to silence some warnings Modified: branches/cmake-bringup/include/crt/sec_api/string_s.h Modified: branches/cmake-bringup/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/sec_a… ============================================================================== --- branches/cmake-bringup/include/crt/sec_api/string_s.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/sec_api/string_s.h [iso-8859-1] Wed Jan 19 11:55:45 2011 @@ -21,6 +21,9 @@ _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); + #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context);

1 0

[tkreuzer] 50427: [CMAKE] Don't add importlibs folder as link directory for anything other than i386 builds
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:33:27 2011 New Revision: 50427 URL: http://svn.reactos.org/svn/reactos?rev=50427&view=rev Log: [CMAKE] Don't add importlibs folder as link directory for anything other than i386 builds Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Jan 19 11:33:27 2011 @@ -2,7 +2,10 @@ if(CMAKE_CROSSCOMPILING) # Linking -link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +if(ARCH MATCHES i386) +link_directories("${REACTOS_SOURCE_DIR}/importlibs") +endif() +link_directories(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")

1 0

[rmessiant] 50426: [NTOS] - Fix a typo in the page fault handler that caused PDEs to be fixed up when they were in fact valid.
by rmessiant＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: rmessiant Date: Tue Jan 18 22:42:44 2011 New Revision: 50426 URL: http://svn.reactos.org/svn/reactos?rev=50426&view=rev Log: [NTOS] - Fix a typo in the page fault handler that caused PDEs to be fixed up when they were in fact valid. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jan 18 22:42:44 2011 @@ -683,7 +683,7 @@ // // Is the PDE valid? // - if (!PointerPde->u.Hard.Valid == 0) + if (PointerPde->u.Hard.Valid == 0) { // // Debug spew (eww!)

1 0

[fireball] 50425: - Forgot to commit w32ksvc.db change.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 18:30:57 2011 New Revision: 50425 URL: http://svn.reactos.org/svn/reactos?rev=50425&view=rev Log: - Forgot to commit w32ksvc.db change. Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jan 18 18:30:57 2011 @@ -38,7 +38,7 @@ RosGdiGetCharWidth 4 RosGdiGetDeviceCaps 2 RosGdiGetDeviceGammaRamp 2 -RosGdiSetWindow 3 +RosGdiSetWindow 5 RosGdiGetICMProfile 3 RosGdiGetNearestColor 2 RosGdiGetPixelFormat 1

1 0

[fireball] 50424: - Substitute rcVcPort by a ptlDCOrig, like in trunk. - Pass window origin in a call to RosGdiSetWindow(), which fixes drawing broken in a previous commit.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 17:03:28 2011 New Revision: 50424 URL: http://svn.reactos.org/svn/reactos?rev=50424&view=rev Log: - Substitute rcVcPort by a ptlDCOrig, like in trunk. - Pass window origin in a call to RosGdiSetWindow(), which fixes drawing broken in a previous commit. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -104,6 +104,8 @@ INT CDECL RosDrv_ExtEscape( PDC_ATTR pdcattr, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { + POINTL ptOrigin; + switch(escape) { case NTDRV_ESCAPE: @@ -117,8 +119,10 @@ const struct ntdrv_escape_set_drawable *data = in_data; pdcattr->dc_rect = data->dc_rect; - - RosGdiSetWindow(pdcattr->hKernelDC, data->drawable, data->clip_children); + ptOrigin.x = data->drawable_rect.left; + ptOrigin.y = data->drawable_rect.top; + + RosGdiSetWindow(pdcattr->hKernelDC, data->drawable, data->clip_children, ptOrigin); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", pdcattr->hdc, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -60,7 +60,7 @@ struct ntdrv_escape_set_drawable { enum ntdrv_escape_codes code; /* escape code (NTDRV_SET_DRAWABLE) */ - SWM_WINDOW_ID drawable; + SWM_WINDOW_ID drawable; BOOL clip_children;/* ClipByChildren or IncludeInferiors */ RECT dc_rect; /* DC rectangle relative to drawable */ RECT drawable_rect;/* Drawable rectangle relative to screen */ Modified: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -100,7 +100,7 @@ int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); -VOID APIENTRY RosGdiSetWindow( HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren ); +VOID APIENTRY RosGdiSetWindow( HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren, POINTL ptOrigin ); /* enum.c */ int APIENTRY RosGdiChoosePixelFormat(HDC physDev, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -150,9 +150,8 @@ DPRINT("Creating a memory DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); - /* Set DC rectangles */ - pNewDC->rcVport.left = 0; pNewDC->rcVport.top = 0; - pNewDC->rcVport.right = 1; pNewDC->rcVport.bottom = 1; + /* Set DC origin */ + pNewDC->ptlDCOrig.x = 0; pNewDC->ptlDCOrig.y = 0; pNewDC->pWindow = NULL; } @@ -161,11 +160,9 @@ DPRINT("Creating a display DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(PrimarySurface.pSurface); - /* Set DC rectangles */ - pNewDC->rcVport.left = 0; - pNewDC->rcVport.top = 0; - pNewDC->rcVport.right = PrimarySurface.gdiinfo.ulHorzRes; - pNewDC->rcVport.bottom = PrimarySurface.gdiinfo.ulVertRes; + /* Set DC origin */ + pNewDC->ptlDCOrig.x = 0; + pNewDC->ptlDCOrig.y = 0; pNewDC->pWindow = &SwmRoot; } @@ -237,11 +234,9 @@ /* Select it */ pDC->dclevel.pSurface = pSurface; - /* Set DC rectangles */ - pDC->rcVport.left = 0; - pDC->rcVport.top = 0; - pDC->rcVport.right = pSurface->SurfObj.sizlBitmap.cx; - pDC->rcVport.bottom = pSurface->SurfObj.sizlBitmap.cy; + /* Set DC origin */ + pDC->ptlDCOrig.x = 0; + pDC->ptlDCOrig.y = 0; /* Update clipping to reflect changes in the surface */ RosGdiUpdateClipping(pDC, FALSE); @@ -593,14 +588,14 @@ for (i=0; i<count; i++) { RECTL_vOffsetRect(&pSafeRects[i], - pDC->rcVport.left, - pDC->rcVport.top); + pDC->ptlDCOrig.x, + pDC->ptlDCOrig.y); } /* Offset bounding rect */ RECTL_vOffsetRect(&rcSafeBounds, - pDC->rcVport.left, - pDC->rcVport.top); + pDC->ptlDCOrig.x, + pDC->ptlDCOrig.y); /* Delete old clipping region */ if (pDC->Clipping) @@ -668,7 +663,7 @@ return color; } -VOID APIENTRY RosGdiSetWindow(HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren) +VOID APIENTRY RosGdiSetWindow(HDC physDev, SWM_WINDOW_ID Wid, BOOL clipChildren, POINTL ptOrigin) { PDC pDC; @@ -682,9 +677,10 @@ if (Wid) { pDC->pWindow = SwmGetWindowById(Wid); - RECTL_vSetRect(&pDC->rcVport, - pDC->pWindow->Window.left, pDC->pWindow->Window.top, - pDC->pWindow->Window.right, pDC->pWindow->Window.bottom); + //PDC->ptlDCOrig.x = pDC->pWindow->Window.left; + //PDC->ptlDCOrig.y = pDC->pWindow->Window.top + pDC->ptlDCOrig = ptOrigin; + DPRINT("hdc %x set window hwnd %x\n", physDev, pDC->pWindow->hwnd); } else Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -24,10 +24,10 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left; - top += pDC->rcVport.top; - right += pDC->rcVport.left; - bottom += pDC->rcVport.top; + left += pDC->ptlDCOrig.x; + top += pDC->ptlDCOrig.y; + right += pDC->ptlDCOrig.x; + bottom += pDC->ptlDCOrig.y; GreEllipse(pDC, left, top, right, bottom); @@ -60,8 +60,8 @@ } /* Add DC origin */ - Pt.x = XStart + dc->rcVport.left; - Pt.y = YStart + dc->rcVport.top; + Pt.x = XStart + dc->ptlDCOrig.x; + Pt.y = YStart + dc->ptlDCOrig.y; /* Call GRE routine */ Ret = GreFloodFill(dc, &Pt, Color, FillType); @@ -107,10 +107,10 @@ pt[1].x = x2; pt[1].y = y2; /* Add DC origin */ - pt[0].x += pDC->rcVport.left; - pt[0].y += pDC->rcVport.top; - pt[1].x += pDC->rcVport.left; - pt[1].y += pDC->rcVport.top; + pt[0].x += pDC->ptlDCOrig.x; + pt[0].y += pDC->ptlDCOrig.y; + pt[1].x += pDC->ptlDCOrig.x; + pt[1].y += pDC->ptlDCOrig.y; GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, @@ -135,14 +135,14 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left; - top += pDC->rcVport.top; - right += pDC->rcVport.left; - bottom += pDC->rcVport.top; - xstart += pDC->rcVport.left; - ystart += pDC->rcVport.top; - xend += pDC->rcVport.left; - yend += pDC->rcVport.top; + left += pDC->ptlDCOrig.x; + top += pDC->ptlDCOrig.y; + right += pDC->ptlDCOrig.x; + bottom += pDC->ptlDCOrig.y; + xstart += pDC->ptlDCOrig.x; + ystart += pDC->ptlDCOrig.y; + xend += pDC->ptlDCOrig.x; + yend += pDC->ptlDCOrig.y; GrepArc(pDC, left, top, right, bottom, xstart, ystart, xend, yend, arc); @@ -207,8 +207,8 @@ } /* Calculate bounding rect and offset points data */ - pPoints[0].x += pDC->rcVport.left; - pPoints[0].y += pDC->rcVport.top; + pPoints[0].x += pDC->ptlDCOrig.x; + pPoints[0].y += pDC->ptlDCOrig.y; rcBound.left = pPoints[0].x; rcBound.right = pPoints[0].x; @@ -217,8 +217,8 @@ for (i=1; i<count; i++) { - pPoints[i].x += pDC->rcVport.left; - pPoints[i].y += pDC->rcVport.top; + pPoints[i].x += pDC->ptlDCOrig.x; + pPoints[i].y += pDC->ptlDCOrig.y; rcBound.left = min(rcBound.left, pPoints[i].x); rcBound.right = max(rcBound.right, pPoints[i].x); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -274,20 +274,14 @@ DestRect.right = XDest+WidthDst; DestRect.bottom = YDest+HeightDst; - DestRect.left += pDest->rcVport.left; - DestRect.top += pDest->rcVport.top; - DestRect.right += pDest->rcVport.left; - DestRect.bottom += pDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDest->ptlDCOrig.x, pDest->ptlDCOrig.y); SrcRect.left = XSrc; SrcRect.top = YSrc; SrcRect.right = XSrc+WidthSrc; SrcRect.bottom = YSrc+HeightSrc; - SrcRect.left += pSrc->rcVport.left; - SrcRect.top += pSrc->rcVport.top; - SrcRect.right += pSrc->rcVport.left; - SrcRect.bottom += pSrc->rcVport.top; + RECTL_vOffsetRect(&SrcRect, pSrc->ptlDCOrig.x, pSrc->ptlDCOrig.y); /* Create the XLATEOBJ. */ EXLATEOBJ_vInitXlateFromDCs(&exlo, pSrc, pDest); @@ -324,18 +318,15 @@ DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - DestRect.left += pDest->rcVport.left; - DestRect.top += pDest->rcVport.top; - DestRect.right += pDest->rcVport.left; - DestRect.bottom += pDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDest->ptlDCOrig.x, pDest->ptlDCOrig.y); SourcePoint.x = XSrc; SourcePoint.y = YSrc; if (pSrc) { - SourcePoint.x += pSrc->rcVport.left; - SourcePoint.y += pSrc->rcVport.top; + SourcePoint.x += pSrc->ptlDCOrig.x; + SourcePoint.y += pSrc->ptlDCOrig.y; } /* Create the XLATEOBJ. */ @@ -406,10 +397,7 @@ DestRect.bottom = YLeft + 1; } - DestRect.left += pDC->rcVport.left; - DestRect.top += pDC->rcVport.top; - DestRect.right += pDC->rcVport.left; - DestRect.bottom += pDC->rcVport.top; + RECTL_vOffsetRect(&DestRect, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; @@ -469,10 +457,7 @@ DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; - DestRect.left += DCDest->rcVport.left; - DestRect.top += DCDest->rcVport.top; - DestRect.right += DCDest->rcVport.left; - DestRect.bottom += DCDest->rcVport.top; + RECTL_vOffsetRect(&DestRect, DCDest->ptlDCOrig.x, DCDest->ptlDCOrig.y); SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; @@ -480,12 +465,7 @@ SourceRect.bottom = YOriginSrc+HeightSrc; if (UsesSource) - { - SourceRect.left += DCSrc->rcVport.left; - SourceRect.top += DCSrc->rcVport.top; - SourceRect.right += DCSrc->rcVport.left; - SourceRect.bottom += DCSrc->rcVport.top; - } + RECTL_vOffsetRect(&SourceRect, DCSrc->ptlDCOrig.x, DCSrc->ptlDCOrig.y); BrushOrigin.x = DCDest->dclevel.ptlBrushOrigin.x; BrushOrigin.y = DCDest->dclevel.ptlBrushOrigin.y; @@ -1125,8 +1105,8 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.left += pDC->rcVport.left; - rcDest.top += pDC->rcVport.top; + rcDest.left += pDC->ptlDCOrig.x; + rcDest.top += pDC->ptlDCOrig.y; rcDest.right = rcDest.left + Width; rcDest.bottom = rcDest.top + Height; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -225,8 +225,8 @@ for(idx = 0; idx < count; idx++) { sharp_glyph_fn(pDC, - pDC->rcVport.left + x + offset.x, - pDC->rcVport.top + y + offset.y, + pDC->ptlDCOrig.x + x + offset.x, + pDC->ptlDCOrig.y + y + offset.y, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]], &pTextPen); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -115,10 +115,10 @@ Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { - ptLine[0].x = ptPoints[i].x + pDC->rcVport.left; - ptLine[0].y = ptPoints[i].y + pDC->rcVport.top; - ptLine[1].x = ptPoints[i+1].x + pDC->rcVport.left; - ptLine[1].y = ptPoints[i+1].y + pDC->rcVport.top; + ptLine[0].x = ptPoints[i].x + pDC->ptlDCOrig.x; + ptLine[0].y = ptPoints[i].y + pDC->ptlDCOrig.y; + ptLine[1].x = ptPoints[i+1].x + pDC->ptlDCOrig.x; + ptLine[1].y = ptPoints[i+1].y + pDC->ptlDCOrig.y; DestRect.left = min(ptLine[0].x, ptLine[1].x); DestRect.top = min(ptLine[0].y, ptLine[1].y); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -32,10 +32,10 @@ MIX Mix; POINTL BrushOrigin; - DestRect.left = LeftRect + pDC->rcVport.left; - DestRect.right = RightRect + pDC->rcVport.left; - DestRect.top = TopRect + pDC->rcVport.top; - DestRect.bottom = BottomRect + pDC->rcVport.top; + DestRect.left = LeftRect + pDC->ptlDCOrig.x; + DestRect.right = RightRect + pDC->ptlDCOrig.x; + DestRect.top = TopRect + pDC->ptlDCOrig.y; + DestRect.bottom = BottomRect + pDC->ptlDCOrig.y; BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -825,8 +825,8 @@ SURFOBJ *pso; /* Offset coordinate by DC origin */ - x += pDC->rcVport.left; - y += pDC->rcVport.top; + x += pDC->ptlDCOrig.x; + y += pDC->ptlDCOrig.y; /* If point is outside the combined clipping region - return error */ if (!RECTL_bPointInRect(&pDC->CombinedClip->rclBounds, x, y)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -31,8 +31,7 @@ EBRUSHOBJ eboFill; EBRUSHOBJ eboLine; - /* Origins and extents */ - RECTL rcVport; + POINTL ptlDCOrig; /* Combined clipping region */ struct region *Clipping; Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Tue Jan 18 17:03:28 2011 @@ -627,10 +627,10 @@ if (SwmWin->Entry.Blink != &SwmWindows) { /* Create a whole screen region */ - rcScreen.left = 0; - rcScreen.top = 0; - rcScreen.right = pDC->rcVport.right; - rcScreen.bottom = pDC->rcVport.bottom; + rcScreen.left = SwmRoot.Window.left; + rcScreen.top = SwmRoot.Window.top; + rcScreen.right = SwmRoot.Window.right; + rcScreen.bottom = SwmRoot.Window.bottom; /* Free user clipping, if any */ if (pDC->Clipping) free_region(pDC->Clipping);

1 0

[spetreolle] 50423: [CMAKE] Convert wsock32 to spec.
by spetreolle＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: spetreolle Date: Tue Jan 18 15:02:26 2011 New Revision: 50423 URL: http://svn.reactos.org/svn/reactos?rev=50423&view=rev Log: [CMAKE] Convert wsock32 to spec. Added: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec (with props) Removed: branches/cmake-bringup/dll/win32/wsock32/wsock32.def Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Tue Jan 18 15:02:26 2011 @@ -1,11 +1,8 @@ set_unicode() -add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def) - -if(NOT MSVC) - set_source_files_properties(wsock32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +spec2def(wsock32.dll wsock32.spec) +add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) set_module_type(wsock32 win32dll) Removed: branches/cmake-bringup/dll/win32/wsock32/wsock32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/wsock32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/wsock32.def (removed) @@ -1,78 +1,0 @@ -LIBRARY wsock32.dll - -EXPORTS -accept=ws2_32.accept @1 -bind=ws2_32.bind @2 -closesocket=ws2_32.closesocket @3 -connect=ws2_32.connect @4 -getpeername=ws2_32.getpeername @5 -getsockname=ws2_32.getsockname @6 -getsockopt(a)20=ws2_32.getsockopt @7 -htonl=ws2_32.htonl @8 -htons=ws2_32.htons @9 -inet_addr=ws2_32.inet_addr @10 -inet_ntoa=ws2_32.inet_ntoa @11 -ioctlsocket=ws2_32.ioctlsocket @12 -listen=ws2_32.listen @13 -ntohl=ws2_32.ntohl @14 -ntohs=ws2_32.ntohs @15 -recv(a)16=ws2_32.recv @16 -recvfrom(a)24=ws2_32.recvfrom @17 -select=ws2_32.select @18 -send=ws2_32.send @19 -sendto=ws2_32.sendto @20 -setsockopt(a)20=ws2_32.setsockopt @21 -shutdown=ws2_32.shutdown @22 -socket=ws2_32.socket @23 -MigrateWinsockConfiguration=MSWSOCK.MigrateWinsockConfiguration @24 -gethostbyaddr=ws2_32.gethostbyaddr @51 -gethostbyname=ws2_32.gethostbyname @52 -getprotobyname=ws2_32.getprotobyname @53 -getprotobynumber=ws2_32.getprotobynumber @54 -getservbyname=ws2_32.getservbyname @55 -getservbyport=ws2_32.getservbyport @56 -gethostname=ws2_32.gethostname @57 -WSAAsyncSelect=ws2_32.WSAAsyncSelect @101 -WSAAsyncGetHostByAddr=ws2_32.WSAAsyncGetHostByAddr @102 -WSAAsyncGetHostByName=ws2_32.WSAAsyncGetHostByName @103 -WSAAsyncGetProtoByNumber=ws2_32.WSAAsyncGetProtoByNumber @104 -WSAAsyncGetProtoByName=ws2_32.WSAAsyncGetProtoByName @105 -WSAAsyncGetServByPort=ws2_32.WSAAsyncGetServByPort @106 -WSAAsyncGetServByName=ws2_32.WSAAsyncGetServByName @107 -WSACancelAsyncRequest=ws2_32.WSACancelAsyncRequest @108 -WSASetBlockingHook=ws2_32.WSASetBlockingHook @109 -WSAUnhookBlockingHook=ws2_32.WSAUnhookBlockingHook @110 -WSAGetLastError=ws2_32.WSAGetLastError @111 -WSASetLastError=ws2_32.WSASetLastError @112 -WSACancelBlockingCall=ws2_32.WSACancelBlockingCall @113 -WSAIsBlocking=ws2_32.WSAIsBlocking @114 -WSAStartup=ws2_32.WSAStartup @115 -WSACleanup=ws2_32.WSACleanup @116 -__WSAFDIsSet=ws2_32.__WSAFDIsSet @151 -WEP=ws2_32.WEP @500 -WSApSetPostRoutine=ws2_32.WSApSetPostRoutine @1000 -inet_network=MSWSOCK.inet_network @1100 -getnetbyname=MSWSOCK.getnetbyname @1101 -rcmd=MSWSOCK.rcmd @1102 -rexec=MSWSOCK.rexec @1103 -rresvport=MSWSOCK.rresvport @1104 -sethostname=MSWSOCK.sethostname @1105 -dn_expand=MSWSOCK.dn_expand @1106 -WSARecvEx=MSWSOCK.WSARecvEx @1107 -s_perror=MSWSOCK.s_perror @1108 -GetAddressByNameA=MSWSOCK.GetAddressByNameA @1109 -GetAddressByNameW=MSWSOCK.GetAddressByNameW @1110 -EnumProtocolsA=MSWSOCK.EnumProtocolsA @1111 -EnumProtocolsW=MSWSOCK.EnumProtocolsW @1112 -GetTypeByNameA=MSWSOCK.GetTypeByNameA @1113 -GetTypeByNameW=MSWSOCK.GetTypeByNameW @1114 -GetNameByTypeA=MSWSOCK.GetNameByTypeA @1115 -GetNameByTypeW=MSWSOCK.GetNameByTypeW @1116 -SetServiceA=MSWSOCK.SetServiceA @1117 -SetServiceW=MSWSOCK.SetServiceW @1118 -GetServiceA=MSWSOCK.GetServiceA @1119 -GetServiceW=MSWSOCK.GetServiceW @1120 -NPLoadNameSpaces=MSWSOCK.NPLoadNameSpaces @1130 -TransmitFile=MSWSOCK.TransmitFile @1140 -AcceptEx=MSWSOCK.AcceptEx @1141 -GetAcceptExSockaddrs=MSWSOCK.GetAcceptExSockaddrs @1142 Added: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/wsock32.spec (added) +++ branches/cmake-bringup/dll/win32/wsock32/wsock32.spec [iso-8859-1] Tue Jan 18 15:02:26 2011 @@ -1,0 +1,84 @@ +1 stdcall accept(long ptr ptr) ws2_32.accept +2 stdcall bind(long ptr long) ws2_32.bind +3 stdcall closesocket(long) ws2_32.closesocket +4 stdcall connect(long ptr long) ws2_32.connect +5 stdcall getpeername(long ptr ptr) ws2_32.getpeername +6 stdcall getsockname(long ptr ptr) ws2_32.getsockname +7 stdcall getsockopt(long long long ptr ptr) ws2_32.getsockopt +8 stdcall htonl(long) ws2_32.htonl +9 stdcall htons(long) ws2_32.htons +10 stdcall ioctlsocket(long long ptr) ws2_32.ioctlsocket +11 stdcall inet_addr(str) ws2_32.inet_addr +12 stdcall inet_ntoa(ptr) ws2_32.inet_ntoa +13 stdcall listen(long long) ws2_32.listen +14 stdcall ntohl(long) ws2_32.ntohl +15 stdcall ntohs(long) ws2_32.ntohs +16 stdcall recv(long ptr long long) ws2_32.recv +17 stdcall recvfrom(long ptr long long ptr ptr) ws2_32.recvfrom +18 stdcall select(long ptr ptr ptr ptr) ws2_32.select +19 stdcall send(long ptr long long) ws2_32.send +20 stdcall sendto(long ptr long long ptr long) ws2_32.sendto +21 stdcall setsockopt(long long long ptr long) ws2_32.setsockopt +22 stdcall shutdown(long long) ws2_32.shutdown +23 stdcall socket(long long long) ws2_32.socket +24 stdcall MigrateWinsockConfiguration(long long long) mswsock.MigrateWinsockConfiguration + +51 stdcall gethostbyaddr(ptr long long) ws2_32.gethostbyaddr +52 stdcall gethostbyname(str) ws2_32.gethostbyname +53 stdcall getprotobyname(str) ws2_32.getprotobyname +54 stdcall getprotobynumber(long) ws2_32.getprotobynumber +55 stdcall getservbyname(str str) ws2_32.getservbyname +56 stdcall getservbyport(long str) ws2_32.getservbyport +57 stdcall gethostname(ptr long) ws2_32.gethostname + +101 stdcall WSAAsyncSelect(long long long long) ws2_32.WSAAsyncSelect +102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) ws2_32.WSAAsyncGetHostByAddr +103 stdcall WSAAsyncGetHostByName(long long str ptr long) ws2_32.WSAAsyncGetHostByName +104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) ws2_32.WSAAsyncGetProtoByNumber +105 stdcall WSAAsyncGetProtoByName(long long str ptr long) ws2_32.WSAAsyncGetProtoByName +106 stdcall WSAAsyncGetServByPort(long long long str ptr long) ws2_32.WSAAsyncGetServByPort +107 stdcall WSAAsyncGetServByName(long long str str ptr long) ws2_32.WSAAsyncGetServByName +108 stdcall WSACancelAsyncRequest(long) ws2_32.WSACancelAsyncRequest +109 stdcall WSASetBlockingHook(ptr) ws2_32.WSASetBlockingHook +110 stdcall WSAUnhookBlockingHook() ws2_32.WSAUnhookBlockingHook +111 stdcall WSAGetLastError() ws2_32.WSAGetLastError +112 stdcall WSASetLastError(long) ws2_32.WSASetLastError +113 stdcall WSACancelBlockingCall() ws2_32.WSACancelBlockingCall +114 stdcall WSAIsBlocking() ws2_32.WSAIsBlocking +115 stdcall WSAStartup(long ptr) ws2_32.WSAStartup +116 stdcall WSACleanup() ws2_32.WSACleanup + +151 stdcall __WSAFDIsSet(long ptr) ws2_32.__WSAFDIsSet + +500 stdcall WEP() ws2_32.WEP + +1000 stdcall WSApSetPostRoutine(ptr) ws2_32.WSApSetPostRoutine + +1100 stdcall inet_network(ptr) MSWSOCK.inet_network +1101 stdcall getnetbyname(ptr) MSWSOCK.getnetbyname +1102 stdcall rcmd(ptr long ptr ptr ptr ptr) MSWSOCK.rcmd +1103 stdcall rexec(ptr long ptr ptr ptr ptr) MSWSOCK.rexec +1104 stdcall rresvport(ptr) MSWSOCK.rresvport +1105 stdcall sethostname(ptr long) MSWSOCK.sethostname +1106 stdcall dn_expand(ptr ptr ptr ptr long) MSWSOCK.dn_expand +1107 stdcall WSARecvEx(long ptr long ptr) MSWSOCK.WSARecvEx +1108 stdcall s_perror(ptr) MSWSOCK.s_perror +1109 stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr) MSWSOCK.GetAddressByNameA +1110 stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr) MSWSOCK.GetAddressByNameW +1111 stdcall EnumProtocolsA(ptr ptr ptr) MSWSOCK.EnumProtocolsA +1112 stdcall EnumProtocolsW(ptr ptr ptr) MSWSOCK.EnumProtocolsW +1113 stdcall GetTypeByNameA(ptr ptr) MSWSOCK.GetTypeByNameA +1114 stdcall GetTypeByNameW(ptr ptr) MSWSOCK.GetTypeByNameW +1115 stdcall GetNameByTypeA(ptr ptr long) MSWSOCK.GetNameByTypeA +1116 stdcall GetNameByTypeW(ptr ptr long) MSWSOCK.GetNameByTypeW +1117 stdcall SetServiceA(long long long ptr ptr ptr) MSWSOCK.SetServiceA +1118 stdcall SetServiceW(long long long ptr ptr ptr) MSWSOCK.SetServiceW +1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceA +1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceW +1130 stdcall NPLoadNameSpaces(ptr ptr ptr) MSWSOCK.NPLoadNameSpaces +1140 stdcall TransmitFile(long long long long ptr ptr long) MSWSOCK.TransmitFile +1141 stdcall AcceptEx(long long ptr long long long ptr ptr) MSWSOCK.AcceptEx +1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) MSWSOCK.GetAcceptExSockaddrs + + + Propchange: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec ------------------------------------------------------------------------------ svn:eol-style = native

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