Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 40997: go back to SOCKET for AFD_HANDLE.Handle
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 01:45:40 2009 New Revision: 40997 URL: http://svn.reactos.org/svn/reactos?rev=40997&view=rev Log: go back to SOCKET for AFD_HANDLE.Handle Modified: branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Wed May 20 01:45:40 2009 @@ -46,7 +46,7 @@ } AFD_LISTEN_DATA, *PAFD_LISTEN_DATA; typedef struct _AFD_HANDLE_ { - HANDLE Handle; + SOCKET Handle; ULONG Events; NTSTATUS Status; } AFD_HANDLE, *PAFD_HANDLE;

1 0

[tkreuzer] 40996: msacm.h: fix tag of ACMFILTERCHOOSEA and include mmreg.h that some wine code expects
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 01:36:21 2009 New Revision: 40996 URL: http://svn.reactos.org/svn/reactos?rev=40996&view=rev Log: msacm.h: fix tag of ACMFILTERCHOOSEA and include mmreg.h that some wine code expects Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Wed May 20 01:36:21 2009 @@ -21,6 +21,9 @@ #ifndef __WINE_MSACM_H #define __WINE_MSACM_H +/* HACK! This shouldn't be here, but wine code needs it. */ +#include <mmreg.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ @@ -323,7 +326,7 @@ DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS) DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS) -typedef struct _ACMFILTERCHOOSEA +typedef struct tACMFILTERCHOOSEA { DWORD cbStruct; DWORD fdwStyle;

1 0

[tkreuzer] 40995: 64bit fixes for sqltype.h, also resort and cleanup
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 01:34:54 2009 New Revision: 40995 URL: http://svn.reactos.org/svn/reactos?rev=40995&view=rev Log: 64bit fixes for sqltype.h, also resort and cleanup Modified: branches/ros-amd64-bringup/reactos/include/psdk/sqltypes.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/sqltypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/sqltypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/sqltypes.h [iso-8859-1] Wed May 20 01:34:54 2009 @@ -1,13 +1,16 @@ -#ifndef _SQLTYPES_H -#define _SQLTYPES_H +#ifndef __SQLTYPES +#define __SQLTYPES #ifdef __cplusplus extern "C" { #endif + #define SQL_API __stdcall + #ifndef RC_INVOKED #define __need_wchar_t #include <stddef.h> + typedef signed char SCHAR; typedef long SDWORD; typedef short SWORD; @@ -24,63 +27,38 @@ typedef PVOID HSTMT; typedef short RETCODE; typedef UCHAR SQLCHAR; -typedef SCHAR SQLSCHAR; typedef SDWORD SQLINTEGER; typedef SWORD SQLSMALLINT; -#ifndef __WIN64 typedef UDWORD SQLUINTEGER; -#endif typedef UWORD SQLUSMALLINT; typedef PVOID SQLPOINTER; -#if (ODBCVER >= 0x0300) -typedef void* SQLHANDLE; -typedef SQLHANDLE SQLHENV; -typedef SQLHANDLE SQLHDBC; -typedef SQLHANDLE SQLHSTMT; -typedef SQLHANDLE SQLHDESC; -#else typedef void* SQLHENV; typedef void* SQLHDBC; typedef void* SQLHSTMT; -#endif typedef SQLSMALLINT SQLRETURN; typedef HWND SQLHWND; -typedef ULONG BOOKMARK; + #ifdef _WIN64 typedef INT64 SQLLEN; -typedef INT64 SQLROWOFFSET; -typedef UINT64 SQLROWCOUNT; typedef UINT64 SQLULEN; -typedef UINT64 SQLTRANSID; -typedef unsigned long SQLSETPOSIROW; +typedef UINT64 SQLSETPOSIROW; #else #define SQLLEN SQLINTEGER -#define SQLROWOFFSET SQLINTEGER -#define SQLROWCOUNT SQLUINTEGER #define SQLULEN SQLUINTEGER -#define SQLTRANSID DWORD #define SQLSETPOSIROW SQLUSMALLINT -#endif +#endif /* _WIN64 */ + +typedef SQLULEN BOOKMARK; +typedef SQLLEN SQLROWOFFSET; +typedef SQLULEN SQLROWCOUNT; +typedef SQLULEN SQLTRANSID; + typedef wchar_t SQLWCHAR; #ifdef UNICODE typedef SQLWCHAR SQLTCHAR; #else typedef SQLCHAR SQLTCHAR; #endif /* UNICODE */ -#if (ODBCVER >= 0x0300) -typedef unsigned char SQLDATE; -typedef unsigned char SQLDECIMAL; -typedef double SQLDOUBLE; -typedef double SQLFLOAT; -typedef unsigned char SQLNUMERIC; -typedef float SQLREAL; -typedef unsigned char SQLTIME; -typedef unsigned char SQLTIMESTAMP; -typedef unsigned char SQLVARCHAR; -#define ODBCINT64 __int64 -typedef __int64 SQLBIGINT; -typedef unsigned __int64 SQLUBIGINT; -#endif typedef struct tagDATE_STRUCT { SQLSMALLINT year; @@ -101,7 +79,23 @@ SQLUSMALLINT second; SQLUINTEGER fraction; } TIMESTAMP_STRUCT; + #if (ODBCVER >= 0x0300) +typedef SCHAR SQLSCHAR; +typedef void* SQLHANDLE; +typedef void* SQLHDESC; +typedef unsigned char SQLDATE; +typedef unsigned char SQLDECIMAL; +typedef double SQLDOUBLE; +typedef double SQLFLOAT; +typedef unsigned char SQLNUMERIC; +typedef float SQLREAL; +typedef unsigned char SQLTIME; +typedef unsigned char SQLTIMESTAMP; +typedef unsigned char SQLVARCHAR; +#define ODBCINT64 __int64 +typedef __int64 SQLBIGINT; +typedef unsigned __int64 SQLUBIGINT; typedef DATE_STRUCT SQL_DATE_STRUCT; typedef TIME_STRUCT SQL_TIME_STRUCT; typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT; @@ -138,6 +132,7 @@ SQLCHAR val[SQL_MAX_NUMERIC_LEN]; } SQL_NUMERIC_STRUCT; #endif /* ODBCVER >= 0x0300 */ + #if (ODBCVER >= 0x0350) #ifdef _GUID_DEFINED @@ -156,7 +151,9 @@ #endif /* GUID_DEFINED */ #endif /* ODBCVER >= 0x0350 */ #endif /* RC_INVOKED */ + #ifdef __cplusplus } #endif -#endif + +#endif /* __SQLTYPES */

1 0

[tkreuzer] 40994: Update README.WINE
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 00:51:00 2009 New Revision: 40994 URL: http://svn.reactos.org/svn/reactos?rev=40994&view=rev Log: Update README.WINE Modified: branches/ros-amd64-bringup/reactos/media/doc/README.WINE Modified: branches/ros-amd64-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… ============================================================================== --- branches/ros-amd64-bringup/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/media/doc/README.WINE [iso-8859-1] Wed May 20 00:51:00 2009 @@ -84,7 +84,7 @@ reactos/dll/win32/mciwave # Autosync reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync -reactos/dll/win32/msacm32 # Out of sync +reactos/dll/win32/msacm32 # Synced to Wine-1_1_21 reactos/dll/win32/msadp32.acm # Autosync reactos/dll/win32/mscat32 # Autosync reactos/dll/win32/mscms # Autosync

1 0

[tkreuzer] 40993: msgina: fix 64bit build
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 00:47:52 2009 New Revision: 40993 URL: http://svn.reactos.org/svn/reactos?rev=40993&view=rev Log: msgina: fix 64bit build Modified: branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed May 20 00:47:52 2009 @@ -29,7 +29,7 @@ return TRUE; } -static BOOL CALLBACK +static INT_PTR CALLBACK StatusMessageWindowProc( IN HWND hwndDlg, IN UINT uMsg,

1 0

[tkreuzer] 40992: msconfig: don't use inline functions as case labels
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 00:41:44 2009 New Revision: 40992 URL: http://svn.reactos.org/svn/reactos?rev=40992&view=rev Log: msconfig: don't use inline functions as case labels Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Wed May 20 00:41:44 2009 @@ -185,10 +185,10 @@ switch (PtrToLong(hRootKey)) { - case PtrToLong(HKEY_LOCAL_MACHINE): + case (ULONG_PTR)HKEY_LOCAL_MACHINE: _tcscpy(Path, _T("HKLM\\\0")); break; - case PtrToLong(HKEY_CURRENT_USER): + case (ULONG_PTR)HKEY_CURRENT_USER: _tcscpy(Path, _T("HKCU\\\0")); break; default:

1 0

[tkreuzer] 40991: msafd: convert to spec / fix 64bit build
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 00:35:33 2009 New Revision: 40991 URL: http://svn.reactos.org/svn/reactos?rev=40991&view=rev Log: msafd: convert to spec / fix 64bit build Added: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed May 20 00:35:33 2009 @@ -905,7 +905,7 @@ struct sockaddr *SocketAddress, int *SocketAddressLength, LPCONDITIONPROC lpfnCondition, - DWORD_PTR dwCallbackData, + DWORD dwCallbackData, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; Removed: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.def (removed) @@ -1,8 +1,0 @@ -; MSAFD.DLL - Ancillary Function Driver DLL - -LIBRARY msafd.dll - -EXPORTS -WSPStartup@76 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] Wed May 20 00:35:33 2009 @@ -1,5 +1,5 @@ <module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes" allowwarnings="true"> - <importlibrary definition="msafd.def" /> + <importlibrary definition="msafd.spec" /> <include base="msafd">.</include> <include base="msafd">include</include> <include base="ReactOS">include/reactos/drivers</include> Added: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec [iso-8859-1] Wed May 20 00:35:33 2009 @@ -1,0 +1,1 @@ +@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 40990: It doesn't hurt to try to start Blue service before accessing it
by hpoussin＠svn.reactos.org 19 May '09

19 May '09

Author: hpoussin Date: Wed May 20 00:25:46 2009 New Revision: 40990 URL: http://svn.reactos.org/svn/reactos?rev=40990&view=rev Log: It doesn't hurt to try to start Blue service before accessing it Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Wed May 20 00:25:46 2009 @@ -32,11 +32,42 @@ } static BOOL FASTCALL +TuiStartService(LPCWSTR lpServiceName) +{ + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + BOOL ret = FALSE; + + hSCManager = OpenSCManagerW(NULL, NULL, 0); + if (hSCManager == NULL) + goto cleanup; + + hService = OpenServiceW(hSCManager, lpServiceName, SERVICE_START); + if (hService == NULL) + goto cleanup; + + ret = StartServiceW(hService, 0, NULL); + if (!ret) + goto cleanup; + + ret = TRUE; + +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + return ret; +} + +static BOOL FASTCALL TuiInit(DWORD OemCP) { CONSOLE_SCREEN_BUFFER_INFO ScrInfo; DWORD BytesReturned; WNDCLASSEXW wc; + + TuiStartService(L"Blue"); ConsoleDeviceHandle = CreateFileW(L"\\\\.\\BlueScreen", FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

[tkreuzer] 40989: msacm32: fix 64bit build
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Tue May 19 23:55:46 2009 New Revision: 40989 URL: http://svn.reactos.org/svn/reactos?rev=40989&view=rev Log: msacm32: fix 64bit build Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c [iso-8859-1] Tue May 19 23:55:46 2009 @@ -475,7 +475,7 @@ continue; hdrvr = OpenDriver(padid->pszFileName,0,0); - SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD)&adfs,(fdwEnum & 0x000000FFL)); + SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD_PTR)&adfs,(fdwEnum & 0x000000FFL)); if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_FORMAT) != MMSYSERR_NOERROR) continue; Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff [iso-8859-1] Tue May 19 23:55:46 2009 @@ -63,3 +63,17 @@ #include "msacm_Tr.rc" +#include "msacm_Uk.rc" #include "msacm_Zh.rc" + +Index: format.c +=================================================================== +--- format.c (Revision 40986) ++++ format.c (Arbeitskopie) +@@ -475,7 +475,7 @@ + continue; + + hdrvr = OpenDriver(padid->pszFileName,0,0); +- SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD)&adfs,(fdwEnum & 0x000000FFL)); ++ SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD_PTR)&adfs,(fdwEnum & 0x000000FFL)); + + if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_FORMAT) != MMSYSERR_NOERROR) + continue;

1 0

[spetreolle] 40988: disable crashing bitmap font test in gdi32:font
by spetreolle＠svn.reactos.org 19 May '09

19 May '09

Author: spetreolle Date: Tue May 19 23:14:32 2009 New Revision: 40988 URL: http://svn.reactos.org/svn/reactos?rev=40988&view=rev Log: disable crashing bitmap font test in gdi32:font Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Tue May 19 23:14:32 2009 @@ -2916,6 +2916,8 @@ init(); test_logfont(); + skip("ROS-HACK: Skipping bitmap font tests\n"); + return; test_bitmap_font(); test_outline_font(); test_bitmap_font_metrics();

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