February 2020 - Wine-Commits

Jacek Caban : include: Make time.h compatible with ucrt.
by Alexandre Julliard Feb. 26, 2020

Feb. 26, 2020

Module: wine Branch: master Commit: 61526f8050c406f05d0a6372bdc58ea60447b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=61526f8050c406f05d0a6372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:22 2020 +0100 include: Make time.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/time.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 61df364d21..058dd67014 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -54,7 +54,7 @@ extern __msvcrt_long _timezone; extern char *_tzname; #endif -#ifdef _USE_32BIT_TIME_T +#if !defined(_UCRT) && defined(_USE_32BIT_TIME_T) #define _ctime32 ctime #define _difftime32 difftime #define _gmtime32 gmtime @@ -96,6 +96,13 @@ static inline struct tm* gmtime(const time_t *t) { return _gmtime64(t); } static inline struct tm* localtime(const time_t *t) { return _localtime64(t); } static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } +#elif defined(_UCRT) +static inline char* ctime(const time_t *t) { return _ctime32(t); } +static inline double difftime(time_t t1, time_t t2) { return _difftime32(t1, t2); } +static inline struct tm* gmtime(const time_t *t) { return _gmtime32(t); } +static inline struct tm* localtime(const time_t *t) { return _localtime32(t); } +static inline time_t mktime(struct tm *tm) { return _mktime32(tm); } +static inline time_t time(time_t *t) { return _time32(t); } #endif #ifdef __cplusplus

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetMaterial().
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 6c0c191a312184fd3ce2b20579db9ceed3063f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0c191a312184fd3ce2b205… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:40 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8fe43c0cca..e7c79d54a0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1727,8 +1727,6 @@ static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3D /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Hans Leidekker : wbemprox: Implement Win32_PhysicalMemory.FormFactor.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: b1c748c85205970b97cd31b4347a751c58b2d72e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c748c85205970b97cd31b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 25 11:39:51 2020 +0100 wbemprox: Implement Win32_PhysicalMemory.FormFactor. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++++ dlls/wbemprox/tests/query.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bfe913a32a..f422e9c61d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -264,6 +264,8 @@ static const WCHAR prop_filesystemW[] = {'F','i','l','e','S','y','s','t','e','m',0}; static const WCHAR prop_flavorW[] = {'F','l','a','v','o','r',0}; +static const WCHAR prop_formfactorW[] = + {'F','o','r','m','F','a','c','t','o','r',0}; static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; static const WCHAR prop_freephysicalmemoryW[] = @@ -703,6 +705,7 @@ static const struct column col_physicalmemory[] = { prop_capacityW, CIM_UINT64 }, { prop_configuredclockspeedW, CIM_UINT32 }, { prop_devicelocatorW, CIM_STRING }, + { prop_formfactorW, CIM_UINT16 }, { prop_memorytypeW, CIM_UINT16 }, { prop_partnumberW, CIM_STRING } }; @@ -1186,6 +1189,7 @@ struct record_physicalmemory UINT64 capacity; UINT32 configuredclockspeed; const WCHAR *devicelocator; + UINT16 formfactor; UINT16 memorytype; const WCHAR *partnumber; }; @@ -3438,6 +3442,7 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec->capacity = get_total_physical_memory(); rec->configuredclockspeed = 0; rec->devicelocator = dimm0W; + rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ rec->partnumber = NULL; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 40eaefee4c..97f8dca561 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1338,6 +1338,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR formfactorW[] = {'F','o','r','m','F','a','c','t','o','r',0}; static const WCHAR devicelocatorW[] = {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', @@ -1362,6 +1363,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { check_property( obj, capacityW, VT_BSTR, CIM_UINT64 ); check_property( obj, devicelocatorW, VT_BSTR, CIM_STRING ); + check_property( obj, formfactorW, VT_I4, CIM_UINT16 ); check_property( obj, memorytypeW, VT_I4, CIM_UINT16 ); IWbemClassObject_Release( obj ); }

1 0

Hans Leidekker : wbemprox: Implement Win32_DesktopMonitor.Name.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 9631a526cfae1bd24d0bc855a5f94e6d80d161af URL: https://source.winehq.org/git/wine.git/?a=commit;h=9631a526cfae1bd24d0bc855… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 25 11:39:52 2020 +0100 wbemprox: Implement Win32_DesktopMonitor.Name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48646 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f422e9c61d..06c9d722aa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -557,6 +557,7 @@ static const struct column col_datafile[] = }; static const struct column col_desktopmonitor[] = { + { prop_nameW, CIM_STRING }, { prop_pixelsperxlogicalinchW, CIM_UINT32 } }; static const struct column col_directory[] = @@ -1041,6 +1042,7 @@ struct record_datafile }; struct record_desktopmonitor { + const WCHAR *name; UINT32 pixelsperxlogicalinch; }; struct record_directory @@ -2490,6 +2492,7 @@ static enum fill_status fill_desktopmonitor( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_desktopmonitor *)table->data; + rec->name = L"Generic Non-PnP Monitor"; rec->pixelsperxlogicalinch = get_pixelsperxlogicalinch(); if (match_row( table, row, cond, &status )) row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 97f8dca561..02e4f564e7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1712,6 +1712,32 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DesktopMonitor( IWbemServices *services ) +{ + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PixelsPerXlogicalInch", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { static const WCHAR bitsperpixelW[] = @@ -1837,6 +1863,7 @@ START_TEST(query) test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); + test_Win32_DesktopMonitor( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services );

1 0

Zebediah Figura : d3d8: Retrieve the material from the primary stateblock.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: b0b8fb9949205055ab7c91c2249b7c6bf33e6ff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b8fb9949205055ab7c91c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:39 2020 -0600 d3d8: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aaf5b62e86..8fe43c0cca 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1742,7 +1742,7 @@ static HRESULT WINAPI d3d8_device_GetMaterial(IDirect3DDevice8 *iface, D3DMATERI /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Sven Baars : d3dx9/tests: Add more ID3DXFont_DrawTextW tests.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: e0ce80561bf046c9dc7837e1c7f3c999f18b0361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ce80561bf046c9dc7837e1… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 25 18:20:46 2020 +0100 d3dx9/tests: Add more ID3DXFont_DrawTextW tests. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index f5c539ca85..c44473396b 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -770,6 +770,84 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, long_textW, -1, &rect, DT_WORDBREAK | DT_NOCLIP, 0xff00ff); ok(height == 96, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\r\na", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ra", -1, &rect, 0, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); + ok(height == 48, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, DT_NOCLIP, 0xff00ff); + ok(height == 72, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\t", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\ta", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaaaaaaaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaaaaaaaaa", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaa\taaa\taaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaa\taaa\taaa", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 48, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\t", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 60, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ta", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ta\ta", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaaaaaaaaaaaaaaaaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a a", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK | DT_RIGHT, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK | DT_RIGHT, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_BOTTOM, 0xff00ff); + ok(height == 40, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_VCENTER, 0xff00ff); + ok(height == 32, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_RIGHT, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CENTER, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); } ID3DXFont_Release(font);

1 0

Brendan Shanks : wbemprox: Add embedded controller and system BIOS release numbers to Win32_BIOS.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 4e886e8ca035955cd3a174dcb05b12fde9b7807d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e886e8ca035955cd3a174dc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 24 15:42:51 2020 -0800 wbemprox: Add embedded controller and system BIOS release numbers to Win32_BIOS. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c680ae23c3..bfe913a32a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -254,6 +254,10 @@ static const WCHAR prop_driverversionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; +static const WCHAR prop_embeddedcontrollermajorversionW[] = + {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_embeddedcontrollerminorversionW[] = + {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_familyW[] = {'F','a','m','i','l','y',0}; static const WCHAR prop_filesystemW[] = @@ -424,6 +428,10 @@ static const WCHAR prop_strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; +static const WCHAR prop_systembiosmajorversionW[] = + {'S','y','s','t','e','m','B','i','o','s','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_systembiosminorversionW[] = + {'S','y','s','t','e','m','B','i','o','s','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_systemdriveW[] = @@ -496,6 +504,8 @@ static const struct column col_bios[] = { { prop_currentlanguageW, CIM_STRING }, { prop_descriptionW, CIM_STRING }, + { prop_embeddedcontrollermajorversionW, CIM_UINT8 }, + { prop_embeddedcontrollerminorversionW, CIM_UINT8 }, { prop_identificationcodeW, CIM_STRING }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING }, @@ -504,6 +514,8 @@ static const struct column col_bios[] = { prop_smbiosbiosversionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_smbiosmajorversionW, CIM_UINT16 }, { prop_smbiosminorversionW, CIM_UINT16 }, + { prop_systembiosmajorversionW, CIM_UINT8 }, + { prop_systembiosminorversionW, CIM_UINT8 }, { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = @@ -975,6 +987,8 @@ struct record_bios { const WCHAR *currentlanguage; const WCHAR *description; + UINT8 ecmajorversion; + UINT8 ecminorversion; const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *name; @@ -983,6 +997,8 @@ struct record_bios const WCHAR *smbiosbiosversion; UINT16 smbiosmajorversion; UINT16 smbiosminorversion; + UINT8 systembiosmajorversion; + UINT8 systembiosminorversion; const WCHAR *version; }; struct record_cdromdrive @@ -1495,6 +1511,11 @@ struct smbios_bios BYTE date; BYTE size; UINT64 characteristics; + BYTE characteristics_ext[2]; + BYTE system_bios_major_release; + BYTE system_bios_minor_release; + BYTE ec_firmware_major_release; + BYTE ec_firmware_minor_release; }; struct smbios_chassis @@ -1729,6 +1750,54 @@ static WCHAR *get_bios_smbiosbiosversion( const char *buf, UINT len ) return ret; } +static BYTE get_bios_ec_firmware_major_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->ec_firmware_major_release; + else return 0xFF; +} + +static BYTE get_bios_ec_firmware_minor_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->ec_firmware_minor_release; + else return 0xFF; +} + +static BYTE get_bios_system_bios_major_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->system_bios_major_release; + else return 0xFF; +} + +static BYTE get_bios_system_bios_minor_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->system_bios_minor_release; + else return 0xFF; +} + static enum fill_status fill_bios( struct table *table, const struct expr *cond ) { struct record_bios *rec; @@ -1745,6 +1814,8 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec = (struct record_bios *)table->data; rec->currentlanguage = NULL; rec->description = bios_descriptionW; + rec->ecmajorversion = get_bios_ec_firmware_major_release( buf, len ); + rec->ecminorversion = get_bios_ec_firmware_minor_release( buf, len ); rec->identificationcode = NULL; rec->manufacturer = get_bios_manufacturer( buf, len ); rec->name = bios_descriptionW; @@ -1753,6 +1824,8 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); + rec->systembiosmajorversion = get_bios_system_bios_major_release( buf, len ); + rec->systembiosminorversion = get_bios_system_bios_minor_release( buf, len ); rec->version = bios_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Hans Leidekker : wbemprox/tests: Use wide character string literals.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 742875b6e58d074434ee47bca036d55785549fa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=742875b6e58d074434ee47bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 25 11:39:53 2020 +0100 wbemprox/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 746 ++++++++++++----------------------------- dlls/wbemprox/tests/services.c | 84 ++--- 2 files changed, 249 insertions(+), 581 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=742875b6e58d074434ee…

1 0

Hans Leidekker : crypt32/tests: Update *.winehq.org certificate.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 583ca55613ae156ee1214b43da34a8cac16589fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=583ca55613ae156ee1214b43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 25 11:53:13 2020 +0100 crypt32/tests: Update *.winehq.org certificate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 252 +++++++++++++++++++++++++++------------------ 1 file changed, 150 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=583ca55613ae156ee121…

1 0

Connor McAdams : d3d10: Introduce an effect buffer variable structure.
by Alexandre Julliard Feb. 25, 2020

Feb. 25, 2020

Module: wine Branch: master Commit: 490bc0f19be0eaeb2e7f2fe7f777c491f7de5ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=490bc0f19be0eaeb2e7f2fe7… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Feb 25 18:40:36 2020 +0100 d3d10: Introduce an effect buffer variable structure. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 10 ++++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..f83ff0d4c9 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + BOOL changed; + BYTE *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..3ee9bf7a35 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,55 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBUFFER_TYPE type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = v->effect->device; + HRESULT hr; + + if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->type->size_unpacked))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = v->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = v->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &v->u.buffer.buffer))) + return hr; + + if (type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = v->type->size_unpacked / 16; + if (v->type->size_unpacked % 16) + WARN("Unexpected texture buffer size not a multiple of 16.\n"); + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)v->u.buffer.buffer, + &srv_desc, &v->u.buffer.resource_view))) + return hr; + } + else + v->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2331,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2815,13 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */

1 0