Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 73303: [WINDOWSCODECS] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:22:42 2016 New Revision: 73303 URL: http://svn.reactos.org/svn/reactos?rev=73303&view=rev Log: [WINDOWSCODECS] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/icnsformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/main.c trunk/reactos/dll/win32/windowscodecs/metadataquery.c trunk/reactos/dll/win32/windowscodecs/palette.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/typeof.h trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… Modified: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ma… Modified: trunk/reactos/dll/win32/windowscodecs/metadataquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… Modified: trunk/reactos/dll/win32/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pa… Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 73302: [PSDK] Add missing WINCODEC_ERR_UNKNOWNIMAGEFORMAT.
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:20:00 2016 New Revision: 73302 URL: http://svn.reactos.org/svn/reactos?rev=73302&view=rev Log: [PSDK] Add missing WINCODEC_ERR_UNKNOWNIMAGEFORMAT. Modified: trunk/reactos/sdk/include/psdk/winerror.h Modified: trunk/reactos/sdk/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winerror.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] Thu Nov 17 23:20:00 2016 @@ -3268,6 +3268,8 @@ #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071L) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072L) +#define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L)

1 0

[akhaldi] 73301: [WBOMPROX_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:19:20 2016 New Revision: 73301 URL: http://svn.reactos.org/svn/reactos?rev=73301&view=rev Log: [WBOMPROX_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/wbemprox/query.c Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Thu Nov 17 23:19:20 2016 @@ -310,7 +310,6 @@ VariantInit( &val ); hr = IWbemClassObject_Get( obj, identificationcodeW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get identication code %08x\n", hr ); - todo_wine ok( V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); VariantClear( &val ); @@ -590,7 +589,6 @@ VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); - todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); @@ -1051,6 +1049,172 @@ SysFreeString( class ); } +static void test_OperatingSystem( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; + static const WCHAR buildnumberW[] = {'B','u','i','l','d','N','u','m','b','e','r',0}; + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; + static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; + static const WCHAR suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; + static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; + static const WCHAR servicepackmajorW[] = + {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR servicepackminorW[] = + {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get buildnumber %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "buildnumber: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, csdversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get csdversion %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "csdversion: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, osproductsuiteW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); + ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, ostypeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get ostype %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "ostype: %d\n", V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, servicepackmajorW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get servicepackmajor %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "servicepackmajor: %d\n", V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, servicepackminorW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get servicepackminor %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "servicepackminor: %d\n", V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, suitemaskW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get suitemask %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "suitemask: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_ComputerSystemProduct( IWbemServices *services ) +{ + static const WCHAR uuidW[] = {'U','U','I','D',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *service; + VARIANT value; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_ComputerSystemProduct not available\n" ); + return; + } + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, uuidW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + IWbemClassObject_Release( service ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1088,6 +1252,8 @@ test_query_async( services ); test_GetNames( services ); test_SystemSecurity( services ); + test_OperatingSystem( services ); + test_ComputerSystemProduct( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

[akhaldi] 73300: [WBOMPROX] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:18:42 2016 New Revision: 73300 URL: http://svn.reactos.org/svn/reactos?rev=73300&view=rev Log: [WBOMPROX] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/dll/win32/wbemprox/reg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Thu Nov 17 23:18:42 2016 @@ -401,7 +401,7 @@ static const struct column col_compsysproduct[] = { { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, - { prop_uuidW, CIM_STRING } + { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_datafile[] = { @@ -481,16 +481,16 @@ }; static const struct column col_os[] = { - { prop_buildnumberW, CIM_STRING }, - { prop_captionW, CIM_STRING }, + { prop_buildnumberW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_csdversionW, CIM_STRING }, + { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_installdateW, CIM_DATETIME }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -502,7 +502,7 @@ { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, - { prop_versionW, CIM_STRING } + { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_param[] = { @@ -619,7 +619,7 @@ static const struct column col_systemenclosure[] = { { prop_captionW, CIM_STRING }, - { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY, VT_I4|VT_ARRAY }, { prop_descriptionW, CIM_STRING }, { prop_lockpresentW, CIM_BOOLEAN }, { prop_manufacturerW, CIM_STRING }, @@ -719,24 +719,10 @@ {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; -static const WCHAR os_buildnumberW[] = - {'2','6','0','0',0}; -static const WCHAR os_captionW[] = - {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', - 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; -static const WCHAR os_csdversionW[] = - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}; static const WCHAR os_installdateW[] = {'2','0','1','4','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; -static const WCHAR os_nameW[] = - {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', - 'P','r','o','f','e','s','s','i','o','n','a','l','|','C',':','\\','W','I','N','D','O','W','S', - '|','\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','0', - '\\','P','a','r','t','i','t','i','o','n','1',0}; static const WCHAR os_serialnumberW[] = {'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0}; -static const WCHAR os_versionW[] = - {'5','.','1','.','2','6','0','0',0}; static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = @@ -1059,12 +1045,8 @@ }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, + { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } -}; -static const struct record_computersystemproduct data_compsysproduct[] = -{ - { compsysproduct_identifyingnumberW, compsysproduct_uuidW } }; static const struct record_param data_param[] = { @@ -1320,6 +1302,46 @@ rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); rec->username = get_username(); + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + +static WCHAR *get_compsysproduct_uuid(void) +{ +#ifdef __APPLE__ + unsigned char uuid[16]; + const struct timespec timeout = {1, 0}; + if (!gethostuuid( uuid, &timeout )) + { + static const WCHAR fmtW[] = + {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; + WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); + if (!ret) return NULL; + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + return ret; + } +#endif + return heap_strdupW( compsysproduct_uuidW ); +} + +static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond ) +{ + struct record_computersystemproduct *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_computersystemproduct *)table->data; + rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->uuid = get_compsysproduct_uuid(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -2623,38 +2645,122 @@ if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); return ret; } +static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) +{ + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); + if (ret) sprintfW( ret, fmtW, ver->dwBuildNumber ); + return ret; +} +static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) +{ + static const WCHAR windowsW[] = + {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' '}; + static const WCHAR win2000W[] = + {'2','0','0','0',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; + static const WCHAR win2003W[] = + {'S','e','r','v','e','r',' ','2','0','0','3',' ','S','t','a','n','d','a','r','d',' ','E','d','i','t','i','o','n',0}; + static const WCHAR winxpW[] = + {'X','P',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; + static const WCHAR winxp64W[] = + {'X','P',' ','P','r','o','f','e','s','s','i','o','n','a','l',' ','x','6','4',' ','E','d','i','t','i','o','n',0}; + static const WCHAR vistaW[] = + {'V','i','s','t','a',' ','U','l','t','i','m','a','t','e',0}; + static const WCHAR win2008W[] = + {'S','e','r','v','e','r',' ','2','0','0','8',' ','S','t','a','n','d','a','r','d',0}; + static const WCHAR win7W[] = + {'7',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; + static const WCHAR win2008r2W[] = + {'S','e','r','v','e','r',' ','2','0','0','8',' ','R','2',' ','S','t','a','n','d','a','r','d',0}; + static const WCHAR win8W[] = + {'8',' ','P','r','o',0}; + static const WCHAR win81W[] = + {'8','.','1',' ','P','r','o',0}; + static const WCHAR win10W[] = + {'1','0',' ','P','r','o',0}; + int len = sizeof(windowsW)/sizeof(windowsW[0]); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; + memcpy( ret, windowsW, sizeof(windowsW) ); + if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) + { + if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) ); + else memcpy( ret + len, win2008r2W, sizeof(win2008r2W) ); + } + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 0) + { + if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, vistaW, sizeof(vistaW) ); + else memcpy( ret + len, win2008W, sizeof(win2008W) ); + } + else if (ver->dwMajorVersion == 5 && ver->dwMinorVersion == 2) + { + if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, winxp64W, sizeof(winxp64W) ); + else memcpy( ret + len, win2003W, sizeof(win2003W) ); + } + else if (ver->dwMajorVersion == 5 && ver->dwMinorVersion == 1) memcpy( ret + len, winxpW, sizeof(winxpW) ); + else memcpy( ret + len, win2000W, sizeof(win2000W) ); + return ret; +} +static WCHAR *get_osname( const WCHAR *caption ) +{ + static const WCHAR partitionW[] = + {'|','C',':','\\','W','I','N','D','O','W','S','|','\\','D','e','v','i','c','e','\\', + 'H','a','r','d','d','i','s','k','0','\\','P','a','r','t','i','t','i','o','n','1',0}; + int len = strlenW( caption ); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(partitionW) ))) return NULL; + memcpy( ret, caption, len * sizeof(WCHAR) ); + memcpy( ret + len, partitionW, sizeof(partitionW) ); + return ret; +} +static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) +{ + static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u',0}; + WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); + if (ret) sprintfW( ret, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; + OSVERSIONINFOEXW ver; UINT row = 0; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + ver.dwOSVersionInfoSize = sizeof(ver); + GetVersionExW( (OSVERSIONINFOW *)&ver ); + rec = (struct record_operatingsystem *)table->data; - rec->buildnumber = os_buildnumberW; - rec->caption = os_captionW; + rec->buildnumber = get_osbuildnumber( &ver ); + rec->caption = get_oscaption( &ver ); rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); - rec->csdversion = os_csdversionW; + rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL; rec->installdate = os_installdateW; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); - rec->name = os_nameW; + rec->name = get_osname( rec->caption ); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; rec->serialnumber = os_serialnumberW; - rec->servicepackmajor = 3; - rec->servicepackminor = 0; + rec->servicepackmajor = ver.wServicePackMajor; + rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->totalvisiblememorysize = get_total_physical_memory() / 1024; - rec->version = os_versionW; + rec->version = get_osversion( &ver ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -3010,7 +3116,7 @@ { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, - { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, 0, 0, NULL, fill_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, Modified: trunk/reactos/dll/win32/wbemprox/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/reg.c?r… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] Thu Nov 17 23:18:42 2016 @@ -105,7 +105,7 @@ if (!(strings[i] = SysAllocString( buf ))) { for (i--; i >= 0; i--) SysFreeString( strings[i] ); - hr = ERROR_OUTOFMEMORY; + hr = E_OUTOFMEMORY; break; } i++; @@ -210,7 +210,7 @@ if (!(value_names[i] = SysAllocString( buf ))) { for (i--; i >= 0; i--) SysFreeString( value_names[i] ); - hr = ERROR_OUTOFMEMORY; + hr = E_OUTOFMEMORY; break; } i++; 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] Thu Nov 17 23:18:42 2016 @@ -195,7 +195,7 @@ reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16 -reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.11 +reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.16 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.11

1 0

[akhaldi] 73299: [VBSCRIPT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:16:08 2016 New Revision: 73299 URL: http://svn.reactos.org/svn/reactos?rev=73299&view=rev Log: [VBSCRIPT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/vbscript/api.vbs trunk/rostests/winetests/vbscript/run.c Modified: trunk/rostests/winetests/vbscript/api.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/api.vb… ============================================================================== --- trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] Thu Nov 17 23:16:08 2016 @@ -440,6 +440,35 @@ TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +Sub TestStrComp(str_left, str_right, mode, ex) + x = StrComp(str_left, str_right, mode) + Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) +End Sub + +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABCD", "ABC", 0, 1 +TestStrComp "ABC", "ABCD", 0, -1 +TestStrComp "ABC", "abc", 1, 0 +TestStrComp "ABC", "ABC", 1, 0 +TestStrComp "ABCD", "ABC", 1, 1 +TestStrComp "ABC", "ABCD", 1, -1 +TestStrComp "ABC", "ABCD", "0", -1 +TestStrComp "ABC", "ABCD", "1", -1 +TestStrComp 1, 1, 1, 0 +TestStrComp "1", 1, 1, 0 +TestStrComp "1", 1.0, 1, 0 +TestStrComp Empty, Empty, 1, 0 +TestStrComp Empty, "", 1, 0 +TestStrComp Empty, "ABC", 1, -1 +TestStrComp "ABC", Empty, 1, 1 +TestStrComp vbNull, vbNull, 1, 0 +TestStrComp "", vbNull, 1, -1 + Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Modified: trunk/rostests/winetests/vbscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/run.c?… ============================================================================== --- trunk/rostests/winetests/vbscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/vbscript/run.c [iso-8859-1] Thu Nov 17 23:16:08 2016 @@ -2133,6 +2133,12 @@ CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_af(0, "TEST.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0

[akhaldi] 73298: [VBSCRIPT] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:15:02 2016 New Revision: 73298 URL: http://svn.reactos.org/svn/reactos?rev=73298&view=rev Log: [VBSCRIPT] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/interp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Thu Nov 17 23:15:02 2016 @@ -1020,10 +1020,47 @@ return E_NOTIMPL; } -static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; +static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + BSTR left, right; + int mode, ret; + HRESULT hres; + short val; + + TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1)); + + assert(args_cnt == 2 || args_cnt == 3); + + if (args_cnt == 3) { + hres = to_int(args+2, &mode); + if(FAILED(hres)) + return hres; + + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + return E_FAIL; + } + } + else + mode = 0; + + hres = to_string(args, &left); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &right); + if(FAILED(hres)) + { + SysFreeString(left); + return hres; + } + + ret = mode ? strcmpiW(left, right) : strcmpW(left, right); + val = ret < 0 ? -1 : (ret > 0 ? 1 : 0); + + SysFreeString(left); + SysFreeString(right); + return return_short(res, val); } static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) Modified: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] Thu Nov 17 23:15:02 2016 @@ -177,7 +177,7 @@ if(!item->disp) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); continue; 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] Thu Nov 17 23:15:02 2016 @@ -191,7 +191,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23 reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 +reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16

1 0

[akhaldi] 73297: [USP10_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:13:43 2016 New Revision: 73297 URL: http://svn.reactos.org/svn/reactos?rev=73297&view=rev Log: [USP10_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Thu Nov 17 23:13:43 2016 @@ -2902,8 +2902,8 @@ int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - const int Dx[5] = {10, 10, 10, 10, 10}; - const BYTE InClass = 0; + static const int Dx[(sizeof(teststr) / sizeof(WCHAR)) - 1]; + static const BYTE InClass[(sizeof(teststr) / sizeof(WCHAR)) - 1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int X = 10; @@ -2922,26 +2922,26 @@ /* Test without hdc to get E_PENDING */ hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* Test that 0 length string returns E_INVALIDARG */ hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ScriptStringFree(&ssa); /* test makes sure that a call with a valid pssa still works */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); @@ -2985,7 +2985,7 @@ int Charset = -1; /* unicode */ DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - const BYTE InClass = 0; + static const BYTE InClass[(sizeof(teststr1)/sizeof(WCHAR))-1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int Ch; /* Character position in string */ @@ -3002,7 +3002,7 @@ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, NULL, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK || hr == E_INVALIDARG, /* NT */ "ScriptStringAnalyse should return S_OK or E_INVALIDARG not %08x\n", hr); @@ -3142,7 +3142,7 @@ */ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, NULL, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); /* @@ -3613,6 +3613,58 @@ } } +struct logical_width_test +{ + int char_count; + int glyph_count; + int advances[3]; + WORD map[3]; + int widths[3]; + BOOL clusterstart[3]; + BOOL diacritic[3]; + BOOL zerowidth[3]; + BOOL todo; +}; + +static const struct logical_width_test logical_width_tests[] = +{ + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 1, 0, 0 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 0 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 27, 21, 12 }, { 0, 0, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 0, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 1, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 2, 2 }, { 15, 6, 6 }, { 1, 0, 1 } }, +}; + +static void test_ScriptGetLogicalWidths(void) +{ + SCRIPT_ANALYSIS sa = { 0 }; + unsigned int i, j; + + for (i = 0; i < sizeof(logical_width_tests)/sizeof(logical_width_tests[0]); i++) + { + const struct logical_width_test *ptr = logical_width_tests + i; + SCRIPT_VISATTR attrs[3]; + int widths[3]; + HRESULT hr; + + memset(attrs, 0, sizeof(attrs)); + for (j = 0; j < ptr->glyph_count; j++) + { + attrs[j].fClusterStart = ptr->clusterstart[j]; + attrs[j].fDiacritic = ptr->diacritic[j]; + attrs[j].fZeroWidth = ptr->zerowidth[j]; + } + + hr = ScriptGetLogicalWidths(&sa, ptr->char_count, ptr->glyph_count, ptr->advances, ptr->map, attrs, widths); + ok(hr == S_OK, "got 0x%08x\n", hr); + + todo_wine_if(ptr->todo) + ok(!memcmp(ptr->widths, widths, sizeof(widths)), "test %u: got wrong widths\n", i); + } +} + START_TEST(usp10) { HWND hwnd; @@ -3666,6 +3718,7 @@ test_newlines(); test_ScriptGetFontFunctions(hdc); + test_ScriptGetLogicalWidths(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

[akhaldi] 73296: [USP10] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:13:09 2016 New Revision: 73296 URL: http://svn.reactos.org/svn/reactos?rev=73296&view=rev Log: [USP10] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu Nov 17 23:13:09 2016 @@ -1008,7 +1008,7 @@ { heap_free(((ScriptCache *)*psc)->widths[i]); } - for (i = 0; i < 0x10; i++) + for (i = 0; i < NUM_PAGES; i++) { unsigned int j; if (((ScriptCache *)*psc)->page[i]) @@ -3879,16 +3879,33 @@ * Failure: a non-zero HRESULT. */ HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs, - const int *glyph_width, const WORD *log_clust, + const int *advances, const WORD *log_clust, const SCRIPT_VISATTR *sva, int *widths) { - int i; + int i, next = 0, direction; TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", - sa, nbchars, nbglyphs, glyph_width, log_clust, sva, widths); - - /* FIXME */ - for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; + sa, nbchars, nbglyphs, advances, log_clust, sva, widths); + + if (sa->fRTL && !sa->fLogicalOrder) + direction = -1; + else + direction = 1; + + for (i = 0; i < nbchars; i++) + { + int clust_size = get_cluster_size(log_clust, nbchars, i, direction, NULL, NULL); + int advance = get_glyph_cluster_advance(advances, sva, log_clust, nbglyphs, nbchars, log_clust[i], direction); + int j; + + for (j = 0; j < clust_size; j++) + { + widths[next] = advance / clust_size; + next++; + if (j) i++; + } + } + return S_OK; } Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Thu Nov 17 23:13:09 2016 @@ -145,6 +145,8 @@ #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) #define GLYPH_MAX 65536 +#define NUM_PAGES 17 + #define GSUB_E_NOFEATURE -2 #define GSUB_E_NOGLYPH -1 @@ -189,7 +191,7 @@ OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x11]; + CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table; 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] Thu Nov 17 23:13:09 2016 @@ -189,7 +189,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 -reactos/dll/win32/usp10 # Synced to WineStaging-1.9.16 +reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-1.9.11

1 0

[akhaldi] 73295: [URLMON_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:11:50 2016 New Revision: 73295 URL: http://svn.reactos.org/svn/reactos?rev=73295&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… ============================================================================== --- trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] Thu Nov 17 23:11:50 2016 @@ -647,7 +647,7 @@ {data50, sizeof(data50), "video/mpeg"}, {data51, sizeof(data51), "video/mpeg"}, {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"}, - {data53, sizeof(data53), "application/octet-stream", "image/pjpeg"}, + {data53, sizeof(data53), "application/octet-stream", "image/pjpeg", "image/x-icon"}, {data54, sizeof(data54), "text/html", "video/mpeg"}, {data55, sizeof(data55), "application/x-gzip-compressed"}, {data56, sizeof(data56), "text/plain"}, Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Thu Nov 17 23:11:50 2016 @@ -3418,10 +3418,7 @@ } ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); - if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) - ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - else - IBindCtx_Release(bctx); + IBindCtx_Release(bctx); if(emulate_protocol) CoRevokeClassObject(regid);

1 0

[akhaldi] 73294: [URLMON] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 23:10:44 2016 New Revision: 73294 URL: http://svn.reactos.org/svn/reactos?rev=73294&view=rev Log: [URLMON] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c trunk/reactos/dll/win32/urlmon/usrmarshal.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/sec_mgr.c [iso-8859-1] Thu Nov 17 23:10:44 2016 @@ -1820,7 +1820,7 @@ TRACE("(%p %p)\n", pUnkOuter, ppobj); ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->ref = 1; - *ppobj = (IInternetZoneManagerEx*)ret; + *ppobj = &ret->IInternetZoneManagerEx2_iface; URLMON_LockModule(); Modified: trunk/reactos/dll/win32/urlmon/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/usrmarsha… ============================================================================== --- trunk/reactos/dll/win32/urlmon/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/usrmarshal.c [iso-8859-1] Thu Nov 17 23:10:44 2016 @@ -49,35 +49,35 @@ } HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, void **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, void **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_RemoteMonikerBindToStorage_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj); } HRESULT __RPC_STUB IBindHost_MonikerBindToStorage_Stub(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, IUnknown **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, IUnknown **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_MonikerBindToStorage(This, moniker, bc, bsc, riid, (void**)obj); } HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, void **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, void **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_RemoteMonikerBindToObject_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj); } HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, IUnknown **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, IUnknown **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj); } HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( 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] Thu Nov 17 23:10:44 2016 @@ -188,7 +188,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 -reactos/dll/win32/urlmon # Synced to WineStaging-1.9.16 +reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.16 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11

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