November 2019 - Wine-Commits

Zebediah Figura : wined3d: Get rid of the "stateblock_state" field from struct wined3d_device.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: ac8d5f718595a2d9c63b64d1821048fcb1430fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac8d5f718595a2d9c63b64d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:28 2019 -0600 wined3d: Get rid of the "stateblock_state" field from struct wined3d_device. 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/wined3d/device.c | 11 +---------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f19a52c884..98559e4f6c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -529,8 +529,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); - wined3d_stateblock_state_cleanup(&device->stateblock_state); - wined3d_cs_destroy(device->cs); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) @@ -4763,12 +4761,10 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].max_z = 1.0f; state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - device->stateblock_state.viewport = state->viewports[0]; SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); - device->stateblock_state.scissor_rect = state->scissor_rects[0]; } prev = device->fb.render_targets[view_idx]; @@ -5103,7 +5099,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } - wined3d_stateblock_state_cleanup(&device->stateblock_state); state_unbind_resources(&device->state); } @@ -5300,7 +5295,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (reset_state) { - TRACE("Resetting stateblock.\n"); + TRACE("Resetting state.\n"); wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); @@ -5309,8 +5304,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5559,7 +5552,6 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined } state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->max_frame_latency = 3; @@ -5567,7 +5559,6 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); - wined3d_stateblock_state_cleanup(&device->stateblock_state); hr = E_FAIL; goto err; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e2707c5bd..3ae7dab858 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3282,7 +3282,6 @@ struct wined3d_device enum wined3d_feature_level feature_level; struct wined3d_state state; - struct wined3d_stateblock_state stateblock_state; /* Internal use fields */ struct wined3d_device_creation_parameters create_parms;

1 0

Gijs Vermeulen : kernel32: Remove unused function.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 22c2ce2fa605285102fc998c85952fd247b771a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c2ce2fa605285102fc998c… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Nov 27 18:21:52 2019 +0100 kernel32: Remove unused function. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 60428bcef0..3b485aeca0 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -176,17 +176,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION cache_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -/* Copy Ascii string to Unicode without using codepages */ -static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) -{ - while (n > 1 && *src) - { - *dst++ = (unsigned char)*src++; - n--; - } - if (n) *dst = 0; -} - extern const unsigned short wctype_table[] DECLSPEC_HIDDEN; extern const unsigned short nameprep_char_type[] DECLSPEC_HIDDEN; extern const WCHAR nameprep_mapping[] DECLSPEC_HIDDEN;

1 0

Zebediah Figura : qcap/vfwcapture: Call IMemInputPin::Receive() directly.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: ce9af91cec2de2816d5809a30d3ecfe9890a8ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9af91cec2de2816d5809a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:18 2019 -0600 qcap/vfwcapture: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index cdab38052b..17f1770f37 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -433,7 +433,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } Resize(capBox, pTarget, image_data); - hr = BaseOutputPinImpl_Deliver(capBox->pin, pSample); + hr = IMemInputPin_Receive(capBox->pin->pMemInputPin, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); } @@ -465,7 +465,7 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) capBox->stopped = FALSE; - if (*state == State_Stopped) + if (*state == State_Stopped && capBox->pin->pin.peer) { *state = State_Running; if (!capBox->iscommitted)

1 0

Zebediah Figura : strmbase: Get rid of BaseOutputPinImpl_Deliver().
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 8a05fe0fb551c6ff22799acf581befb02bdc49a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a05fe0fb551c6ff22799acf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:19 2019 -0600 strmbase: Get rid of BaseOutputPinImpl_Deliver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 40 ---------------------------------------- include/wine/strmbase.h | 1 - 2 files changed, 41 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4606c25a78..755dd0928a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -465,46 +465,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, return hr; } -/* replaces OutputPin_SendSample */ -HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *This, IMediaSample *pSample) -{ - IMemInputPin * pMemConnected = NULL; - PIN_INFO pinInfo; - HRESULT hr; - - EnterCriticalSection(&This->pin.filter->csFilter); - { - if (!This->pin.peer || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - /* we don't have the lock held when using This->pMemInputPin, - * so we need to AddRef it to stop it being deleted while we are - * using it. Same with its filter. */ - pMemConnected = This->pMemInputPin; - IMemInputPin_AddRef(pMemConnected); - hr = IPin_QueryPinInfo(This->pin.peer, &pinInfo); - } - } - LeaveCriticalSection(&This->pin.filter->csFilter); - - if (SUCCEEDED(hr)) - { - /* NOTE: if we are in a critical section when Receive is called - * then it causes some problems (most notably with the native Video - * Renderer) if we are re-entered for whatever reason */ - hr = IMemInputPin_Receive(pMemConnected, pSample); - - /* If the filter's destroyed, tell upstream to stop sending data */ - if(IBaseFilter_Release(pinInfo.pFilter) == 0 && SUCCEEDED(hr)) - hr = S_FALSE; - } - if (pMemConnected) - IMemInputPin_Release(pMemConnected); - - return hr; -} - /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dd2f8426bf..eace7c1e3b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -123,7 +123,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); -HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *pin, IMediaSample *sample); HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin); HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);

1 0

Zhiyi Zhang : include: Add more date formatting flags.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: fbb41150de6fca9d7bc401297cf220ce34f07b02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb41150de6fca9d7bc40129… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 27 15:00:07 2019 +0800 include: Add more date formatting flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..c7c2cfb240 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -411,6 +411,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define DATE_YEARMONTH 0x08 /* Year/month format */ #define DATE_LTRREADING 0x10 /* Add LTR reading marks */ #define DATE_RTLREADING 0x20 /* Add RTL reading marks */ +#define DATE_AUTOLAYOUT 0x40 /* Add LTR or RTL reading marks automatically */ +#define DATE_MONTHDAY 0x80 /* Month/day format */ #define TIME_FORCE24HOURFORMAT 0x08 /* Always use 24 hour clock */ #define TIME_NOTIMEMARKER 0x04 /* show no AM/PM */

1 0

Zebediah Figura : wined3d: Get rid of the "recording" field from struct wined3d_device.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 3f918c94796e0b3f29f9d8c73fc3912f9ba5c796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f918c94796e0b3f29f9d8c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:25 2019 -0600 wined3d: Get rid of the "recording" field from struct wined3d_device. 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/wined3d/device.c | 173 +---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f918c94796e0b3f29f9…

1 0

Zebediah Figura : strmbase: Move tracking of EOS state to the base renderer.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 6773179a94df75d199d332a0b0bc06b854cfa71d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6773179a94df75d199d332a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:20 2019 -0600 strmbase: Move tracking of EOS state to the base renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 4 +--- dlls/strmbase/renderer.c | 20 +++++++++----------- dlls/strmbase/transform.c | 4 +--- include/wine/strmbase.h | 4 +++- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 755dd0928a..bdc827c6f6 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -690,8 +690,6 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); if (This->flushing) hr = S_FALSE; - else - This->end_of_stream = TRUE; LeaveCriticalSection(&This->pin.filter->csFilter); if (hr == S_OK) @@ -731,7 +729,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) TRACE("(%p)->()\n", This); EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = This->end_of_stream = FALSE; + This->flushing = FALSE; hr = SendFurther(This, deliver_endflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index add999b4ec..dbb677e9ad 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -89,14 +89,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - hr = BaseInputPinImpl_EndOfStream(iface); - if (SUCCEEDED(hr)) - { - if (pFilter->pFuncsTable->pfnEndOfStream) - hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); - else - hr = BaseRendererImpl_EndOfStream(pFilter); - } + pFilter->eos = TRUE; + if (pFilter->pFuncsTable->pfnEndOfStream) + hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); + else + hr = BaseRendererImpl_EndOfStream(pFilter); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -128,6 +125,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); + pFilter->eos = FALSE; hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { @@ -206,7 +204,7 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) if (filter->sink.pin.peer) ResetEvent(filter->state_event); - filter->sink.end_of_stream = FALSE; + filter->eos = FALSE; BaseRendererImpl_ClearPendingSample(filter); ResetEvent(filter->flush_event); if (filter->pFuncsTable->renderer_init_stream) @@ -222,7 +220,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); if (filter->sink.pin.peer) - filter->sink.end_of_stream = FALSE; + filter->eos = FALSE; QualityControlRender_Start(filter->qcimpl, filter->stream_start); if (filter->sink.pin.peer && filter->pFuncsTable->renderer_start_stream) filter->pFuncsTable->renderer_start_stream(filter); @@ -339,7 +337,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa TRACE("(%p)->%p\n", This, pSample); - if (This->sink.end_of_stream || This->sink.flushing) + if (This->eos || This->sink.flushing) return S_FALSE; if (This->filter.state == State_Stopped) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 29c385793a..d39dbbd3ab 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -76,7 +76,7 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, return VFW_E_WRONG_STATE; } - if (This->end_of_stream || This->flushing) + if (This->flushing) { LeaveCriticalSection(&pTransform->csReceive); return S_FALSE; @@ -165,7 +165,6 @@ static HRESULT transform_init_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); - filter->sink.end_of_stream = FALSE; if (filter->pFuncsTable->pfnStartStreaming) hr = filter->pFuncsTable->pfnStartStreaming(filter); if (SUCCEEDED(hr)) @@ -183,7 +182,6 @@ static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); - filter->sink.end_of_stream = FALSE; if (filter->pFuncsTable->pfnStopStreaming) hr = filter->pFuncsTable->pfnStopStreaming(filter); if (SUCCEEDED(hr)) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index eace7c1e3b..d0a0da1b10 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -81,7 +81,7 @@ struct strmbase_sink IMemInputPin IMemInputPin_iface; IMemAllocator *pAllocator; - BOOL flushing, end_of_stream; + BOOL flushing; IMemAllocator *preferred_allocator; const struct strmbase_sink_ops *pFuncsTable; @@ -534,6 +534,8 @@ struct strmbase_renderer struct QualityControlImpl *qcimpl; const struct strmbase_renderer_ops *pFuncsTable; + + BOOL eos; }; typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt);

1 0

Zebediah Figura : d3d8: Fix a copy-paste error.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: 7af5c1037e5de3b2706660ec9d3f096fd08f7b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af5c1037e5de3b2706660ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:24 2019 -0600 d3d8: Fix a copy-paste error. 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 564dc9d9d0..9dd3ef016f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1905,7 +1905,7 @@ static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) if (device->recording) { wined3d_mutex_unlock(); - WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; }

1 0

Paul Gofman : ddraw: Fix conversion of v1 viewport from v2 in d3d_viewport_GetViewport().
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: cabaeea58dad2950b73876c453790e8d9fd19a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cabaeea58dad2950b73876c4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 26 21:19:48 2019 +0300 ddraw: Fix conversion of v1 viewport from v2 in d3d_viewport_GetViewport(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19471 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 26 ++++++------ dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/viewport.c | 13 +++--- 3 files changed, 94 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cabaeea58dad2950b738…

1 0

Alexandre Julliard : kernelbase: Initialize codepage data using ntdll functions.
by Alexandre Julliard Nov. 27, 2019

Nov. 27, 2019

Module: wine Branch: master Commit: d05c9f12fb9409e2bc65bb59fa596c9872915d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05c9f12fb9409e2bc65bb59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 27 09:54:51 2019 +0100 kernelbase: Initialize codepage data using ntdll functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 512c3aeeb1..b0e42ccf33 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -94,8 +94,7 @@ static const struct registry_value { LOCALE_ITIMEMARKPOSN, L"iTimePrefix" }, }; -static UINT ansi_cp = 1252; -static UINT oem_cp = 437; +static NLSTABLEINFO nls_info; static UINT mac_cp = 10000; static HKEY intl_key; static HKEY nls_key; @@ -106,9 +105,12 @@ static HKEY nls_key; */ void init_locale(void) { + UINT ansi_cp = 0, oem_cp = 0; + USHORT *ansi_ptr, *oem_ptr, *casemap_ptr; LCID lcid = GetUserDefaultLCID(); WCHAR bufferW[80]; DWORD count, i; + SIZE_T size; HKEY hkey; kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); @@ -120,6 +122,17 @@ void init_locale(void) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); + NtGetNlsSectionPtr( 10, 0, 0, (void **)&casemap_ptr, &size ); + if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) + NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); + if (!oem_cp || NtGetNlsSectionPtr( 11, oem_cp, 0, (void **)&oem_ptr, &size )) + NtGetNlsSectionPtr( 11, 437, NULL, (void **)&oem_ptr, &size ); + NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; + NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; + NtCurrentTeb()->Peb->UnicodeCaseTableData = casemap_ptr; + RtlInitNlsTables( ansi_ptr, oem_ptr, casemap_ptr, &nls_info ); + RtlResetRtlTranslations( &nls_info ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &nls_key, NULL ); RegCreateKeyExW( HKEY_CURRENT_USER, L"Control Panel\\International", @@ -163,7 +176,7 @@ void init_locale(void) static UINT get_lcid_codepage( LCID lcid, ULONG flags ) { - UINT ret = CP_ACP; + UINT ret = GetACP(); if (!(flags & LOCALE_USE_CP_ACP) && lcid != GetSystemDefaultLCID()) GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, @@ -837,7 +850,7 @@ INT WINAPI DECLSPEC_HOTPATCH FindStringOrdinal( DWORD flag, const WCHAR *src, IN */ UINT WINAPI GetACP(void) { - return ansi_cp; + return nls_info.AnsiTableInfo.CodePage; } @@ -1111,7 +1124,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *locale, LCTYPE info, */ UINT WINAPI GetOEMCP(void) { - return oem_cp; + return nls_info.OemTableInfo.CodePage; }

1 0