September 2021 - Wine-commits

Zebediah Figura : d3d9: Pass a valid map box to wined3d_resource_map().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b19cdef00e5d633e10c2357f8ec42808aee635d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19cdef00e5d633e10c2357f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 24 16:47:41 2021 -0500 d3d9: Pass a valid map box to wined3d_resource_map(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7af652e7d1a..07bdfa9320e 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -191,14 +191,14 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, @@ -527,14 +527,14 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box,

1 0

Zebediah Figura : d3d11/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2c1ce46be379ec107a5a0ddbc6193edbc44f8926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1ce46be379ec107a5a0ddb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 00:32:45 2021 -0500 d3d11/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ae3020e130d..0f8e59573ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33696,6 +33696,100 @@ static void test_constant_buffer_offset(void) release_test_context(&test_context); } +static void fill_dynamic_vb_quad(const D3D11_MAPPED_SUBRESOURCE *map_desc, unsigned int x, unsigned int y) +{ + struct vec3 *quad = (struct vec3 *)map_desc->pData + 4 * x; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].x = quad[1].x = -1.0f + 0.01f * x; + quad[2].x = quad[3].x = -1.0f + 0.01f * (x + 1); + + quad[0].y = quad[2].y = -1.0f + 0.01f * y; + quad[1].y = quad[3].y = -1.0f + 0.01f * (y + 1); +} + +/* Stress-test dynamic maps, to ensure that we are applying the correct + * synchronization guarantees. */ +static void test_dynamic_map_synchronization(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_BUFFER_DESC buffer_desc = {0}; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11CommandList *list; + ID3D11Device *device; + unsigned int x, y; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + immediate = test_context.immediate_context; + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); + ok(hr == S_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &red.x); + + for (y = 0; y < 200; ++y) + { + if (y % 2) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + draw_color_quad(&test_context, &green); + } + else + { + hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)test_context.vb, 0); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); + ok(hr == S_OK, "Failed to record command list, hr %#x.\n", hr); + ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); + ID3D11CommandList_Release(list); + draw_color_quad(&test_context, &green); + } + + for (x = 1; x < 200; ++x) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, x, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + ID3D11DeviceContext_Draw(immediate, 4, x * 4); + } + } + + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D11DeviceContext_Release(deferred); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -33870,6 +33964,7 @@ START_TEST(d3d11) queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); + queue_test(test_dynamic_map_synchronization); run_queued_tests(); }

1 0

Zebediah Figura : d3d10core/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2ece80c3008d396af747d4af0091d3e460f087eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ece80c3008d396af747d4af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 00:32:46 2021 -0500 d3d10core/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 58b5f90fadb..e2fb870279e 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19089,6 +19089,72 @@ static void test_texture_compressed_3d(void) release_test_context(&test_context); } +static void fill_dynamic_vb_quad(void *data, unsigned int x, unsigned int y) +{ + struct vec3 *quad = (struct vec3 *)data + 4 * x; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].x = quad[1].x = -1.0f + 0.01f * x; + quad[2].x = quad[3].x = -1.0f + 0.01f * (x + 1); + + quad[0].y = quad[2].y = -1.0f + 0.01f * y; + quad[1].y = quad[3].y = -1.0f + 0.01f * (y + 1); +} + +/* Stress-test dynamic maps, to ensure that we are applying the correct + * synchronization guarantees. */ +static void test_dynamic_map_synchronization(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_BUFFER_DESC buffer_desc = {0}; + ID3D10Device *device; + unsigned int x, y; + HRESULT hr; + void *data; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); + buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); + ok(hr == S_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + + for (y = 0; y < 200; ++y) + { + hr = ID3D10Buffer_Map(test_context.vb, D3D10_MAP_WRITE_DISCARD, 0, &data); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, 0, y); + + ID3D10Buffer_Unmap(test_context.vb); + draw_color_quad(&test_context, &green); + + for (x = 1; x < 200; ++x) + { + hr = ID3D10Buffer_Map(test_context.vb, D3D10_MAP_WRITE_NO_OVERWRITE, 0, &data); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, x, y); + + ID3D10Buffer_Unmap(test_context.vb); + ID3D10Device_Draw(device, 4, x * 4); + } + } + + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19215,6 +19281,7 @@ START_TEST(d3d10core) queue_test(test_dual_source_blend); queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); + queue_test(test_dynamic_map_synchronization); run_queued_tests();

1 0

Zebediah Figura : d3d9/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 13650f43c9d8887748dae079034ce13c366de2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13650f43c9d8887748dae079… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 00:32:47 2021 -0500 d3d9/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 40585d5257d..3820252fdef 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26912,6 +26912,113 @@ static void test_sample_mask(void) DestroyWindow(window); } +struct dynamic_vb_vertex +{ + struct vec3 position; + DWORD diffuse; +}; + +static void fill_dynamic_vb_quad(struct dynamic_vb_vertex *quad, unsigned int x, unsigned int y) +{ + unsigned int i; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].position.x = quad[1].position.x = -1.0f + 0.01f * x; + quad[2].position.x = quad[3].position.x = -1.0f + 0.01f * (x + 1); + + quad[0].position.y = quad[2].position.y = -1.0f + 0.01f * y; + quad[1].position.y = quad[3].position.y = -1.0f + 0.01f * (y + 1); + + for (i = 0; i < 4; ++i) + quad[i].diffuse = 0xff00ff00; +} + +static void test_dynamic_map_synchronization(void) +{ + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + unsigned int x, y; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + void *data; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, 0, y); + + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (x = 1; x < 200; ++x) + { + hr = IDirect3DVertexBuffer9_Lock(buffer, 4 * sizeof(struct dynamic_vb_vertex) * x, + 4 * sizeof(struct dynamic_vb_vertex), &data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, x, y); + + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x0000ff00); + IDirect3DSurface9_Release(rt); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -27060,4 +27167,5 @@ START_TEST(visual) test_sample_attached_rendertarget(); test_alpha_to_coverage(); test_sample_mask(); + test_dynamic_map_synchronization(); }

1 0

Alex Henrie : ws2_32: Remove outer preprocessor checks from control message functions.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 9561ba33cdf92f68394693db00e692d27d95cd4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9561ba33cdf92f68394693db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 27 08:40:22 2021 -0600 ws2_32: Remove outer preprocessor checks from control message functions. The checks were ugly and unnecessary. Furthermore, these functions are used for both IPv4 and IPv6 options, and it's conceivable that a system could be stripped down to only provide IPv6 support and not IPv4 support. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 75c54295c20..2be4f2b52a3 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -369,7 +369,6 @@ static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_socka } #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) static WSACMSGHDR *fill_control_message( int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len ) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -384,11 +383,9 @@ static WSACMSGHDR *fill_control_message( int level, int type, WSACMSGHDR *curren memcpy(ptr, data, len); return (WSACMSGHDR *)(ptr + WSA_CMSG_ALIGN(len)); } -#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) { -#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) WSACMSGHDR *cmsg_win = (WSACMSGHDR *)control->buf, *ptr; ULONG ctlsize = control->len; struct cmsghdr *cmsg_unix; @@ -490,10 +487,6 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) error: control->len = 0; return 0; -#else /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ - control->len = 0; - return 1; -#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ } #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 4a211f6418a42b2fcd0ff8c0413f3ac64d472c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a211f6418a42b2fcd0ff8c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 27 17:07:51 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 444 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 180 insertions(+), 264 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a211f6418a42b2fcd0f…

1 0

Alistair Leslie-Hughes : include: Add SPSTREAMFORMAT enum values.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: de7adacedbdd78fd1ed8ee0986a78670e11a60bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=de7adacedbdd78fd1ed8ee09… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 27 22:48:22 2021 +1000 include: Add SPSTREAMFORMAT enum values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index 59c2540ba21..d2c1aac8afc 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -351,6 +351,81 @@ typedef [hidden] enum SPVALUETYPE SPDF_ALL = 0x000000ff } SPVALUETYPE; +typedef [hidden] enum SPSTREAMFORMAT +{ + SPSF_Default = -1, + SPSF_NoAssignedFormat = 0, + SPSF_Text, + SPSF_NonStandardFormat, + SPSF_ExtendedAudioFormat, + SPSF_8kHz8BitMono, + SPSF_8kHz8BitStereo, + SPSF_8kHz16BitMono, + SPSF_8kHz16BitStereo, + SPSF_11kHz8BitMono, + SPSF_11kHz8BitStereo, + SPSF_11kHz16BitMono, + SPSF_11kHz16BitStereo, + SPSF_12kHz8BitMono, + SPSF_12kHz8BitStereo, + SPSF_12kHz16BitMono, + SPSF_12kHz16BitStereo, + SPSF_16kHz8BitMono, + SPSF_16kHz8BitStereo, + SPSF_16kHz16BitMono, + SPSF_16kHz16BitStereo, + SPSF_22kHz8BitMono, + SPSF_22kHz8BitStereo, + SPSF_22kHz16BitMono, + SPSF_22kHz16BitStereo, + SPSF_24kHz8BitMono, + SPSF_24kHz8BitStereo, + SPSF_24kHz16BitMono, + SPSF_24kHz16BitStereo, + SPSF_32kHz8BitMono, + SPSF_32kHz8BitStereo, + SPSF_32kHz16BitMono, + SPSF_32kHz16BitStereo, + SPSF_44kHz8BitMono, + SPSF_44kHz8BitStereo, + SPSF_44kHz16BitMono, + SPSF_44kHz16BitStereo, + SPSF_48kHz8BitMono, + SPSF_48kHz8BitStereo, + SPSF_48kHz16BitMono, + SPSF_48kHz16BitStereo, + SPSF_TrueSpeech_8kHz1BitMono, + SPSF_CCITT_ALaw_8kHzMono, + SPSF_CCITT_ALaw_8kHzStereo, + SPSF_CCITT_ALaw_11kHzMono, + SPSF_CCITT_ALaw_11kHzStereo, + SPSF_CCITT_ALaw_22kHzMono, + SPSF_CCITT_ALaw_22kHzStereo, + SPSF_CCITT_ALaw_44kHzMono, + SPSF_CCITT_ALaw_44kHzStereo, + SPSF_CCITT_uLaw_8kHzMono, + SPSF_CCITT_uLaw_8kHzStereo, + SPSF_CCITT_uLaw_11kHzMono, + SPSF_CCITT_uLaw_11kHzStereo, + SPSF_CCITT_uLaw_22kHzMono, + SPSF_CCITT_uLaw_22kHzStereo, + SPSF_CCITT_uLaw_44kHzMono, + SPSF_CCITT_uLaw_44kHzStereo, + SPSF_ADPCM_8kHzMono, + SPSF_ADPCM_8kHzStereo, + SPSF_ADPCM_11kHzMono, + SPSF_ADPCM_11kHzStereo, + SPSF_ADPCM_22kHzMono, + SPSF_ADPCM_22kHzStereo, + SPSF_ADPCM_44kHzMono, + SPSF_ADPCM_44kHzStereo, + SPSF_GSM610_8kHzMono, + SPSF_GSM610_11kHzMono, + SPSF_GSM610_22kHzMono, + SPSF_GSM610_44kHzMono, + SPSF_NUM_FORMATS +} SPSTREAMFORMAT; + typedef unsigned short SPPHONEID; typedef [restricted, hidden] struct SPPHRASEELEMENT

1 0

Jacek Caban : gdi32: Directly use ntdll in update_external_font_keys.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b544b748800e936e5dc008e3ef9203304b4b70e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b544b748800e936e5dc008e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:05:15 2021 +0200 gdi32: Directly use ntdll in update_external_font_keys. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 65 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9132c9b6849..9d2cd37e642 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,8 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR true_type_suffixW[] = {' ','(','T','r','u','e','T','y','p','e',')',0}; + static const WCHAR system_link_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -5984,40 +5986,45 @@ static void update_external_font_keys(void) struct gdi_font_family *family; struct external_key *key, *next; struct gdi_font_face *face; - DWORD len, i = 0, type, dlen, vlen; - WCHAR value[LF_FULLFACESIZE + 12], path[MAX_PATH + 4], *tmp; + DWORD len, i = 0; + WCHAR value[LF_FULLFACESIZE + 12], *tmp, *path; + char buffer[2048]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; WCHAR *file; HKEY hkey; - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL ); - RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL ); + static const WCHAR external_fontsW[] = {'E','x','t','e','r','n','a','l',' ','F','o','n','t','s'}; + + winnt_key = reg_create_key( NULL, fonts_winnt_config_keyW, sizeof(fonts_winnt_config_keyW), 0, NULL ); + win9x_key = reg_create_key( NULL, fonts_win9x_config_keyW, sizeof(fonts_win9x_config_keyW), 0, NULL ); /* enumerate the fonts and add external ones to the two keys */ - if (RegCreateKeyW( wine_fonts_key, L"External Fonts", &hkey )) return; + if (!(hkey = reg_create_key( wine_fonts_key, external_fontsW, sizeof(external_fontsW), 0, NULL ))) + return; - memcpy( path, nt_prefixW, sizeof(nt_prefixW) ); - vlen = ARRAY_SIZE(value); - dlen = sizeof(path) - sizeof(nt_prefixW); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)path + sizeof(nt_prefixW), &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer) - sizeof(nt_prefixW), + value, LF_FULLFACESIZE * sizeof(WCHAR) )) { - if (type != REG_SZ) goto next; - if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; - if ((face = find_face_from_full_name( value )) && - !wcsicmp( face->file, path[5] == ':' ? path : path + ARRAYSIZE(nt_prefixW) )) + if (info->Type != REG_SZ) continue; + + path = (WCHAR *)(buffer + info->DataOffset); + if (path[0] && path[1] == ':') + { + memmove( path, path + ARRAYSIZE(nt_prefixW), sizeof(nt_prefixW) ); + memcpy( path, nt_prefixW, sizeof(nt_prefixW) ); + } + + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, true_type_suffixW, -1 )) *tmp = 0; + if ((face = find_face_from_full_name( value )) && !wcsicmp( face->file, path )) { face->flags |= ADDFONT_EXTERNAL_FOUND; - goto next; + continue; } if (tmp && !*tmp) *tmp = ' '; if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) break; lstrcpyW( key->value, value ); list_add_tail( &external_keys, &key->entry ); - next: - vlen = ARRAY_SIZE(value); - dlen = sizeof(path) - sizeof(nt_prefixW); } WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) @@ -6028,7 +6035,7 @@ static void update_external_font_keys(void) if ((face->flags & ADDFONT_EXTERNAL_FOUND)) continue; lstrcpyW( value, face->full_name ); - if (face->scalable) lstrcatW( value, L" (TrueType)" ); + if (face->scalable) lstrcatW( value, true_type_suffixW ); if (face->file[0] == '\\') { @@ -6041,22 +6048,22 @@ static void update_external_font_keys(void) file = face->file; len = (lstrlenW(file) + 1) * sizeof(WCHAR); - RegSetValueExW( winnt_key, value, 0, REG_SZ, (BYTE *)file, len ); - RegSetValueExW( win9x_key, value, 0, REG_SZ, (BYTE *)file, len ); - RegSetValueExW( hkey, value, 0, REG_SZ, (BYTE *)file, len ); + set_reg_value( winnt_key, value, REG_SZ, file, len ); + set_reg_value( win9x_key, value, REG_SZ, file, len ); + set_reg_value( hkey, value, REG_SZ, file, len ); } } LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) { - RegDeleteValueW( win9x_key, key->value ); - RegDeleteValueW( winnt_key, key->value ); - RegDeleteValueW( hkey, key->value ); + reg_delete_value( win9x_key, key->value ); + reg_delete_value( winnt_key, key->value ); + reg_delete_value( hkey, key->value ); list_remove( &key->entry ); HeapFree( GetProcessHeap(), 0, key ); } - RegCloseKey( win9x_key ); - RegCloseKey( winnt_key ); - RegCloseKey( hkey ); + NtClose( win9x_key ); + NtClose( winnt_key ); + NtClose( hkey ); } static void load_registry_fonts(void)

1 0

Jacek Caban : gdi32: Directly use ntdll in load_registry_fonts.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b6e494f568667de7f60f60511b1fd70dddc09851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6e494f568667de7f60f6051… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:05:26 2021 +0200 gdi32: Directly use ntdll in load_registry_fonts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9d2cd37e642..b85f11b14a6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6068,53 +6068,54 @@ static void update_external_font_keys(void) static void load_registry_fonts(void) { - WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH + 4], *tmp, *path; - DWORD i = 0, type, dlen, vlen; + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_PATH * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; + KEY_VALUE_FULL_INFORMATION *enum_info = (KEY_VALUE_FULL_INFORMATION *)value_buffer; + WCHAR value[LF_FULLFACESIZE + 12], *tmp, *path; + DWORD i = 0, dlen; HKEY hkey; + static const WCHAR dot_fonW[] = {'.','f','o','n',0}; + /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their full path as the entry. Also look for any .fon fonts, since ReadFontDir will skip these. */ - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, - is_win9x() ? L"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts" : - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", &hkey )) - return; + if (is_win9x()) + hkey = reg_open_key( NULL, fonts_win9x_config_keyW, sizeof(fonts_win9x_config_keyW) ); + else + hkey = reg_open_key( NULL, fonts_winnt_config_keyW, sizeof(fonts_winnt_config_keyW) ); + if (!hkey) return; - memcpy( data, nt_prefixW, sizeof(nt_prefixW) ); - vlen = ARRAY_SIZE(value); - dlen = sizeof(data) - sizeof(nt_prefixW); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, NULL, NULL )) + while (reg_enum_value( hkey, i++, enum_info, sizeof(value_buffer), value, sizeof(value) )) { - if (type != REG_SZ) goto next; - dlen /= sizeof(WCHAR); - if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; - if (find_face_from_full_name( value )) goto next; + if (enum_info->Type != REG_SZ) continue; + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, true_type_suffixW, -1 )) *tmp = 0; + if (find_face_from_full_name( value )) continue; if (tmp && !*tmp) *tmp = ' '; - path = data + ARRAYSIZE(nt_prefixW); - if (RegQueryValueExW( hkey, value, NULL, NULL, (LPBYTE)data + sizeof(nt_prefixW), &dlen )) + if (!(dlen = query_reg_value( hkey, value, info, sizeof(value_buffer) - sizeof(nt_prefixW) )) || + info->Type != REG_SZ) { WARN( "Unable to get face path %s\n", debugstr_w(value) ); - goto next; + continue; } + path = (WCHAR *)info->Data; if (path[0] && path[1] == ':') { - path = data; + memmove( path + ARRAYSIZE(nt_prefixW), path, dlen ); + memcpy( path, nt_prefixW, sizeof(nt_prefixW) ); dlen += sizeof(nt_prefixW); } dlen /= sizeof(WCHAR); if (*path == '\\') add_font_resource( path, ADDFONT_ALLOW_BITMAP ); - else if (dlen >= 6 && !wcsicmp( path + dlen - 5, L".fon" )) + else if (dlen >= 6 && !wcsicmp( path + dlen - 5, dot_fonW )) add_system_font_resource( path, ADDFONT_ALLOW_BITMAP ); - next: - vlen = ARRAY_SIZE(value); - dlen = sizeof(data) - sizeof(nt_prefixW); } - RegCloseKey( hkey ); + NtClose( hkey ); } static const struct font_callback_funcs callback_funcs = { add_gdi_face }; @@ -6134,9 +6135,9 @@ void font_init(void) '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; static const WCHAR wine_fonts_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; + static const WCHAR cacheW[] = {'C','a','c','h','e'}; if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return; - wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); if (wine_fonts_key) init_font_options( hkcu ); NtClose( hkcu ); @@ -6157,8 +6158,8 @@ void font_init(void) if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return; NtWaitForSingleObject( mutex, FALSE, NULL ); - RegCreateKeyExW( wine_fonts_key, L"Cache", 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &wine_fonts_cache_key, &disposition ); + wine_fonts_cache_key = reg_create_key( wine_fonts_key, cacheW, sizeof(cacheW), + REG_OPTION_VOLATILE, &disposition ); if (disposition == REG_CREATED_NEW_KEY) {

1 0

Jacek Caban : gdi32: Read screen DPI config in init_font_options.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 8e40e56b79c39356a981bbc25100daa9635b29f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e40e56b79c39356a981bbc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:05:38 2021 +0200 gdi32: Read screen DPI config in init_font_options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 39 ++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 65 +++++++--------------------------------------- dlls/gdi32/ntgdi_private.h | 3 +-- 3 files changed, 36 insertions(+), 71 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b85f11b14a6..189405c2ba1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2682,7 +2682,7 @@ static void update_font_system_link_info(UINT current_ansi_codepage) } } -static void update_codepage(void) +static void update_codepage( UINT screen_dpi ) { char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[40 * sizeof(WCHAR)])]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; @@ -2691,14 +2691,11 @@ static void update_codepage(void) HKEY hkey; DWORD size; UINT i, ansi_cp, oem_cp; - DWORD screen_dpi, font_dpi = 0; + DWORD font_dpi = 0; BOOL done = FALSE, cp_match = FALSE; static const WCHAR log_pixelsW[] = {'L','o','g','P','i','x','e','l','s',0}; - screen_dpi = get_dpi(); - if (!screen_dpi) screen_dpi = 96; - size = query_reg_value( wine_fonts_key, log_pixelsW, info, sizeof(value_buffer) ); if (size == sizeof(DWORD) && info->Type == REG_DWORD) font_dpi = *(DWORD *)info->Data; @@ -4177,12 +4174,13 @@ static BOOL get_key_value( HKEY key, const char *name, DWORD *value ) return !!count; } -static void init_font_options( HKEY hkcu ) +static UINT init_font_options( HKEY hkcu ) { char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[20 * sizeof(WCHAR)])]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY key; DWORD i, val, gamma = 1400; + UINT dpi = 0; static const WCHAR desktop_keyW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p' }; @@ -4220,6 +4218,7 @@ static void init_font_options( HKEY hkcu ) { gamma = min( max( val, 1000 ), 2200 ); } + if (get_key_value( key, "LogPixels", &val )) dpi = val; NtClose( key ); } @@ -4235,8 +4234,17 @@ static void init_font_options( HKEY hkcu ) font_gamma_ramp.decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; } } + + if (!dpi && (key = reg_open_key( NULL, fonts_config_keyW, sizeof(fonts_config_keyW) ))) + { + if (get_key_value( key, "LogPixels", &val )) dpi = val; + NtClose( key ); + } + if (!dpi) dpi = 96; + font_gamma_ramp.gamma = gamma; - TRACE("gamma %d\n", font_gamma_ramp.gamma); + TRACE( "gamma %d screen dpi %u\n", font_gamma_ramp.gamma, dpi ); + return dpi; } @@ -6123,12 +6131,13 @@ static const struct font_callback_funcs callback_funcs = { add_gdi_face }; /*********************************************************************** * font_init */ -void font_init(void) +UINT font_init(void) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; HANDLE mutex, hkcu; DWORD disposition; + UINT dpi = 0; static WCHAR wine_font_mutexW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', @@ -6137,14 +6146,15 @@ void font_init(void) {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; - if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return; + if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return 0; wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); - if (wine_fonts_key) init_font_options( hkcu ); + if (wine_fonts_key) dpi = init_font_options( hkcu ); NtClose( hkcu ); - if (!wine_fonts_key) return; - update_codepage(); + if (!dpi) return 96; + update_codepage( dpi ); - if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; + if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) + return dpi; load_system_bitmap_fonts(); load_file_system_fonts(); @@ -6155,7 +6165,7 @@ void font_init(void) name.Buffer = wine_font_mutexW; name.Length = name.MaximumLength = sizeof(wine_font_mutexW); - if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return; + if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return dpi; NtWaitForSingleObject( mutex, FALSE, NULL ); wine_fonts_cache_key = reg_create_key( wine_fonts_key, cacheW, sizeof(cacheW), @@ -6181,6 +6191,7 @@ void font_init(void) load_system_links(); dump_gdi_font_list(); dump_gdi_font_subst(); + return dpi; } /*********************************************************************** diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9c62e9e62d1..14cada9ee88 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -514,46 +514,6 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) } -/****************************************************************************** - * get_reg_dword - * - * Read a DWORD value from the registry - */ -static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) -{ - HKEY key; - DWORD type, data, size = sizeof(data); - BOOL ret = FALSE; - - if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) - { - if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && - type == REG_DWORD) - { - *value = data; - ret = TRUE; - } - RegCloseKey(key); - } - return ret; -} - -/****************************************************************************** - * get_dpi - * - * get the dpi from the registry - */ -DWORD get_dpi(void) -{ - DWORD dpi; - - if (get_reg_dword(HKEY_CURRENT_USER, L"Control Panel\\Desktop", L"LogPixels", &dpi)) - return dpi; - if (get_reg_dword(HKEY_CURRENT_CONFIG, L"Software\\Fonts", L"LogPixels", &dpi)) - return dpi; - return 0; -} - /****************************************************************************** * get_system_dpi * @@ -580,16 +540,9 @@ static HFONT create_font( const LOGFONTW *deffont ) return NtGdiHfontCreate( &lf, sizeof(lf), 0, 0, NULL ); } -static HFONT create_scaled_font( const LOGFONTW *deffont ) +static HFONT create_scaled_font( const LOGFONTW *deffont, unsigned int dpi ) { LOGFONTW lf; - static DWORD dpi; - - if (!dpi) - { - dpi = get_dpi(); - if (!dpi) dpi = 96; - } lf = *deffont; lf.lfHeight = muldiv( lf.lfHeight, dpi, 96 ); @@ -634,7 +587,7 @@ HGDIOBJ get_stock_object( INT obj ) return entry_to_handle( handle_entry( ULongToHandle( obj + FIRST_GDI_HANDLE ))); } -static void init_stock_objects(void) +static void init_stock_objects( unsigned int dpi ) { const struct DefaultFontInfo *deffonts; unsigned int i; @@ -655,7 +608,7 @@ static void init_stock_objects(void) create_pen( PS_NULL, 0, RGB(0,0,0) ); /* slot 9 is not used for non-scaled stock objects */ - create_scaled_font( &OEMFixedFont ); + create_scaled_font( &OEMFixedFont, dpi ); /* language-independent stock fonts */ create_font( &OEMFixedFont ); @@ -679,9 +632,9 @@ static void init_stock_objects(void) assert( (HandleToULong( obj ) & 0xffff) == FIRST_GDI_HANDLE + DEFAULT_BITMAP ); - create_scaled_font( &deffonts->SystemFont ); - create_scaled_font( &deffonts->SystemFixedFont ); - create_scaled_font( &deffonts->DefaultGuiFont ); + create_scaled_font( &deffonts->SystemFont, dpi ); + create_scaled_font( &deffonts->SystemFixedFont, dpi ); + create_scaled_font( &deffonts->DefaultGuiFont, dpi ); /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < STOCK_LAST + 5; i++) @@ -699,14 +652,16 @@ static void init_stock_objects(void) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { + unsigned int dpi; + if (reason != DLL_PROCESS_ATTACH) return TRUE; gdi32_module = inst; DisableThreadLibraryCalls( inst ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); set_gdi_shared(); - font_init(); - init_stock_objects(); + dpi = font_init(); + init_stock_objects( dpi ); return TRUE; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 595387e0aef..9f0f1d44240 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -338,7 +338,7 @@ struct font_callback_funcs const struct bitmap_font_size *size ); }; -extern void font_init(void) DECLSPEC_HIDDEN; +extern UINT font_init(void) DECLSPEC_HIDDEN; /* opentype.c */ @@ -380,7 +380,6 @@ extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern DWORD get_dpi(void) DECLSPEC_HIDDEN; extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; extern HGDIOBJ get_stock_object( INT obj ) DECLSPEC_HIDDEN; extern DWORD get_gdi_object_type( HGDIOBJ obj ) DECLSPEC_HIDDEN;

1 0