February 2020 - Wine-Commits

Nikolay Sivov : oleaut32/tests: Link to activation context API directly.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: bf39f2bf0f3ae498c2b1d32728d1440cfaab80eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf39f2bf0f3ae498c2b1d327… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 21 13:24:14 2020 +0300 oleaut32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e8956fb3b1..75f8d78f07 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -89,10 +89,6 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY,LPCWSTR,REGSAM,DWORD); @@ -296,10 +292,6 @@ static void init_function_pointers(void) pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); - pActivateActCtx = (void *)GetProcAddress(hk32, "ActivateActCtx"); - pCreateActCtxW = (void *)GetProcAddress(hk32, "CreateActCtxW"); - pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); - pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); pRegDeleteKeyExW = (void*)GetProcAddress(hadv, "RegDeleteKeyExW"); } @@ -5744,7 +5736,7 @@ static HANDLE create_actctx(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "actctx.cbSize=%d\n", actctx.cbSize); @@ -5798,12 +5790,6 @@ static void test_LoadRegTypeLib(void) BSTR path; BOOL ret; - if (!pActivateActCtx) - { - win_skip("Activation contexts not supported, skipping LoadRegTypeLib tests\n"); - return; - } - create_manifest_file("testdep.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -5824,7 +5810,7 @@ static void test_LoadRegTypeLib(void) hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); path = NULL; @@ -5926,10 +5912,10 @@ static void test_LoadRegTypeLib(void) DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb"); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } #define AUX_HREF 1

1 0

Alexandre Julliard : ntdll: Implement RtlIsNormalizedString().
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 3e6b15c7b5234002b0af2720df58cdf084cba40c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b15c7b5234002b0af2720… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 13:05:55 2020 +0100 ntdll: Implement RtlIsNormalizedString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 7 +++-- dlls/ntdll/locale.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7684002992..4d16600251 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6105,16 +6105,15 @@ static void test_NormalizeString(void) wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], ptest->str, -1, &ret ); - todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); if (!wcscmp( ptest->str, dst )) - todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); else ok( !ret, "%s:%d: normalized (dst %s)\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst) ); ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); - todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); - todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); + ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); } } ptest++; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 5d53d91ddd..7ec8a16074 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1896,8 +1896,68 @@ NTSTATUS WINAPI RtlUnicodeToUTF8N( char *dst, DWORD dstlen, DWORD *reslen, const */ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BOOLEAN *res ) { - FIXME( "%x %p %d\n", form, str, len ); - return STATUS_NOT_IMPLEMENTED; + const struct norm_table *info; + NTSTATUS status; + BYTE props, class, last_class = 0; + unsigned int ch; + int i, r, result = 1; + + if ((status = load_norm_table( form, &info ))) return status; + + if (len == -1) len = strlenW( str ); + + for (i = 0; i < len && result; i += r) + { + if (!(r = get_utf16( str + i, len - i, &ch ))) return STATUS_NO_UNICODE_TRANSLATION; + if (info->comp_size) + { + if ((ch >= HANGUL_VBASE && ch < HANGUL_VBASE + HANGUL_VCOUNT) || + (ch >= HANGUL_TBASE && ch < HANGUL_TBASE + HANGUL_TCOUNT)) + { + result = -1; /* QC=Maybe */ + continue; + } + } + else if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + HANGUL_SCOUNT) + { + result = 0; /* QC=No */ + break; + } + props = get_char_props( info, ch ); + class = props & 0x3f; + if (class == 0x3f) + { + last_class = 0; + if (props == 0xbf) result = 0; /* QC=No */ + else if (props == 0xff) + { + /* ignore other chars in Hangul range */ + if (ch >= HANGUL_LBASE && ch < HANGUL_LBASE + 0x100) continue; + if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + 0x2c00) continue; + return STATUS_NO_UNICODE_TRANSLATION; + } + } + else if (props & 0x80) + { + if ((props & 0xc0) == 0xc0) result = -1; /* QC=Maybe */ + if (class && class < last_class) result = 0; /* QC=No */ + last_class = class; + } + else last_class = 0; + } + + if (result == -1) + { + int dstlen = len * 4; + NTSTATUS status; + WCHAR *buffer = RtlAllocateHeap( GetProcessHeap(), 0, dstlen * sizeof(WCHAR) ); + if (!buffer) return STATUS_NO_MEMORY; + status = RtlNormalizeString( form, str, len, buffer, &dstlen ); + result = !status && (dstlen == len) && !strncmpW( buffer, str, len ); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } + *res = result; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : unicode: Remove no longer used normalization tables.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: e7eaa1a857ac89a759ebb998691dca0e8983bd09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7eaa1a857ac89a759ebb998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 09:57:19 2020 +0100 unicode: Remove no longer used normalization tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 - dlls/kernelbase/compose.c | 373 ---- dlls/kernelbase/decompose.c | 1727 --------------- dlls/ntdll/Makefile.in | 3 - dlls/ntdll/combclass.c | 344 --- dlls/ntdll/compose.c | 373 ---- dlls/ntdll/decompose.c | 5037 ------------------------------------------- tools/make_unicode | 219 -- 8 files changed, 8078 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7eaa1a857ac89a759eb…

1 0

Zebediah Figura : d3d8: Retrieve the pixel shader from the primary stateblock.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 7cffddc9934fe361781f084aae364bf12f5acabe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cffddc9934fe361781f084a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:32 2020 -0600 d3d8: Retrieve the pixel shader 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c2112445d8..cf44fa2baa 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3240,7 +3240,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((object = wined3d_device_get_pixel_shader(device->wined3d_device))) + if ((object = wined3d_stateblock_get_state(device->state)->ps)) { struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); @@ -3273,7 +3273,7 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO return D3DERR_INVALIDCALL; } - if (wined3d_device_get_pixel_shader(device->wined3d_device) == shader_impl->wined3d_shader) + if (wined3d_stateblock_get_state(device->state)->ps == shader_impl->wined3d_shader) IDirect3DDevice8_SetPixelShader(iface, 0); wined3d_mutex_unlock();

1 0

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

Feb. 21, 2020

Module: wine Branch: master Commit: b58a5a55ba2e901e3b06d2ba37b6b50e6895e42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58a5a55ba2e901e3b06d2ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:31 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetVertexShaderConstant(). 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 90dec4aaa7..c2112445d8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2983,8 +2983,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_f(device->update_state, start_register, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

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

Feb. 21, 2020

Module: wine Branch: master Commit: 2f25af095d9e68ad736ee4875ff7f2abfdeaaedc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f25af095d9e68ad736ee487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:33 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetPixelShader(). 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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cf44fa2baa..957f663174 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3207,8 +3207,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { wined3d_stateblock_set_pixel_shader(device->update_state, NULL); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); return D3D_OK; } @@ -3222,8 +3220,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD TRACE("Setting shader %p.\n", shader_impl); wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); return D3D_OK;

1 0

Nikolay Sivov : mf: Request another sample from sample grabber in clock-ignoring mode.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: a6d048f633e12b1d69d0345e87383236ec2695d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d048f633e12b1d69d0345e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 21 13:16:52 2020 +0300 mf: Request another sample from sample grabber in clock-ignoring mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 205bc70b1b..f44df9f32b 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -315,7 +315,7 @@ static HRESULT WINAPI sample_grabber_stream_GetMediaTypeHandler(IMFStreamSink *i return S_OK; } -static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFSample *sample) +static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFSample *sample, BOOL *sample_delivered) { LONGLONG sample_time, sample_duration = 0; IMFMediaBuffer *buffer; @@ -324,6 +324,8 @@ static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFS BYTE *data; HRESULT hr; + *sample_delivered = FALSE; + hr = IMFMediaType_GetMajorType(grabber->media_type, &major_type); if (SUCCEEDED(hr)) @@ -342,6 +344,8 @@ static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFS if (SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &size))) { + *sample_delivered = TRUE; + if (grabber->callback2) { hr = IMFSample_CopyAllItems(sample, grabber->stream->sample_attributes); @@ -414,9 +418,15 @@ static HRESULT stream_queue_sample(struct sample_grabber_stream *stream, IMFSamp return hr; } +static void sample_grabber_stream_request_sample(struct sample_grabber_stream *stream) +{ + IMFStreamSink_QueueEvent(&stream->IMFStreamSink_iface, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); +} + static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); + BOOL sample_delivered; LONGLONG sampletime; HRESULT hr = S_OK; @@ -437,7 +447,13 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (SUCCEEDED(hr)) { if (stream->sink->ignore_clock) - hr = sample_grabber_report_sample(stream->sink, sample); + { + /* OnProcessSample() could return error code, which has to be propagated but isn't a blocker. + Use additional flag indicating that user callback was called at all. */ + hr = sample_grabber_report_sample(stream->sink, sample, &sample_delivered); + if (sample_delivered) + sample_grabber_stream_request_sample(stream); + } else hr = stream_queue_sample(stream, sample); } @@ -725,15 +741,11 @@ static struct scheduled_item *stream_get_next_item(struct sample_grabber_stream return item; } -static void sample_grabber_stream_request_sample(struct sample_grabber_stream *stream) -{ - IMFStreamSink_QueueEvent(&stream->IMFStreamSink_iface, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); -} - static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); struct scheduled_item *item; + BOOL sample_delivered; HRESULT hr; EnterCriticalSection(&stream->cs); @@ -746,7 +758,7 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba switch (item->type) { case ITEM_TYPE_SAMPLE: - if (FAILED(hr = sample_grabber_report_sample(stream->sink, item->u.sample))) + if (FAILED(hr = sample_grabber_report_sample(stream->sink, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); item = stream_get_next_item(stream);

1 0

Brendan Shanks : ntdll: Add system family and SKU to generated SMBIOS tables.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 360b7ec299e3907a40c7cac9f3dab1d7e77dac09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360b7ec299e3907a40c7cac9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 20 14:37:28 2020 -0800 ntdll: Add system family and SKU to generated SMBIOS tables. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b89602cee8..f88ded34c1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -111,6 +111,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_system { @@ -120,6 +125,9 @@ struct smbios_system { BYTE version; BYTE serial; BYTE uuid[16]; + BYTE wake_up_type; + BYTE sku_number; + BYTE family; }; struct smbios_board { @@ -137,6 +145,10 @@ struct smbios_chassis { BYTE version; BYTE serial; BYTE asset_tag; + BYTE boot_state; + BYTE power_supply_state; + BYTE thermal_state; + BYTE security_status; }; #include "poppack.h" @@ -2142,6 +2154,8 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG size_t bios_vendor_len, bios_version_len, bios_date_len; char system_vendor[128], system_product[128], system_version[128], system_serial[128]; size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; + char system_sku[128], system_family[128]; + size_t system_sku_len, system_family_len; char board_vendor[128], board_product[128], board_version[128], board_serial[128]; size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; @@ -2163,6 +2177,8 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); + system_sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); + system_family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); @@ -2181,7 +2197,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len += sizeof(struct smbios_system); *required_len += max(system_vendor_len + system_product_len + system_version_len + - system_serial_len + 5, 2); + system_serial_len + system_sku_len + system_family_len + 7, 2); *required_len += sizeof(struct smbios_board); *required_len += max(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); @@ -2200,7 +2216,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG prologue = (struct smbios_prologue*)buffer; prologue->calling_method = 0; prologue->major_version = 2; - prologue->minor_version = 0; + prologue->minor_version = 4; prologue->revision = 0; prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); buffer += sizeof(struct smbios_prologue); @@ -2216,6 +2232,12 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios->date = bios_date_len ? ++string_count : 0; bios->size = 0; bios->characteristics = 0x4; /* not supported */ + bios->characteristics_ext[0] = 0; + bios->characteristics_ext[1] = 0; + bios->system_bios_major_release = 0xFF; /* not supported */ + bios->system_bios_minor_release = 0xFF; /* not supported */ + bios->ec_firmware_major_release = 0xFF; /* not supported */ + bios->ec_firmware_minor_release = 0xFF; /* not supported */ buffer += sizeof(struct smbios_bios); copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); @@ -2234,12 +2256,17 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; get_system_uuid( (GUID *)system->uuid ); + system->wake_up_type = 0x02; /* unknown */ + system->sku_number = system_sku_len ? ++string_count : 0; + system->family = system_family_len ? ++string_count : 0; buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len); copy_smbios_string(&buffer, system_product, system_product_len); copy_smbios_string(&buffer, system_version, system_version_len); copy_smbios_string(&buffer, system_serial, system_serial_len); + copy_smbios_string(&buffer, system_sku, system_sku_len); + copy_smbios_string(&buffer, system_family, system_family_len); if (!string_count) *buffer++ = 0; *buffer++ = 0; @@ -2271,6 +2298,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis->version = chassis_version_len ? ++string_count : 0; chassis->serial = chassis_serial_len ? ++string_count : 0; chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; + chassis->boot_state = 0x02; /* unknown */ + chassis->power_supply_state = 0x02; /* unknown */ + chassis->thermal_state = 0x02; /* unknown */ + chassis->security_status = 0x02; /* unknown */ buffer += sizeof(struct smbios_chassis); copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len);

1 0

Brendan Shanks : wineboot: Populate BIOS registry keys.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 68a01c8c6fcf2e0c493e28cd27f30fcf5f307ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a01c8c6fcf2e0c493e28cd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 20 12:50:44 2020 -0800 wineboot: Populate BIOS registry keys. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 241 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 8e3e234397..e1dbe66302 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -188,6 +188,11 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (lstrlenW(value) + 1) * sizeof(WCHAR) ); } +static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) +{ + return RegSetValueExW( hkey, name, 0, REG_DWORD, (const BYTE *)&value, sizeof(value) ); +} + #if defined(__i386__) || defined(__x86_64__) #if defined(_MSC_VER) @@ -299,6 +304,239 @@ static void get_namestring( WCHAR *buf ) { } #endif /* __i386__ || __x86_64__ */ +#include "pshpack1.h" +struct smbios_prologue +{ + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +enum smbios_type +{ + SMBIOS_TYPE_BIOS, + SMBIOS_TYPE_SYSTEM, + SMBIOS_TYPE_BASEBOARD, +}; + +struct smbios_header +{ + BYTE type; + BYTE length; + WORD handle; +}; + +struct smbios_baseboard +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; +}; + +struct smbios_bios +{ + struct smbios_header hdr; + BYTE vendor; + BYTE version; + WORD start; + 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_system +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; + BYTE uuid[16]; + BYTE wake_up_type; + BYTE sku; + BYTE family; +}; +#include "poppack.h" + +#define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') + +static const struct smbios_header *find_smbios_entry( enum smbios_type type, const char *buf, UINT len ) +{ + const char *ptr, *start; + const struct smbios_prologue *prologue; + const struct smbios_header *hdr; + + if (len < sizeof(struct smbios_prologue)) return NULL; + prologue = (const struct smbios_prologue *)buf; + if (prologue->length > len - sizeof(*prologue) || prologue->length < sizeof(*hdr)) return NULL; + + start = (const char *)(prologue + 1); + hdr = (const struct smbios_header *)start; + + for (;;) + { + if ((const char *)hdr - start >= prologue->length - sizeof(*hdr)) return NULL; + + if (!hdr->length) + { + WARN( "invalid entry\n" ); + return NULL; + } + + if (hdr->type == type) + { + if ((const char *)hdr - start + hdr->length > prologue->length) return NULL; + break; + } + else /* skip other entries and their strings */ + { + for (ptr = (const char *)hdr + hdr->length; ptr - buf < len && *ptr; ptr++) + { + for (; ptr - buf < len; ptr++) if (!*ptr) break; + } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); + } + } + + return hdr; +} + +static inline WCHAR *heap_strdupAW( const char *src ) +{ + int len; + WCHAR *dst; + if (!src) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, len * sizeof(*dst) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + return dst; +} + +static WCHAR *get_smbios_string( BYTE id, const char *buf, UINT offset, UINT buflen ) +{ + const char *ptr = buf + offset; + UINT i = 0; + + if (!id || offset >= buflen) return NULL; + for (ptr = buf + offset; ptr - buf < buflen && *ptr; ptr++) + { + if (++i == id) return heap_strdupAW( ptr ); + for (; ptr - buf < buflen; ptr++) if (!*ptr) break; + } + return NULL; +} + +static void set_value_from_smbios_string( HKEY key, const WCHAR *value, BYTE id, const char *buf, UINT offset, UINT buflen ) +{ + WCHAR *str; + str = get_smbios_string( id, buf, offset, buflen ); + set_reg_value( key, value, str ? str : L"" ); + HeapFree( GetProcessHeap(), 0, str ); +} + +static void create_bios_baseboard_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_baseboard *baseboard; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BASEBOARD, buf, len ))) return; + baseboard = (const struct smbios_baseboard *)hdr; + offset = (const char *)baseboard - buf + baseboard->hdr.length; + + set_value_from_smbios_string( bios_key, L"BaseBoardManufacturer", baseboard->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BaseBoardProduct", baseboard->product, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BaseBoardVersion", baseboard->version, buf, offset, len ); +} + +static void create_bios_bios_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return; + bios = (const struct smbios_bios *)hdr; + offset = (const char *)bios - buf + bios->hdr.length; + + set_value_from_smbios_string( bios_key, L"BIOSVendor", bios->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BIOSVersion", bios->version, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BIOSReleaseDate", bios->date, buf, offset, len ); + + if (bios->hdr.length >= 0x18) + { + set_reg_value_dword( bios_key, L"BiosMajorRelease", bios->system_bios_major_release ); + set_reg_value_dword( bios_key, L"BiosMinorRelease", bios->system_bios_minor_release ); + set_reg_value_dword( bios_key, L"ECFirmwareMajorVersion", bios->ec_firmware_major_release ); + set_reg_value_dword( bios_key, L"ECFirmwareMinorVersion", bios->ec_firmware_minor_release ); + } + else + { + set_reg_value_dword( bios_key, L"BiosMajorRelease", 0xFF ); + set_reg_value_dword( bios_key, L"BiosMinorRelease", 0xFF ); + set_reg_value_dword( bios_key, L"ECFirmwareMajorVersion", 0xFF ); + set_reg_value_dword( bios_key, L"ECFirmwareMinorVersion", 0xFF ); + } +} + +static void create_bios_system_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_system *system; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return; + system = (const struct smbios_system *)hdr; + offset = (const char *)system - buf + system->hdr.length; + + set_value_from_smbios_string( bios_key, L"SystemManufacturer", system->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemProductName", system->product, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemVersion", system->version, buf, offset, len ); + + if (system->hdr.length >= 0x1B) + { + set_value_from_smbios_string( bios_key, L"SystemSKU", system->sku, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemFamily", system->family, buf, offset, len ); + } + else + { + set_value_from_smbios_string( bios_key, L"SystemSKU", 0, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemFamily", 0, buf, offset, len ); + } +} + +static void create_bios_key( HKEY system_key ) +{ + HKEY bios_key; + UINT len; + char *buf; + + if (RegCreateKeyExW( system_key, L"BIOS", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &bios_key, NULL )) + return; + + len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); + if (!(buf = HeapAlloc( GetProcessHeap(), 0, len ))) goto done; + len = GetSystemFirmwareTable( RSMB, 0, buf, len ); + + create_bios_baseboard_values( bios_key, buf, len ); + create_bios_bios_values( bios_key, buf, len ); + create_bios_system_values( bios_key, buf, len ); + +done: + HeapFree( GetProcessHeap(), 0, buf ); + RegCloseKey( bios_key ); +} + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) { @@ -409,6 +647,9 @@ static void create_hardware_registry_keys(void) RegCloseKey( hkey ); } } + + create_bios_key( system_key ); + RegCloseKey( fpu_key ); RegCloseKey( cpu_key ); RegCloseKey( system_key );

1 0

Matteo Bruni : wined3d: Get rid of the contained_*s_consts_* arrays.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 07a96c46e3c60a09bb646af81e408e1813470758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07a96c46e3c60a09bb646af8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 20 22:40:15 2020 +0100 wined3d: Get rid of the contained_*s_consts_* arrays. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 169 ++++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 12 --- 2 files changed, 66 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07a96c46e3c60a09bb64…

1 0