Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[khornicek] 74207: [OPENGL32] Disclaimer: This code is ReactOS specific and is the complete opposite of what Windows does (tm): - Add the option to override the default OpenGL driver by a custom dr...

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Mar 19 22:15:58 2017 New Revision: 74207 URL: http://svn.reactos.org/svn/reactos?rev=74207&view=rev Log: [OPENGL32] Disclaimer: This code is ReactOS specific and is the complete opposite of what Windows does (tm): - Add the option to override the default OpenGL driver by a custom driver or to force the use of the built-in software implementation. - This will allow some more flexibility when running games / apps that depend on OGL. - This code needs a special entry in the registry so opengl32 behaves as usual by default. Modified: trunk/reactos/dll/opengl/opengl32/icdload.c trunk/reactos/dll/opengl/opengl32/wgl.c Modified: trunk/reactos/dll/opengl/opengl32/icdload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/icdloa… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/icdload.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/icdload.c [iso-8859-1] Sun Mar 19 22:15:58 2017 @@ -11,16 +11,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl32); -struct Drv_Opengl_Info +typedef struct { DWORD Version; /*!< Driver interface version */ DWORD DriverVersion; /*!< Driver version */ WCHAR DriverName[256]; /*!< Driver name */ -}; +} Drv_Opengl_Info, *pDrv_Opengl_Info; + +typedef enum +{ + OGL_CD_NOT_QUERIED, + OGL_CD_NONE, + OGL_CD_ROSSWI, + OGL_CD_CUSTOM_ICD +} CUSTOM_DRIVER_STATE; static CRITICAL_SECTION icdload_cs = {NULL, -1, 0, 0, 0, 0}; static struct ICD_Data* ICD_Data_List = NULL; static const WCHAR OpenGLDrivers_Key[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers"; +static const WCHAR CustomDrivers_Key[] = L"SOFTWARE\\ReactOS\\OpenGL"; +static Drv_Opengl_Info CustomDrvInfo; +static CUSTOM_DRIVER_STATE CustomDriverState = OGL_CD_NOT_QUERIED; static void APIENTRY wglSetCurrentValue(PVOID value) { @@ -47,41 +58,99 @@ { int ret; DWORD dwInput, dwValueType, Version, DriverVersion, Flags; - struct Drv_Opengl_Info DrvInfo; + Drv_Opengl_Info DrvInfo; + pDrv_Opengl_Info pDrvInfo; struct ICD_Data* data; - HKEY OglKey, DrvKey; + HKEY OglKey, DrvKey, CustomKey; WCHAR DllName[MAX_PATH]; BOOL (WINAPI *DrvValidateVersion)(DWORD); void (WINAPI *DrvSetCallbackProcs)(int nProcs, PROC* pProcs); - - /* First, see if the driver supports this */ - dwInput = OPENGL_GETINFO; - ret = ExtEscape(hdc, - QUERYESCSUPPORT, - sizeof(DWORD), - (LPCSTR)&dwInput, - 0, - NULL); - - if(ret <= 0) - { + + /* The following code is ReactOS specific and allows us to easily load an arbitrary ICD: + * It checks HKCU\Software\ReactOS\OpenGL for a custom ICD and will always load it + * no matter what driver the DC is associated with. It can also force using the + * built-in Software Implementation*/ + if(CustomDriverState == OGL_CD_NOT_QUERIED) + { + /* Only do this once so there's not any significant performance penalty */ + CustomDriverState = OGL_CD_NONE; + memset(&CustomDrvInfo, 0, sizeof(Drv_Opengl_Info)); + + ret = RegOpenKeyExW(HKEY_CURRENT_USER, CustomDrivers_Key, 0, KEY_READ, &CustomKey); + if(ret != ERROR_SUCCESS) + goto custom_end; + + dwInput = sizeof(CustomDrvInfo.DriverName); + ret = RegQueryValueExW(CustomKey, L"", 0, &dwValueType, (LPBYTE)CustomDrvInfo.DriverName, &dwInput); + RegCloseKey(CustomKey); + + if((ret != ERROR_SUCCESS) || (dwValueType != REG_SZ) || !wcslen(CustomDrvInfo.DriverName)) + goto custom_end; + + if(!_wcsicmp(CustomDrvInfo.DriverName, L"ReactOS Software Implementation")) + { + /* Always announce the fact that we're forcing ROSSWI */ + ERR("Forcing ReactOS Software Implementation\n"); + CustomDriverState = OGL_CD_ROSSWI; + return NULL; + } + + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, OpenGLDrivers_Key, 0, KEY_READ, &OglKey); + if(ret != ERROR_SUCCESS) + goto custom_end; + + ret = RegOpenKeyExW(OglKey, CustomDrvInfo.DriverName, 0, KEY_READ, &OglKey); + if(ret != ERROR_SUCCESS) + goto custom_end; + + dwInput = sizeof(CustomDrvInfo.Version); + ret = RegQueryValueExW(OglKey, L"Version", 0, &dwValueType, (LPBYTE)&CustomDrvInfo.Version, &dwInput); + if((ret != ERROR_SUCCESS) || (dwValueType != REG_DWORD)) + goto custom_end; + + dwInput = sizeof(DriverVersion); + ret = RegQueryValueExW(OglKey, L"DriverVersion", 0, &dwValueType, (LPBYTE)&CustomDrvInfo.DriverVersion, &dwInput); + CustomDriverState = OGL_CD_CUSTOM_ICD; + + /* Always announce the fact that we're overriding the default driver */ + ERR("Overriding the default OGL ICD with %S\n", CustomDrvInfo.DriverName); + +custom_end: + if(OglKey) + RegCloseKey(OglKey); + RegCloseKey(CustomKey); + } + + /* If there's a custom ICD or ROSSWI was requested use it, otherwise proceed as usual */ + if(CustomDriverState == OGL_CD_CUSTOM_ICD) + { + pDrvInfo = &CustomDrvInfo; + } + else if(CustomDriverState == OGL_CD_ROSSWI) + { + return NULL; + } + else + { + /* First, see if the driver supports this */ + dwInput = OPENGL_GETINFO; + ret = ExtEscape(hdc, QUERYESCSUPPORT, sizeof(DWORD), (LPCSTR)&dwInput, 0, NULL); + /* Driver doesn't support opengl */ - return NULL; - } - - /* Query for the ICD DLL name and version */ - dwInput = 0; - ret = ExtEscape(hdc, - OPENGL_GETINFO, - sizeof(DWORD), - (LPCSTR)&dwInput, - sizeof(DrvInfo), - (LPSTR)&DrvInfo); - - if(ret <= 0) - { - ERR("Driver claims to support OPENGL_GETINFO escape code, but doesn't.\n"); - return NULL; + if(ret <= 0) + return NULL; + + /* Query for the ICD DLL name and version */ + dwInput = 0; + ret = ExtEscape(hdc, OPENGL_GETINFO, sizeof(DWORD), (LPCSTR)&dwInput, sizeof(DrvInfo), (LPSTR)&DrvInfo); + + if(ret <= 0) + { + ERR("Driver claims to support OPENGL_GETINFO escape code, but doesn't.\n"); + return NULL; + } + + pDrvInfo = &DrvInfo; } /* Protect the list while we are loading*/ @@ -91,7 +160,7 @@ data = ICD_Data_List; while(data) { - if(!_wcsicmp(data->DriverName, DrvInfo.DriverName)) + if(!_wcsicmp(data->DriverName, pDrvInfo->DriverName)) { /* Found it */ TRACE("Found already loaded %p.\n", data); @@ -108,16 +177,16 @@ ERR("Failed to open the OpenGLDrivers key.\n"); goto end; } - ret = RegOpenKeyExW(OglKey, DrvInfo.DriverName, 0, KEY_READ, &DrvKey); + ret = RegOpenKeyExW(OglKey, pDrvInfo->DriverName, 0, KEY_READ, &DrvKey); if(ret != ERROR_SUCCESS) { /* Some driver installer just provide the DLL name, like the Matrox G400 */ - TRACE("No driver subkey for %S, trying to get DLL name directly.\n", DrvInfo.DriverName); + TRACE("No driver subkey for %S, trying to get DLL name directly.\n", pDrvInfo->DriverName); dwInput = sizeof(DllName); - ret = RegQueryValueExW(OglKey, DrvInfo.DriverName, 0, &dwValueType, (LPBYTE)DllName, &dwInput); + ret = RegQueryValueExW(OglKey, pDrvInfo->DriverName, 0, &dwValueType, (LPBYTE)DllName, &dwInput); if((ret != ERROR_SUCCESS) || (dwValueType != REG_SZ)) { - ERR("Unable to get ICD DLL name!.\n"); + ERR("Unable to get ICD DLL name!\n"); RegCloseKey(OglKey); goto end; } @@ -127,7 +196,7 @@ else { /* The driver have a subkey for the ICD */ - TRACE("Querying details from registry for %S.\n", DrvInfo.DriverName); + TRACE("Querying details from registry for %S.\n", pDrvInfo->DriverName); dwInput = sizeof(DllName); ret = RegQueryValueExW(DrvKey, L"Dll", 0, &dwValueType, (LPBYTE)DllName, &dwInput); if((ret != ERROR_SUCCESS) || (dwValueType != REG_SZ)) @@ -144,9 +213,9 @@ { WARN("No version in driver subkey\n"); } - else if(Version != DrvInfo.Version) - { - ERR("Version mismatch between registry (%lu) and display driver (%lu).\n", Version, DrvInfo.Version); + else if(Version != pDrvInfo->Version) + { + ERR("Version mismatch between registry (%lu) and display driver (%lu).\n", Version, pDrvInfo->Version); RegCloseKey(DrvKey); RegCloseKey(OglKey); goto end; @@ -158,9 +227,9 @@ { WARN("No driver version in driver subkey\n"); } - else if(DriverVersion != DrvInfo.DriverVersion) - { - ERR("Driver version mismatch between registry (%lu) and display driver (%lu).\n", DriverVersion, DrvInfo.DriverVersion); + else if(DriverVersion != pDrvInfo->DriverVersion) + { + ERR("Driver version mismatch between registry (%lu) and display driver (%lu).\n", DriverVersion, pDrvInfo->DriverVersion); RegCloseKey(DrvKey); RegCloseKey(OglKey); goto end; @@ -206,7 +275,7 @@ DrvValidateVersion = (void*)GetProcAddress(data->hModule, "DrvValidateVersion"); if(DrvValidateVersion) { - if(!DrvValidateVersion(DrvInfo.DriverVersion)) + if(!DrvValidateVersion(pDrvInfo->DriverVersion)) { ERR("DrvValidateVersion failed!.\n"); goto fail; @@ -262,13 +331,14 @@ } /* Copy the DriverName */ - wcscpy(data->DriverName, DrvInfo.DriverName); + wcscpy(data->DriverName, pDrvInfo->DriverName); /* Push the list */ data->next = ICD_Data_List; ICD_Data_List = data; TRACE("Returning %p.\n", data); + TRACE("ICD driver %S (%S) successfully loaded.\n", pDrvInfo->DriverName, DllName); end: /* Unlock and return */ Modified: trunk/reactos/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] Sun Mar 19 22:15:58 2017 @@ -79,7 +79,7 @@ data->nb_icd_formats = data->icd_data->DrvDescribePixelFormat(hdc, 0, 0, NULL); else data->nb_icd_formats = 0; - TRACE("ICD %S has %u formats for HDC %x.\n", data->icd_data->DriverName, data->nb_icd_formats, hdc); + TRACE("ICD %S has %u formats for HDC %x.\n", data->icd_data ? data->icd_data->DriverName : NULL, data->nb_icd_formats, hdc); data->nb_sw_formats = sw_DescribePixelFormat(hdc, 0, 0, NULL); data->next = dc_data_list; dc_data_list = data; @@ -927,6 +927,6 @@ { context = CONTAINING_RECORD(Entry, struct wgl_context, ListEntry); wglDeleteContext((HGLRC)context); - Entry = ContextListHead.Flink; - } -} + Entry = Entry->Flink; + } +}

7 years, 9 months

[akhaldi] 74206: [FREETYPE] Update to v2.7.1. Patch by Katayama Hirofumi MZ, verified by me. CORE-12949

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:53:42 2017 New Revision: 74206 URL: http://svn.reactos.org/svn/reactos?rev=74206&view=rev Log: [FREETYPE] Update to v2.7.1. Patch by Katayama Hirofumi MZ, verified by me. CORE-12949 Added: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/services/svmetric.h (with props) trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftzconf.h (with props) Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog trunk/reactos/sdk/lib/3rdparty/freetype/README trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftconfig.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmm.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftrender.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftserv.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/services/svmm.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttags.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afdummy.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afglobal.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afindic.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afloader.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbbox.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftcalc.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftdbgmem.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftglyph.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmm.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftsnames.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftutil.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdfdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bzip2/ftbzip2.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcbasic.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcsbits.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2arrst.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2fixed.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2intrp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2stack.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2stack.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffpic.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidriver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmod.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h trunk/reactos/sdk/lib/3rdparty/freetype/src/lzw/ftzopen.c trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvcommn.c trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmod.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.h trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psauxmod.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1cmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1decode.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshmod.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshrec.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/psmodule.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/pstables.h trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftrend1.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.h trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfdriver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttbdf.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttmtx.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.c trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/apinames.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/glnames.py trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpic.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1driver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.h trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1parse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42drivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42objs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/winfonts/winfnt.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftrender.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftserv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Added: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/services/svmetric.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/services/svmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftdbgmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftsnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bzip2/ftbzip2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcbasic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcsbits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2arrst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2fixed.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2intrp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2stack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffpic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Added: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftzconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/lzw/ftzopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psauxmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1cmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/psmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/pstables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftrend1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttbdf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttmtx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/apinames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/glnames.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42drivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/…

7 years, 9 months

[akhaldi] 74205: [VERSION_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:23:26 2017 New Revision: 74205 URL: http://svn.reactos.org/svn/reactos?rev=74205&view=rev Log: [VERSION_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/version/info.c Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Sun Mar 19 17:23:26 2017 @@ -1,5 +1,6 @@ /* * Copyright (C) 2004 Stefan Leichter + * Copyright (C) 2017 Akihiro Sagawa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +24,9 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winnls.h" #include "winver.h" +#include "verrsrc.h" #include "wine/test.h" #define MY_LAST_ERROR ((DWORD)-1) @@ -750,6 +753,103 @@ HeapFree(GetProcessHeap(), 0, ver); } +static void test_GetFileVersionInfoEx(void) +{ + char *ver, *p; + BOOL ret; + UINT size, translation, i; + HMODULE mod; + BOOL (WINAPI *pGetFileVersionInfoExW)(DWORD, LPCWSTR, DWORD, DWORD, LPVOID); + DWORD (WINAPI *pGetFileVersionInfoSizeExW)(DWORD, LPCWSTR, LPDWORD); + const LANGID lang = GetUserDefaultUILanguage(); + const LANGID english = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); + const WORD unicode = 1200; /* = UNICODE */ + const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + const DWORD test_flags[] = { + 0, FILE_VER_GET_LOCALISED, FILE_VER_GET_NEUTRAL, + FILE_VER_GET_LOCALISED | FILE_VER_GET_NEUTRAL, + 0xdeadbeef, /* invalid value (ignored) */ + }; + char desc[MAX_PATH]; + + size = GetFileVersionInfoSizeW(kernel32W, NULL); + ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, size); + assert(ver); + + ret = GetFileVersionInfoW(kernel32W, 0, size, ver); + ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); + + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); + translation = *(UINT *)p; + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(size == 4, "VerQueryValue returned %u, expected 4\n", size); + + /* test default version resource */ + todo_wine_if(lang != english) + ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n", + LOWORD(translation), lang); + todo_wine + ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n", + HIWORD(translation), unicode); + + HeapFree(GetProcessHeap(), 0, ver); + + mod = GetModuleHandleA("version.dll"); + assert(mod); + + /* prefer W-version as A-version is not available on Windows 7 */ + pGetFileVersionInfoExW = (void *)GetProcAddress(mod, "GetFileVersionInfoExW"); + pGetFileVersionInfoSizeExW = (void *)GetProcAddress(mod, "GetFileVersionInfoSizeExW"); + if (!pGetFileVersionInfoExW && !pGetFileVersionInfoSizeExW) + { + win_skip("GetFileVersionInfoEx family is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + { + size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); + ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, size); + assert(ver); + + ret = pGetFileVersionInfoExW(test_flags[i], kernel32W, 0, size, ver); + ok(ret, "[%u] GetFileVersionInfoEx error %u\n", i, GetLastError()); + + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); + ok(ret, "[%u] VerQueryValue error %u\n", i, GetLastError()); + ok(size == 4, "[%u] VerQueryValue returned %u, expected 4\n", i, size); + translation = *(UINT *)p; + + /* test MUI version resource */ + todo_wine_if((test_flags[i] & FILE_VER_GET_LOCALISED) && lang != english) + if (test_flags[i] & FILE_VER_GET_LOCALISED) + ok(LOWORD(translation) == lang, "[%u] got %u, expected lang is %u\n", + i, LOWORD(translation), lang); + else + ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n", + i, LOWORD(translation), english); + todo_wine + ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n", + i, HIWORD(translation), unicode); + + /* test string info using translation info */ + size = 0; + sprintf(desc, "\\StringFileInfo\\%04x%04x\\FileDescription", + LOWORD(translation), HIWORD(translation)); + ret = VerQueryValueA(ver, desc, (void **)&p, &size); + ok(ret, "[%u] VerQueryValue error %u\n", i, GetLastError()); + ok(size == strlen(p) + 1, "[%u] VerQueryValue returned %u\n", i, size); + + HeapFree(GetProcessHeap(), 0, ver); + } + + return; +} + START_TEST(info) { test_info_size(); @@ -758,4 +858,5 @@ test_VerQueryValueA(); test_VerQueryValue_InvalidLength(); test_extra_block(); -} + test_GetFileVersionInfoEx(); +}

7 years, 9 months

[akhaldi] 74204: [PSDK] Import verrsrc.h and update winver.h accordingly. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:22:09 2017 New Revision: 74204 URL: http://svn.reactos.org/svn/reactos?rev=74204&view=rev Log: [PSDK] Import verrsrc.h and update winver.h accordingly. CORE-12823 Added: trunk/reactos/sdk/include/psdk/verrsrc.h (with props) Modified: trunk/reactos/sdk/include/psdk/winver.h Added: trunk/reactos/sdk/include/psdk/verrsrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/verrsrc.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/verrsrc.h (added) +++ trunk/reactos/sdk/include/psdk/verrsrc.h [iso-8859-1] Sun Mar 19 17:22:09 2017 @@ -0,0 +1,173 @@ +/* Definitions for the VERsion info library (VER.DLL) + * + * Copyright 1996 Marcus Meissner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VERRSRC_H +#define __WINE_VERRSRC_H + +/* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */ +#ifndef __MSABI_LONG +# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# define __MSABI_LONG(x) x ## l +# else +# define __MSABI_LONG(x) x +# endif +#endif + +/* resource ids for different version infos */ +#define VS_FILE_INFO RT_VERSION +#define VS_VERSION_INFO 1 +#define VS_USER_DEFINED 100 + +#define VS_FFI_SIGNATURE __MSABI_LONG(0xfeef04bd) /* FileInfo Magic */ +#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000) /* struc version 1.0 */ +#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003f) /* valid flags */ + +/* VS_VERSION.dwFileFlags */ +#define VS_FF_DEBUG __MSABI_LONG(0x01) +#define VS_FF_PRERELEASE __MSABI_LONG(0x02) +#define VS_FF_PATCHED __MSABI_LONG(0x04) +#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x08) +#define VS_FF_INFOINFERRED __MSABI_LONG(0x10) +#define VS_FF_SPECIALBUILD __MSABI_LONG(0x20) + +/* VS_VERSION.dwFileOS */ + +/* major os version */ +#define VOS_UNKNOWN __MSABI_LONG(0x00000000) +#define VOS_DOS __MSABI_LONG(0x00010000) +#define VOS_OS216 __MSABI_LONG(0x00020000) +#define VOS_OS232 __MSABI_LONG(0x00030000) +#define VOS_NT __MSABI_LONG(0x00040000) +#define VOS_WINCE __MSABI_LONG(0x00050000) + +/* minor os version */ +#define VOS__BASE __MSABI_LONG(0x00000000) +#define VOS__WINDOWS16 __MSABI_LONG(0x00000001) +#define VOS__PM16 __MSABI_LONG(0x00000002) +#define VOS__PM32 __MSABI_LONG(0x00000003) +#define VOS__WINDOWS32 __MSABI_LONG(0x00000004) + +/* possible versions */ +#define VOS_DOS_WINDOWS16 (VOS_DOS|VOS__WINDOWS16) +#define VOS_DOS_WINDOWS32 (VOS_DOS|VOS__WINDOWS32) +#define VOS_OS216_PM16 (VOS_OS216|VOS__PM16) +#define VOS_OS232_PM32 (VOS_OS232|VOS__PM32) +#define VOS_NT_WINDOWS32 (VOS_NT|VOS__WINDOWS32) + +/* VS_VERSION.dwFileType */ +#define VFT_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT_APP __MSABI_LONG(0x00000001) +#define VFT_DLL __MSABI_LONG(0x00000002) +#define VFT_DRV __MSABI_LONG(0x00000003) +#define VFT_FONT __MSABI_LONG(0x00000004) +#define VFT_VXD __MSABI_LONG(0x00000005) +/* ??one type missing?? __MSABI_LONG(0x00000006) -Marcus */ +#define VFT_STATIC_LIB __MSABI_LONG(0x00000007) + +/* VS_VERSION.dwFileSubtype for VFT_DRV */ +#define VFT2_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001) +#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002) +#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003) +#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004) +#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005) +#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006) +#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007) +#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008) +#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009) +#define VFT2_DRV_COMM __MSABI_LONG(0x0000000a) +#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000b) +#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000c) + +/* VS_VERSION.dwFileSubtype for VFT_FONT */ +#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001) +#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002) +#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003) + +/* VerFindFile Flags */ + /* input */ +#define VFFF_ISSHAREDFILE 0x0001 + + /* output (returned) */ +#define VFF_CURNEDEST 0x0001 +#define VFF_FILEINUSE 0x0002 +#define VFF_BUFFTOOSMALL 0x0004 + +/* VerInstallFile Flags */ + /* input */ +#define VIFF_FORCEINSTALL 0x0001 +#define VIFF_DONTDELETEOLD 0x0002 + + /* output (return) */ +#define VIF_TEMPFILE __MSABI_LONG(0x00000001) +#define VIF_MISMATCH __MSABI_LONG(0x00000002) +#define VIF_SRCOLD __MSABI_LONG(0x00000004) +#define VIF_DIFFLANG __MSABI_LONG(0x00000008) +#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010) +#define VIF_DIFFTYPE __MSABI_LONG(0x00000020) +#define VIF_WRITEPROT __MSABI_LONG(0x00000040) +#define VIF_FILEINUSE __MSABI_LONG(0x00000080) +#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100) +#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200) +#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400) +#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800) +#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000) +#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000) +#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000) +#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000) +#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) +#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) +#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000) +#define VIF_CANNOTLOADLZ32 __MSABI_LONG(0x00080000) +#define VIF_CANNOTLOADCABINET __MSABI_LONG(0x00100000) + + +#ifndef RC_INVOKED + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +#define FILE_VER_GET_LOCALISED 0x01 +#define FILE_VER_GET_NEUTRAL 0x02 +#define FILE_VER_GET_PREFETCHED 0x04 + +typedef struct tagVS_FIXEDFILEINFO { + DWORD dwSignature; + DWORD dwStrucVersion; + DWORD dwFileVersionMS; + DWORD dwFileVersionLS; + DWORD dwProductVersionMS; + DWORD dwProductVersionLS; + DWORD dwFileFlagsMask; + DWORD dwFileFlags; + DWORD dwFileOS; + DWORD dwFileType; + DWORD dwFileSubtype; + DWORD dwFileDateMS; + DWORD dwFileDateLS; +} VS_FIXEDFILEINFO; + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* RC_INVOKED */ + +#endif /* __WINE_VERRSRC_H */ Propchange: trunk/reactos/sdk/include/psdk/verrsrc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/include/psdk/winver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winver.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/winver.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winver.h [iso-8859-1] Sun Mar 19 17:22:09 2017 @@ -1,103 +1,15 @@ #ifndef VER_H #define VER_H + +#include <specstrings.h> +#include <verrsrc.h> #ifdef __cplusplus extern "C" { #endif -#define VS_FILE_INFO RT_VERSION -#define VS_VERSION_INFO 1 -#define VS_USER_DEFINED 100 -#define VS_FFI_SIGNATURE 0xFEEF04BD -#define VS_FFI_STRUCVERSION 0x10000 -#define VS_FFI_FILEFLAGSMASK 0x3F -#define VS_FF_DEBUG 1 -#define VS_FF_PRERELEASE 2 -#define VS_FF_PATCHED 4 -#define VS_FF_PRIVATEBUILD 8 -#define VS_FF_INFOINFERRED 16 -#define VS_FF_SPECIALBUILD 32 -#define VOS_UNKNOWN 0 -#define VOS_DOS 0x10000 -#define VOS_OS216 0x20000 -#define VOS_OS232 0x30000 -#define VOS_NT 0x40000 -#define VOS__BASE 0 -#define VOS__WINDOWS16 1 -#define VOS__PM16 2 -#define VOS__PM32 3 -#define VOS__WINDOWS32 4 -#define VOS_DOS_WINDOWS16 0x10001 -#define VOS_DOS_WINDOWS32 0x10004 -#define VOS_OS216_PM16 0x20002 -#define VOS_OS232_PM32 0x30003 -#define VOS_NT_WINDOWS32 0x40004 -#define VFT_UNKNOWN 0 -#define VFT_APP 1 -#define VFT_DLL 2 -#define VFT_DRV 3 -#define VFT_FONT 4 -#define VFT_VXD 5 -#define VFT_STATIC_LIB 7 -#define VFT2_UNKNOWN 0 -#define VFT2_DRV_PRINTER 1 -#define VFT2_DRV_KEYBOARD 2 -#define VFT2_DRV_LANGUAGE 3 -#define VFT2_DRV_DISPLAY 4 -#define VFT2_DRV_MOUSE 5 -#define VFT2_DRV_NETWORK 6 -#define VFT2_DRV_SYSTEM 7 -#define VFT2_DRV_INSTALLABLE 8 -#define VFT2_DRV_SOUND 9 -#define VFT2_DRV_COMM 10 -#define VFT2_DRV_INPUTMETHOD 11 -#define VFT2_DRV_VERSIONED_PRINTER 12 -#define VFT2_FONT_RASTER 1 -#define VFT2_FONT_VECTOR 2 -#define VFT2_FONT_TRUETYPE 3 -#define VFFF_ISSHAREDFILE 1 -#define VFF_CURNEDEST 1 -#define VFF_FILEINUSE 2 -#define VFF_BUFFTOOSMALL 4 -#define VIFF_FORCEINSTALL 1 -#define VIFF_DONTDELETEOLD 2 -#define VIF_TEMPFILE 1 -#define VIF_MISMATCH 2 -#define VIF_SRCOLD 4 -#define VIF_DIFFLANG 8 -#define VIF_DIFFCODEPG 16 -#define VIF_DIFFTYPE 32 -#define VIF_WRITEPROT 64 -#define VIF_FILEINUSE 128 -#define VIF_OUTOFSPACE 256 -#define VIF_ACCESSVIOLATION 512 -#define VIF_SHARINGVIOLATION 1024 -#define VIF_CANNOTCREATE 2048 -#define VIF_CANNOTDELETE 4096 -#define VIF_CANNOTRENAME 8192 -#define VIF_CANNOTDELETECUR 16384 -#define VIF_OUTOFMEMORY 32768 -#define VIF_CANNOTREADSRC 65536 -#define VIF_CANNOTREADDST 0x20000 -#define VIF_BUFFTOOSMALL 0x40000 - #ifndef RC_INVOKED -typedef struct tagVS_FIXEDFILEINFO { - DWORD dwSignature; - DWORD dwStrucVersion; - DWORD dwFileVersionMS; - DWORD dwFileVersionLS; - DWORD dwProductVersionMS; - DWORD dwProductVersionLS; - DWORD dwFileFlagsMask; - DWORD dwFileFlags; - DWORD dwFileOS; - DWORD dwFileType; - DWORD dwFileSubtype; - DWORD dwFileDateMS; - DWORD dwFileDateLS; -} VS_FIXEDFILEINFO; DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT);

7 years, 9 months

[akhaldi] 74203: [VERSION] Sync with Wine Staging 2.2. CORE-12823 8e1335b version: Ignore flag values in Ex functions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:16:33 2017 New Revision: 74203 URL: http://svn.reactos.org/svn/reactos?rev=74203&view=rev Log: [VERSION] Sync with Wine Staging 2.2. CORE-12823 8e1335b version: Ignore flag values in Ex functions. Modified: trunk/reactos/dll/win32/version/version.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/version/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.c [iso-8859-1] Sun Mar 19 17:16:33 2017 @@ -628,14 +628,7 @@ HMODULE hModule; OFSTRUCT ofs; - if (flags) - { - FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - - TRACE("(%s,%p)\n", debugstr_w(filename), handle ); + TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), handle ); if (handle) *handle = 0; @@ -649,6 +642,8 @@ SetLastError(ERROR_BAD_PATHNAME); return 0; } + if (flags) + FIXME("flags 0x%x ignored\n", flags); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { @@ -712,14 +707,14 @@ UNICODE_STRING filenameW; DWORD retval; - TRACE("(%s,%p)\n", debugstr_a(filename), handle ); + TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle ); if(filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle); + retval = GetFileVersionInfoSizeExW(flags, filenameW.Buffer, handle); RtlFreeUnicodeString(&filenameW); @@ -738,21 +733,16 @@ HMODULE hModule; VS_VERSION_INFO_STRUCT32* vvis = data; - if (flags) - { - FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - - TRACE("(%s,%d,size=%d,data=%p)\n", - debugstr_w(filename), handle, datasize, data ); + TRACE("(0x%x,%s,%d,size=%d,data=%p)\n", + flags, debugstr_w(filename), handle, datasize, data ); if (!data) { SetLastError(ERROR_INVALID_DATA); return FALSE; } + if (flags) + FIXME("flags 0x%x ignored\n", flags); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { @@ -815,8 +805,8 @@ UNICODE_STRING filenameW; BOOL retval; - TRACE("(%s,%d,size=%d,data=%p)\n", - debugstr_a(filename), handle, datasize, data ); + TRACE("(0x%x,%s,%d,size=%d,data=%p)\n", + flags, debugstr_a(filename), handle, datasize, data ); if(filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 17:16:33 2017 @@ -192,7 +192,7 @@ reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 -reactos/dll/win32/version # Synced to WineStaging-1.9.11 +reactos/dll/win32/version # Synced to WineStaging-2.2 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 reactos/dll/win32/wbemprox # Synced to WineStaging-2.2

7 years, 9 months

[ekohl] 74202: [AT] - Replace ARRAYSIZE() by _countof(). - Implement parsing of days per month schedule information for the /every and /next options. - Print days per month schedule information.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 19 17:15:59 2017 New Revision: 74202 URL: http://svn.reactos.org/svn/reactos?rev=74202&view=rev Log: [AT] - Replace ARRAYSIZE() by _countof(). - Implement parsing of days per month schedule information for the /every and /next options. - Print days per month schedule information. Modified: trunk/reactos/base/applications/cmdutils/at/at.c trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc trunk/reactos/base/applications/cmdutils/at/resource.h Modified: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Sun Mar 19 17:15:59 2017 @@ -82,6 +82,70 @@ static +BOOL +ParseDaysOfMonth( + PWSTR pszBuffer, + PULONG pulDaysOfMonth) +{ + PWSTR startPtr, endPtr; + ULONG ulValue; + + if (wcslen(pszBuffer) == 0) + return FALSE; + + startPtr = pszBuffer; + endPtr = NULL; + for (;;) + { + ulValue = wcstoul(startPtr, &endPtr, 10); + + if (ulValue > 0 && ulValue <= 31) + *pulDaysOfMonth |= (1 << (ulValue - 1)); + + if (endPtr != NULL && *endPtr == UNICODE_NULL) + return TRUE; + + startPtr = endPtr + 1; + endPtr = NULL; + } + + return FALSE; +} + + +static +BOOL +ParseDaysOfWeek( + PWSTR pszBuffer, + PUCHAR pucDaysOfWeek) +{ +#if 0 + PWSTR startPtr, endPtr; + + if (wcslen(pszBuffer) == 0) + return FALSE; + + startPtr = pszBuffer; + endPtr = NULL; + for (;;) + { + endPtr = wcschr(startPtr, L','); + + + + if (endPtr == NULL) + return TRUE; + + startPtr = endPtr + 1; + endPtr = NULL; + } +#endif + + return FALSE; +} + + +static VOID PrintErrorMessage( DWORD dwError) @@ -133,6 +197,18 @@ static +ULONG +GetCurrentDayOfMonth(VOID) +{ + SYSTEMTIME Time; + + GetLocalTime(&Time); + + return 1UL << (Time.wDay - 1); +} + + +static VOID JobTimeToTimeString( PWSTR pszBuffer, @@ -153,22 +229,23 @@ cchBuffer); } + static INT PrintJobDetails( PWSTR pszComputerName, ULONG ulJobId) { - AT_INFO *pBuffer = NULL; + PAT_INFO pBuffer = NULL; DWORD_PTR CurrentTime; WCHAR szStatusBuffer[16]; - WCHAR szDayBuffer[32]; + WCHAR szScheduleBuffer[60]; WCHAR szTimeBuffer[16]; WCHAR szInteractiveBuffer[16]; + WCHAR szDateBuffer[8]; + INT i, nDateLength, nScheduleLength; HINSTANCE hInstance; NET_API_STATUS Status; - - hInstance = GetModuleHandle(NULL); Status = NetScheduleJobGetInfo(pszComputerName, ulJobId, @@ -179,41 +256,82 @@ return 1; } + hInstance = GetModuleHandle(NULL); + if (pBuffer->Flags & JOB_EXEC_ERROR) - LoadStringW(hInstance, IDS_ERROR, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + LoadStringW(hInstance, IDS_ERROR, szStatusBuffer, _countof(szStatusBuffer)); else - LoadStringW(hInstance, IDS_OK, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + LoadStringW(hInstance, IDS_OK, szStatusBuffer, _countof(szStatusBuffer)); if (pBuffer->DaysOfMonth != 0) { - wcscpy(szDayBuffer, L"TODO: DaysOfMonth!"); + if (pBuffer->Flags & JOB_RUN_PERIODICALLY) + LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); + else + LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer)); + + nScheduleLength = wcslen(szScheduleBuffer); + for (i = 0; i < 31; i++) + { + if (pBuffer->DaysOfMonth & (1 << i)) + { + swprintf(szDateBuffer, L" %d", i + 1); + nDateLength = wcslen(szDateBuffer); + if (nScheduleLength + nDateLength <= 55) + { + wcscat(szScheduleBuffer, szDateBuffer); + nScheduleLength += nDateLength; + } + else + { + wcscat(szScheduleBuffer, L"..."); + break; + } + } + } } else if (pBuffer->DaysOfWeek != 0) { - wcscpy(szDayBuffer, L"TODO: DaysOfWeek!"); +#if 0 + if (pBuffer->Flags & JOB_RUN_PERIODICALLY) + LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); + else + LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer)); + + nScheduleLength = wcslen(szScheduleBuffer); + for (i = 0; i < 7; i++) + { + if (pBuffer->DaysOfWeek & (1 << i)) + { + + } + } +#endif + + wcscpy(szScheduleBuffer, L"TODO: DaysOfWeek!"); } else { CurrentTime = GetTimeAsJobTime(); if (CurrentTime > pBuffer->JobTime) - LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + LoadStringW(hInstance, IDS_TOMORROW, szScheduleBuffer, _countof(szScheduleBuffer)); else - LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + LoadStringW(hInstance, IDS_TODAY, szScheduleBuffer, _countof(szScheduleBuffer)); } JobTimeToTimeString(szTimeBuffer, - ARRAYSIZE(szTimeBuffer), + _countof(szTimeBuffer), (WORD)(pBuffer->JobTime / 3600000), (WORD)((pBuffer->JobTime % 3600000) / 60000)); if (pBuffer->Flags & JOB_NONINTERACTIVE) - LoadStringW(hInstance, IDS_NO, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + LoadStringW(hInstance, IDS_NO, szInteractiveBuffer, _countof(szInteractiveBuffer)); else - LoadStringW(hInstance, IDS_YES, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + LoadStringW(hInstance, IDS_YES, szInteractiveBuffer, _countof(szInteractiveBuffer)); ConResPrintf(StdOut, IDS_TASKID, ulJobId); ConResPrintf(StdOut, IDS_STATUS, szStatusBuffer); - ConResPrintf(StdOut, IDS_SCHEDULE, szDayBuffer); + ConResPrintf(StdOut, IDS_SCHEDULE, szScheduleBuffer); ConResPrintf(StdOut, IDS_TIME, szTimeBuffer); ConResPrintf(StdOut, IDS_INTERACTIVE, szInteractiveBuffer); ConResPrintf(StdOut, IDS_COMMAND, pBuffer->Command); @@ -235,9 +353,11 @@ DWORD_PTR CurrentTime; NET_API_STATUS Status; - WCHAR szDayBuffer[32]; + WCHAR szScheduleBuffer[32]; WCHAR szTimeBuffer[16]; + WCHAR szDateBuffer[8]; HINSTANCE hInstance; + INT j, nDateLength, nScheduleLength; Status = NetScheduleJobEnum(pszComputerName, (PBYTE *)&pBuffer, @@ -266,30 +386,80 @@ { if (pBuffer[i].DaysOfMonth != 0) { - wcscpy(szDayBuffer, L"TODO: DaysOfMonth"); + if (pBuffer[i].Flags & JOB_RUN_PERIODICALLY) + LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); + else + LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer)); + + nScheduleLength = wcslen(szScheduleBuffer); + for (j = 0; j < 31; j++) + { + if (pBuffer[i].DaysOfMonth & (1 << j)) + { + swprintf(szDateBuffer, L" %d", j + 1); + nDateLength = wcslen(szDateBuffer); + if (nScheduleLength + nDateLength <= 19) + { + wcscat(szScheduleBuffer, szDateBuffer); + nScheduleLength += nDateLength; + } + else + { + wcscat(szScheduleBuffer, L"..."); + break; + } + } + } } else if (pBuffer[i].DaysOfWeek != 0) { - wcscpy(szDayBuffer, L"TODO: DaysOfWeek"); +#if 0 + if (pBuffer[i].Flags & JOB_RUN_PERIODICALLY) + LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); + else + LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer)); + + nScheduleLength = wcslen(szScheduleBuffer); + for (j = 0; j < 7; j++) + { + if (pBuffer[i].DaysOfWeek & (1 << j)) + { + swprintf(szDateBuffer, L" %d", j + 1); + nDateLength = wcslen(szDateBuffer); + if (nScheduleLength + nDateLength <= 19) + { + wcscat(szScheduleBuffer, szDateBuffer); + nScheduleLength += nDateLength; + } + else + { + wcscat(szScheduleBuffer, L"..."); + break; + } + } + } +#endif + + wcscpy(szScheduleBuffer, L"TODO: DaysOfWeek"); } else { CurrentTime = GetTimeAsJobTime(); if (CurrentTime > pBuffer[i].JobTime) - LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + LoadStringW(hInstance, IDS_TOMORROW, szScheduleBuffer, _countof(szScheduleBuffer)); else - LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + LoadStringW(hInstance, IDS_TODAY, szScheduleBuffer, _countof(szScheduleBuffer)); } JobTimeToTimeString(szTimeBuffer, - ARRAYSIZE(szTimeBuffer), + _countof(szTimeBuffer), (WORD)(pBuffer[i].JobTime / 3600000), (WORD)((pBuffer[i].JobTime % 3600000) / 60000)); ConPrintf(StdOut, - L" %7lu %-22s %-12s %s\n", + L" %7lu %-22s %-11s %s\n", pBuffer[i].JobId, - szDayBuffer, + szScheduleBuffer, szTimeBuffer, pBuffer[i].Command); } @@ -306,7 +476,10 @@ PWSTR pszComputerName, ULONG ulJobHour, ULONG ulJobMinute, + ULONG ulDaysOfMonth, + UCHAR ucDaysOfWeek, BOOL bInteractiveJob, + BOOL bPeriodicJob, PWSTR pszCommand) { AT_INFO InfoBuffer; @@ -315,9 +488,10 @@ InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + (DWORD_PTR)ulJobMinute * 60000; - InfoBuffer.DaysOfMonth = 0; - InfoBuffer.DaysOfWeek = 0; - InfoBuffer.Flags = bInteractiveJob ? 0 : JOB_NONINTERACTIVE; + InfoBuffer.DaysOfMonth = ulDaysOfMonth; + InfoBuffer.DaysOfWeek = ucDaysOfWeek; + InfoBuffer.Flags = (bInteractiveJob ? 0 : JOB_NONINTERACTIVE) | + (bPeriodicJob ? JOB_RUN_PERIODICALLY : 0); InfoBuffer.Command = pszCommand; Status = NetScheduleJobAdd(pszComputerName, @@ -371,8 +545,10 @@ ULONG ulJobHour = (ULONG)-1; ULONG ulJobMinute = (ULONG)-1; BOOL bDeleteJob = FALSE, bForceDelete = FALSE; - BOOL bInteractiveJob = FALSE; + BOOL bInteractiveJob = FALSE, bPeriodicJob = FALSE; BOOL bPrintUsage = FALSE; + ULONG ulDaysOfMonth = 0; + UCHAR ucDaysOfWeek = 0; INT nResult = 0; INT i, minIdx; @@ -428,14 +604,28 @@ { bInteractiveJob = TRUE; } -/* else if (_wcsnicmp(argv[i], L"/every:", 7) == 0) { + bPeriodicJob = TRUE; + if (ParseDaysOfMonth(&(argv[i][7]), &ulDaysOfMonth) == FALSE) + { + if (ParseDaysOfWeek(&(argv[i][7]), &ucDaysOfWeek) == FALSE) + { + ulDaysOfMonth = GetCurrentDayOfMonth(); + } + } } else if (_wcsnicmp(argv[i], L"/next:", 6) == 0) { - } -*/ + bPeriodicJob = FALSE; + if (ParseDaysOfMonth(&(argv[i][6]), &ulDaysOfMonth) == FALSE) + { + if (ParseDaysOfWeek(&(argv[i][6]), &ucDaysOfWeek) == FALSE) + { + ulDaysOfMonth = GetCurrentDayOfMonth(); + } + } + } else { bPrintUsage = TRUE; @@ -457,6 +647,8 @@ if (bInteractiveJob == TRUE || ulJobHour != (ULONG)-1 || ulJobMinute != (ULONG)-1 || + ulDaysOfMonth != 0 || + ucDaysOfWeek != 0 || pszCommand != NULL) { bPrintUsage = TRUE; @@ -464,14 +656,17 @@ goto done; } - nResult = DeleteJob(pszComputerName, ulJobId, bForceDelete); + nResult = DeleteJob(pszComputerName, + ulJobId, + bForceDelete); } else { if (ulJobHour != (ULONG)-1 && ulJobMinute != (ULONG)-1) { /* Check for invalid options or arguments */ - if (bForceDelete == TRUE || pszCommand == NULL) + if (bForceDelete == TRUE || + pszCommand == NULL) { bPrintUsage = TRUE; nResult = 1; @@ -481,13 +676,20 @@ nResult = AddJob(pszComputerName, ulJobHour, ulJobMinute, + ulDaysOfMonth, + ucDaysOfWeek, bInteractiveJob, + bPeriodicJob, pszCommand); } else { /* Check for invalid options or arguments */ - if (bForceDelete == TRUE || bInteractiveJob == TRUE) + if (bForceDelete == TRUE || + bInteractiveJob == TRUE || + ulDaysOfMonth != 0 || + ucDaysOfWeek != 0 || + pszCommand != NULL) { bPrintUsage = TRUE; nResult = 1; @@ -500,7 +702,8 @@ } else { - nResult = PrintJobDetails(pszComputerName, ulJobId); + nResult = PrintJobDetails(pszComputerName, + ulJobId); } } } Modified: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] Sun Mar 19 17:15:59 2017 @@ -25,6 +25,8 @@ IDS_TODAY "Heute" IDS_TOMORROW "Morgen" + IDS_EVERY "Jeden" + IDS_NEXT "NÃ¤chsten" IDS_YES "Ja" IDS_NO "Nein" Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Sun Mar 19 17:15:59 2017 @@ -34,6 +34,8 @@ IDS_TODAY "Today" IDS_TOMORROW "Tomorrow" + IDS_EVERY "Every" + IDS_NEXT "Next" IDS_YES "Yes" IDS_NO "No" Modified: trunk/reactos/base/applications/cmdutils/at/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] Sun Mar 19 17:15:59 2017 @@ -9,6 +9,8 @@ #define IDS_TODAY 109 #define IDS_TOMORROW 110 +#define IDS_EVERY 111 +#define IDS_NEXT 112 #define IDS_YES 101

7 years, 9 months

[akhaldi] 74201: [WINTRUST_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:12:49 2017 New Revision: 74201 URL: http://svn.reactos.org/svn/reactos?rev=74201&view=rev Log: [WINTRUST_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/wintrust/softpub.c Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… ============================================================================== --- trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] Sun Mar 19 17:12:49 2017 @@ -203,25 +203,27 @@ "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL GUID */ + if (0) { /* crashes on 64-bit win10 */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); - /* All NULL */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(NULL, 0); + /* Proper release */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + + /* Try to release a second time */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - - /* Proper release */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - - /* Try to release a second time */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(hca, 0); + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -1020,8 +1022,11 @@ catmember = NULL; catmembertag = NULL; while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, cdf_callback, &catmember, FALSE, NULL))) ; - todo_wine - CHECK_EXPECT(CRYPTCAT_E_AREA_MEMBER, CRYPTCAT_E_CDF_MEMBER_FILE_PATH); + ok(error_area == 0xffffffff || broken(error_area == CRYPTCAT_E_AREA_MEMBER) /* < win81 */, + "Expected area 0xffffffff, got %08x\n", error_area); + ok(local_error == 0xffffffff || broken(local_error == CRYPTCAT_E_CDF_MEMBER_FILE_PATH) /* < win81 */, + "Expected error 0xffffffff, got %08x\n", local_error); + pCryptCATCDFClose(catcdf); DeleteFileA(cdffileA); todo_wine Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Sun Mar 19 17:12:49 2017 @@ -251,6 +251,8 @@ if (data.padwTrustStepErrors) { /* Apparently, cdwTrustStepErrors does not need to be set. */ + memset(data.padwTrustStepErrors, 0, + TRUSTERROR_MAX_STEPS * sizeof(DWORD)); ret = funcs->pfnInitialize(&data); ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); data.cdwTrustStepErrors = 1; @@ -301,6 +303,7 @@ { HRESULT ret; CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; WINTRUST_DATA wintrust_data = { 0 }; WINTRUST_CERT_INFO certInfo = { sizeof(WINTRUST_CERT_INFO), 0 }; WINTRUST_FILE_INFO fileInfo = { sizeof(WINTRUST_FILE_INFO), 0 }; @@ -314,6 +317,7 @@ /* Crashes ret = funcs->pfnObjectTrust(NULL); */ + data.pSigState = &sig_state; data.pWintrustData = &wintrust_data; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); @@ -542,6 +546,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; BOOL b; @@ -552,6 +557,7 @@ return; } + data.pSigState = &sig_state; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (!data.padwTrustStepErrors) @@ -777,15 +783,6 @@ ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL); - todo_wine - ok(!ret && (GetLastError() == NTE_BAD_ALGID || - GetLastError() == ERROR_INVALID_PARAMETER /* Win7 */), - "expected NTE_BAD_ALGID or ERROR_INVALID_PARAMETER, got %08x\n", - GetLastError()); - ok(count == 0xdeadbeef, "expected count to be unmodified, got %d\n", count); subjinfo.DigestAlgorithm.pszObjId = oid_sha1; count = 0xdeadbeef; ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL);

7 years, 9 months

[akhaldi] 74200: [PSDK] Update wintrust.h. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:11:45 2017 New Revision: 74200 URL: http://svn.reactos.org/svn/reactos?rev=74200&view=rev Log: [PSDK] Update wintrust.h. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/wintrust.h Modified: trunk/reactos/sdk/include/psdk/wintrust.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wintrust.… ============================================================================== --- trunk/reactos/sdk/include/psdk/wintrust.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wintrust.h [iso-8859-1] Sun Mar 19 17:11:45 2017 @@ -116,6 +116,7 @@ WCHAR* pwszURLReference; DWORD dwProvFlags; DWORD dwUIContext; + struct WINTRUST_SIGNATURE_SETTINGS_ *pSignatureSettings; } WINTRUST_DATA, *PWINTRUST_DATA; #define WTD_STATEACTION_IGNORE 0 @@ -140,6 +141,26 @@ #define WTD_UICONTEXT_EXECUTE 0 #define WTD_UICONTEXT_INSTALL 1 + +typedef struct WINTRUST_SIGNATURE_SETTINGS_ +{ + DWORD cbStruct; + DWORD dwIndex; + DWORD dwFlags; + DWORD cSecondarySigs; + DWORD dwVerifiedSigIndex; + CERT_STRONG_SIGN_PARA *pCryptoPolicy; +} WINTRUST_SIGNATURE_SETTINGS, *PWINTRUST_SIGNATURE_SETTINGS; + +#define WSS_VERIFY_SPECIFIC 0x00000001 +#define WSS_GET_SECONDARY_SIG_COUNT 0x00000002 +#define WSS_VERIFY_SEALING 0x00000004 +#define WSS_INPUT_FLAG_MASK 0x00000007 + +#define WSS_OUT_SEALING_STATUS_VERIFIED 0x80000000 +#define WSS_OUT_HAS_SEALING_INTENT 0x40000000 +#define WSS_OUT_FILE_SUPPORTS_SEAL 0x20000000 +#define WSS_OUTPUT_FLAG_MASK 0xe0000000 typedef struct _CRYPT_TRUST_REG_ENTRY { @@ -356,6 +377,8 @@ PCERT_USAGE_MATCH pRequestUsage; DWORD dwTrustPubSettings; DWORD dwUIStateFlags; + struct _CRYPT_PROVIDER_SIGSTATE *pSigState; + struct WINTRUST_SIGNATURE_SETTINGS_ *pSigSettings; } CRYPT_PROVIDER_DATA, *PCRYPT_PROVIDER_DATA; #define CPD_CHOICE_SIP 1 @@ -370,6 +393,27 @@ #define CPD_UISTATE_MODE_BLOCK 0x00000001 #define CPD_UISTATE_MODE_ALLOW 0x00000002 #define CPD_UISTATE_MODE_MASK 0x00000003 + +typedef struct _CRYPT_PROVIDER_SIGSTATE +{ + DWORD cbStruct; + HCRYPTMSG *rhSecondarySigs; + HCRYPTMSG hPrimarySig; + BOOL fFirstAttemptMade; + BOOL fNoMoreSigs; + DWORD cSecondarySigs; + DWORD dwCurrentIndex; + BOOL fSupportMultiSig; + DWORD dwCryptoPolicySupport; + DWORD iAttemptCount; + BOOL fCheckedSealing; + struct _SEALING_SIGNATURE_ATTRIBUTE *pSealingSignature; +} CRYPT_PROVIDER_SIGSTATE, *PCRYPT_PROVIDER_SIGSTATE; + +/* Flags for dwCryptoPolicySupport */ +#define WSS_OBJTRUST_SUPPORT 0x00000001 +#define WSS_SIGTRUST_SUPPORT 0x00000002 +#define WSS_CERTTRUST_SUPPORT 0x00000004 typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData);

7 years, 9 months

[akhaldi] 74199: [WINTRUST] Sync with Wine Staging 2.2. CORE-12823 e141d4a wintrust: Use return value of sprintf() instead of calling strlen().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:09:31 2017 New Revision: 74199 URL: http://svn.reactos.org/svn/reactos?rev=74199&view=rev Log: [WINTRUST] Sync with Wine Staging 2.2. CORE-12823 e141d4a wintrust: Use return value of sprintf() instead of calling strlen(). Modified: trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Sun Mar 19 17:09:31 2017 @@ -1883,10 +1883,9 @@ LPSTR pszObjId = *(LPSTR *)pvStructInfo; *pszObjId = 0; - sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40, + pszObjId += sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); - pszObjId += strlen(pszObjId); for (ptr = pbEncoded + 2 + lenBytes; ret && ptr - pbEncoded - 1 - lenBytes < dataLen; ) { @@ -1901,8 +1900,7 @@ } val <<= 7; val |= *ptr++; - sprintf(pszObjId, ".%d", val); - pszObjId += strlen(pszObjId); + pszObjId += sprintf(pszObjId, ".%d", val); } } else Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 17:09:31 2017 @@ -206,7 +206,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-2.2 -reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 +reactos/dll/win32/wintrust # Synced to WineStaging-2.2 reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11

7 years, 9 months

[akhaldi] 74198: [WINHTTP_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:05:35 2017 New Revision: 74198 URL: http://svn.reactos.org/svn/reactos?rev=74198&view=rev Log: [WINHTTP_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/winhttp/url.c trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/url.c?r… ============================================================================== --- trunk/rostests/winetests/winhttp/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/url.c [iso-8859-1] Sun Mar 19 17:05:35 2017 @@ -118,7 +118,7 @@ { URL_COMPONENTS uc; WCHAR *url; - DWORD len; + DWORD len, err; BOOL ret; /* NULL components */ @@ -144,22 +144,33 @@ ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - /* valid components, NULL url */ + /* valid components, NULL url, insufficient length */ + len = 0; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); + ok( len == 57, "expected len 57 got %u\n", len ); + + /* valid components, NULL url, sufficient length */ + SetLastError( 0xdeadbeef ); + len = 256; + ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); + err = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, + "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); /* correct size, NULL url */ fill_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); + err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, + "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); /* valid components, allocated url, short length */ SetLastError( 0xdeadbeef ); Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Sun Mar 19 17:05:35 2017 @@ -1002,7 +1002,10 @@ ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "setting client cert context returned %x (%u)\n", ret, GetLastError()); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */, + "setting client cert context returned %u\n", err); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); @@ -1028,7 +1031,8 @@ ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(ret, "failed to set client cert context %u\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); @@ -1220,21 +1224,28 @@ return ret; } +static void set_proxy( REGSAM access, BYTE *buf, DWORD len, DWORD type ) +{ + HKEY hkey; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, access, NULL, &hkey, NULL )) + { + if (len) RegSetValueExW( hkey, WinHttpSettings, 0, type, buf, len ); + else RegDeleteValueW( hkey, WinHttpSettings ); + RegCloseKey( hkey ); + } +} + static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) { - LONG l; - HKEY key; - - l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL ); - if (!l) + BOOL wow64; + IsWow64Process( GetCurrentProcess(), &wow64 ); + if (sizeof(void *) > sizeof(int) || wow64) { - if (len) - RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); - else - RegDeleteValueW( key, WinHttpSettings ); - RegCloseKey( key ); + set_proxy( KEY_WRITE|KEY_WOW64_64KEY, buf, len, type ); + set_proxy( KEY_WRITE|KEY_WOW64_32KEY, buf, len, type ); } + else + set_proxy( KEY_WRITE, buf, len, type ); } static void test_set_default_proxy_config(void)

7 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

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 March 2017