December 2019 - Wine-commits

Akihiro Sagawa : wined3d: Record dirty regions for d3d9 textures.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: c90d34178d7cf641e818e99d238dd2990706271b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90d34178d7cf641e818e99d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 10 21:44:15 2019 +0330 wined3d: Record dirty regions for d3d9 textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 9 ++++- dlls/wined3d/device.c | 19 ++++++++++ dlls/wined3d/texture.c | 78 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 10 ++++++ include/wine/wined3d.h | 1 + 5 files changed, 109 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c90d34178d7cf641e818…

1 0

Akihiro Sagawa : wined3d: Update a part of the texture if dirty regions are tracked.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 54edd5b220116febe704ecef8b3fb86621793ebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=54edd5b220116febe704ecef… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 10 21:44:16 2019 +0330 wined3d: Update a part of the texture if dirty regions are tracked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35205 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 12 ++++----- dlls/wined3d/device.c | 67 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0a9fb0acc2..c87337057e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19340,7 +19340,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19353,7 +19353,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19365,7 +19365,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19382,7 +19382,7 @@ static void add_dirty_rect_test(void) ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); color = getPixelColor(device, 1, 1); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19404,7 +19404,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19416,7 +19416,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc92d4f4b7..8913420724 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4141,19 +4141,66 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } } - if (!entire_texture) - FIXME("Ignoring dirty regions.\n"); - /* Update every surface level of the texture. */ - for (i = 0; i < level_count; ++i) + if (entire_texture) { - wined3d_texture_get_level_box(dst_texture, i, &box); - for (j = 0; j < layer_count; ++j) + for (i = 0; i < level_count; ++i) + { + wined3d_texture_get_level_box(dst_texture, i, &box); + for (j = 0; j < layer_count; ++j) + { + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, j * dst_level_count + i, &box, + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, + 0, NULL, WINED3D_TEXF_POINT); + } + } + } + else + { + unsigned int src_level, box_count, k; + const struct wined3d_box *boxes; + struct wined3d_box b; + + for (i = 0; i < layer_count; ++i) { - wined3d_cs_emit_blt_sub_resource(device->cs, - &dst_texture->resource, j * dst_level_count + i, &box, - &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, - 0, NULL, WINED3D_TEXF_POINT); + boxes = regions[i].boxes; + box_count = regions[i].box_count; + if (regions[i].box_count >= WINED3D_MAX_DIRTY_REGION_COUNT) + { + boxes = &b; + box_count = 1; + wined3d_texture_get_level_box(dst_texture, i, &b); + } + + for (j = 0; j < level_count; ++j) + { + src_level = j + src_skip_levels; + + /* TODO: We could pass an array of boxes here to avoid + * multiple context acquisitions for the same resource. */ + for (k = 0; k < box_count; ++k) + { + box = boxes[k]; + if (src_level) + { + box.left >>= src_level; + box.top >>= src_level; + box.right = min((box.right + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_width(src_texture, src_level)); + box.bottom = min((box.bottom + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_height(src_texture, src_level)); + box.front >>= src_level; + box.back = min((box.back + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_depth(src_texture, src_level)); + } + + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, i * dst_level_count + j, &box, + &src_texture->resource, i * src_level_count + src_level, &box, + 0, NULL, WINED3D_TEXF_POINT); + } + } } }

1 0

Michael Stefaniuc : dmband: Add partial implementation of Band track GetParam/SetParam.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: d191c5ca181c1abb908dddc1c06ee291a8fee505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d191c5ca181c1abb908dddc1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 00:15:12 2019 +0100 dmband: Add partial implementation of Band track GetParam/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/bandtrack.c | 57 ++++++++++++++++++++++++++++++++++++++-------- dlls/dmband/tests/dmband.c | 22 ++++++++++++++---- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index a0305bdb28..14d2c7a571 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -132,20 +132,57 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat return S_OK; } -static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_BandParam)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_BandParam not handled yet\n"); + + return S_OK; } -static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (FAILED(IDirectMusicTrack8_IsParamSupported(iface, type))) + return DMUS_E_TYPE_UNSUPPORTED; + + if (IsEqualGUID(type, &GUID_BandParam)) + FIXME("GUID_BandParam not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Clear_All_Bands)) + FIXME("GUID_Clear_All_Bands not handled yet\n"); + else if (IsEqualGUID(type, &GUID_ConnectToDLSCollection)) + FIXME("GUID_ConnectToDLSCollection not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) + FIXME("GUID_Disable_Auto_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Download)) + FIXME("GUID_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) + FIXME("GUID_DownloadToAudioPath not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) + FIXME("GUID_Enable_Auto_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_IDirectMusicBand)) + FIXME("GUID_IDirectMusicBand not handled yet\n"); + else if (IsEqualGUID(type, &GUID_StandardMIDIFile)) + FIXME("GUID_StandardMIDIFile not handled yet\n"); + else if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) + FIXME("GUID_UnloadFromAudioPath not handled yet\n"); + + return S_OK; } static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 459d00ed1d..dce8a47ba4 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -180,6 +180,7 @@ static void test_bandtrack(void) IPersistStream *ps; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -233,26 +234,39 @@ static void test_bandtrack(void) } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); - todo_wine { hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); for (i = 0; i < ARRAY_SIZE(param_types); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); - if (param_types[i].supported) + if (param_types[i].supported) { ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[i].name, hr); - else + hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); + if (param_types[i].type != &GUID_BandParam) + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + param_types[i].name, hr); + } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + param_types[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, param_types[i].type, 0, buf); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL);

1 0

Michael Stefaniuc : dmloader: Remove commented out dead code.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 25370018f2d923a09e2d790da3e10028040d3ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25370018f2d923a09e2d790d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 00:48:08 2019 +0100 dmloader: Remove commented out dead code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index bac52111ac..39b105a159 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -640,25 +640,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IDirectMusicLoader_Release (pLoader); /* release loader */ -#if 0 - /* DEBUG: dumps whole container object tree: */ - if (TRACE_ON(dmloader)) { - int r = 0; - LPWINE_CONTAINER_ENTRY tmpEntry; - struct list *listEntry; - - TRACE("*** IDirectMusicContainer (%p) ***\n", This->ContainerVtbl); - TRACE(" - Objects:\n"); - LIST_FOR_EACH (listEntry, This->pContainedObjects) { - tmpEntry = LIST_ENTRY( listEntry, WINE_CONTAINER_ENTRY, entry ); - TRACE(" - Object[%i]:\n", r); - TRACE(" - wszAlias: %s\n", debugstr_w(tmpEntry->wszAlias)); - TRACE(" - Object descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(&tmpEntry->Desc)); - r++; - } - } -#endif - return result; }

1 0

Michael Stefaniuc : dmband: Get rid of the redundant debugstr_DMUS_OBJECTDESC().
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 2e66404dc9bac13f77bf78d89ae934413a0a82ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e66404dc9bac13f77bf78d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 00:48:09 2019 +0100 dmband: Get rid of the redundant debugstr_DMUS_OBJECTDESC(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmutils.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index a1dc7e28a5..af24054bf4 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -122,31 +122,6 @@ static const char *debugstr_dmversion (const DMUS_VERSION *version) { HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } -/* dump whole DMUS_OBJECTDESC struct */ -static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return "(NULL)"; - } -} - HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { @@ -303,7 +278,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); TRACE_(dmfile)("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + debug_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -521,7 +496,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); if (pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); + if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime(&pDesc->ftDate)); if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));

1 0

Alexandre Julliard : kernel32: Remove __wine_kernel_init().
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 30e5f1215e0d2a0555bd2c6243276451fdaf5b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e5f1215e0d2a0555bd2c62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:08:40 2019 +0100 kernel32: Remove __wine_kernel_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/process.c | 30 +++++++----------------------- dlls/ntdll/loader.c | 9 +++------ 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index daf93aebfd..4118d29b3d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1686,4 +1686,4 @@ @ cdecl wine_get_dos_file_name(str) # Init code -@ cdecl __wine_kernel_init() +@ cdecl __wine_start_process() diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 9247e3c117..be355fe724 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -84,6 +84,9 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; + kernel32_handle = module; + RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); /* Setup registry timezone information */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e5e51a93d8..7b8b8adcc2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -104,9 +104,7 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -extern void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) DECLSPEC_HIDDEN; -extern void WINAPI start_process_wrapper(void) DECLSPEC_HIDDEN; -__ASM_GLOBAL_FUNC( start_process_wrapper, +__ASM_GLOBAL_FUNC( __wine_start_process, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -120,16 +118,18 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) { return entry( peb ); } -static void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ); -#define start_process_wrapper start_process #endif /*********************************************************************** - * start_process + * __wine_start_process * * Startup routine of a new process. Runs on the new process stack. */ -void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#ifdef __i386__ +void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#else +void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#endif { BOOL being_debugged; @@ -161,22 +161,6 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) } -/*********************************************************************** - * __wine_kernel_init - * - * Wine initialisation: load and start the main exe file. - */ -void * CDECL __wine_kernel_init(void) -{ - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; - - kernel32_handle = GetModuleHandleW(kernel32W); - RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); - - return start_process_wrapper; -} - - /*********************************************************************** * wait_input_idle * diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d87d6857d7..2f203447ed 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4237,7 +4237,6 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - void * (CDECL *init_func)(void); INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4273,11 +4272,11 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } - RtlInitAnsiString( &func_name, "__wine_kernel_init" ); + RtlInitAnsiString( &func_name, "__wine_start_process" ); if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, - 0, (void **)&init_func )) != STATUS_SUCCESS) + 0, (void **)&kernel32_start_process )) != STATUS_SUCCESS) { - MESSAGE( "wine: could not find __wine_kernel_init in kernel32.dll, status %x\n", status ); + MESSAGE( "wine: could not find __wine_start_process in kernel32.dll, status %x\n", status ); exit(1); } @@ -4323,8 +4322,6 @@ void __wine_process_init(void) NtTerminateProcess( GetCurrentProcess(), status ); } - kernel32_start_process = init_func(); - virtual_set_large_address_space(); /* the main exe needs to be the first in the load order list */

1 0

Alexandre Julliard : kernelbase: Add an OpenConsoleW() replacement wrapper.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 7b3c0fbed230dda20836b4b4fb8cc0584e198b99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3c0fbed230dda20836b4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:09:33 2019 +0100 kernelbase: Add an OpenConsoleW() replacement wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++++++++++++++++ dlls/kernelbase/file.c | 16 ++++++---------- dlls/kernelbase/kernelbase.h | 2 ++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 615c0f434a..0729e578e4 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -157,6 +157,31 @@ static COORD get_largest_console_window_size( HANDLE handle ) return c; } +/* helper function to replace OpenConsoleW */ +HANDLE open_console( BOOL output, DWORD access, SECURITY_ATTRIBUTES *sa, DWORD creation ) +{ + HANDLE ret; + + if (creation != OPEN_EXISTING) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + + SERVER_START_REQ( open_console ) + { + req->from = wine_server_obj_handle( ULongToHandle( output )); + req->access = access; + req->attributes = sa && sa->bInheritHandle ? OBJ_INHERIT : 0; + req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; + wine_server_call_err( req ); + ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + if (ret) ret = console_handle_map( ret ); + return ret; +} + /****************************************************************** * AttachConsole (kernelbase.@) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 23ca5629a3..59ddcd9ed9 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -428,8 +428,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO DWORD dosdev; const WCHAR *vxd_name = NULL; static const WCHAR bkslashes_with_dotW[] = {'\\','\\','.','\\',0}; - static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; - static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; SECURITY_QUALITY_OF_SERVICE qos; static const UINT nt_disposition[5] = @@ -462,12 +460,10 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO /* Open a console for CONIN$ or CONOUT$ */ - if (!wcsicmp(filename, coninW) || !wcsicmp(filename, conoutW)) - { - ret = OpenConsoleW( filename, access, sa && sa->bInheritHandle, creation ? OPEN_EXISTING : 0 ); - if (ret == INVALID_HANDLE_VALUE) SetLastError( ERROR_INVALID_PARAMETER ); - return ret; - } + if (!wcsicmp( filename, L"CONIN$" )) + return open_console( FALSE, access, sa, creation ? OPEN_EXISTING : 0 ); + if (!wcsicmp( filename, L"CONOUT$" )) + return open_console( TRUE, access, sa, creation ? OPEN_EXISTING : 0 ); if (!wcsncmp( filename, bkslashes_with_dotW, 4 )) { @@ -502,9 +498,9 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO switch (access & (GENERIC_READ|GENERIC_WRITE)) { case GENERIC_READ: - return OpenConsoleW( coninW, access, sa && sa->bInheritHandle, OPEN_EXISTING ); + return open_console( FALSE, access, sa, OPEN_EXISTING ); case GENERIC_WRITE: - return OpenConsoleW( conoutW, access, sa && sa->bInheritHandle, OPEN_EXISTING ); + return open_console( TRUE, access, sa, OPEN_EXISTING ); default: SetLastError( ERROR_FILE_NOT_FOUND ); return INVALID_HANDLE_VALUE; diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 4aed1829e3..d7de53c412 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -35,6 +35,8 @@ extern const WCHAR system_dir[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); extern BOOL is_wow64 DECLSPEC_HIDDEN; +extern HANDLE open_console( BOOL output, DWORD access, SECURITY_ATTRIBUTES *sa, DWORD creation ) DECLSPEC_HIDDEN; + static inline BOOL is_console_handle(HANDLE h) { return h != INVALID_HANDLE_VALUE && ((UINT_PTR)h & 3) == 3;

1 0

Alexandre Julliard : kernelbase: Add IsBadStringPtr() replacement functions.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 0235e5146529d3d7eb257b2b3e5cc36bc2c77dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0235e5146529d3d7eb257b2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:12:20 2019 +0100 kernelbase: Add IsBadStringPtr() replacement functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 465a57209b..83805ece45 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -390,6 +390,42 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co } +/* IsBadStringPtrA replacement for kernelbase, to catch exception in debug traces. */ +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const char *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + +/* IsBadStringPtrW replacement for kernelbase, to catch exception in debug traces. */ +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const WCHAR *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + /*********************************************************************** * Heap functions ***********************************************************************/

1 0

Alexandre Julliard : kernel32: Move timezone functions to kernelbase.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 89500484c24de304b2a6d245573b6f51fbb4852f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89500484c24de304b2a6d245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 18:14:19 2019 +0100 kernel32: Move timezone functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 14 +- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/time.c | 621 +--------------------------------------- dlls/kernelbase/kernelbase.spec | 14 +- dlls/kernelbase/locale.c | 321 +++++++++++++++++++++ 6 files changed, 336 insertions(+), 640 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89500484c24de304b2a6…

1 0

Michael Stefaniuc : msado15: Print the debug strings and not the pointers to them.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 516dc46b82af3c4b4b864e522ecde558d5c9d3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516dc46b82af3c4b4b864e52… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 09:56:11 2019 +0100 msado15: Print the debug strings and not the pointers to them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 2 +- dlls/msado15/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..43497636a8 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -187,7 +187,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), - debugstr_w(password), options ); + password, options ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 0c4d9ea425..169be7319e 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -371,7 +371,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); return E_NOTIMPL; }

1 0