January 2019 - Wine-Commits

Sven Baars : gdiplus/tests: Add some font family pointer tests.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 5f25d7a9a9f2ed626e5342adef8879fee26a73e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f25d7a9a9f2ed626e5342ad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 26 15:23:04 2019 +0100 gdiplus/tests: Add some font family pointer tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 03e7a04..33b75c5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -141,6 +141,8 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); +todo_wine + ok (fontfamily == fontfamily2, "Unexpected family instance.\n"); ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); @@ -343,6 +345,8 @@ static void test_fontfamily (void) ZeroMemory (itsName, sizeof(itsName)); stat = GdipCloneFontFamily(family, &clonedFontFamily); expect (Ok, stat); +todo_wine + ok (family == clonedFontFamily, "Unexpected family instance.\n"); GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); @@ -1187,8 +1191,9 @@ todo_wine static void test_GdipGetFontCollectionFamilyList(void) { - GpFontFamily *family, *family2; + GpFontFamily *family, *family2, **families; GpFontCollection *collection; + UINT i; INT found, count; GpStatus status; @@ -1228,15 +1233,32 @@ static void test_GdipGetFontCollectionFamilyList(void) ok(found == 1, "Unexpected list count %d.\n", found); ok(family != NULL, "Expected family instance.\n"); - family = NULL; + family2 = NULL; found = 0; status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); ok(status == Ok, "Failed to get family list, status %d.\n", status); ok(found == 1, "Unexpected list count %d.\n", found); - ok(family2 != family, "Unexpected family instance.\n"); +todo_wine + ok(family2 == family, "Unexpected family instance.\n"); - GdipDeleteFontFamily(family); - GdipDeleteFontFamily(family2); + status = GdipDeleteFontFamily(family); + expect(Ok, status); + + status = GdipDeleteFontFamily(family2); + expect(Ok, status); + + families = GdipAlloc((count + 1) * sizeof(*families)); + found = 0; + status = GdipGetFontCollectionFamilyList(collection, count + 1, families, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == count, "Unexpected list count %d, extected %d.\n", found, count); + + for (i = 0; i < found; i++) + { + status = GdipDeleteFontFamily(families[i]); + expect(Ok, status); + } + GdipFree(families); } static void test_GdipGetFontCollectionFamilyCount(void)

1 0

Daniel Lehman : msvcrt: _towupper_l only uppercase a-z in C locale.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 2c308c9fa2b3481d58cdea2863c0f935440ca397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c308c9fa2b3481d58cdea28… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:19 2019 +0100 msvcrt: _towupper_l only uppercase a-z in C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4f8b8b0..d0cc51b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3642,7 +3642,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != i) ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); } @@ -3672,7 +3671,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != j) ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d96da44..28e82ec 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2478,6 +2478,19 @@ MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen */ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'a' && c <= 'z') + return c + 'A' - 'a'; + return c; + } + return toupperW(c); }

1 0

Andrey Gusev : d3dcompiler: Add support for two other versions of ID3D11ShaderReflection.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: d52b53d151cc2862bf3396298916da693d80198f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52b53d151cc2862bf339629… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 28 19:40:02 2019 +0100 d3dcompiler: Add support for two other versions of ID3D11ShaderReflection. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 9 +++++++++ include/d3d11shader.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5a59c64..b36631b 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -665,6 +665,14 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( return 0; } +static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( + ID3D11ShaderReflection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = { /* IUnknown methods */ @@ -690,6 +698,7 @@ static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtb d3dcompiler_shader_reflection_GetNumInterfaceSlots, d3dcompiler_shader_reflection_GetMinFeatureLevel, d3dcompiler_shader_reflection_GetThreadGroupSize, + d3dcompiler_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f9c3b95..479020a 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -174,7 +174,13 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) }; #undef INTERFACE +#if D3D_COMPILER_VERSION <= 42 +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x17f27486, 0xa342, 0x4d10, 0x88, 0x42, 0xab, 0x08, 0x74, 0xe7, 0xf6, 0x70); +#elif D3D_COMPILER_VERSION == 43 DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); +#else +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x8d536ca1, 0x0cca, 0x4956, 0xa8, 0x37, 0x78, 0x69, 0x63, 0x75, 0x55, 0x84); +#endif #define INTERFACE ID3D11ShaderReflection DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) @@ -202,6 +208,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; + STDMETHOD_(UINT64, GetRequiresFlags)(THIS) PURE; }; #undef INTERFACE

1 0

Jacek Caban : services: Associate notify handle with service handle instead of service entry.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 8a2347baffb64f6d2b2901e5a87c926e498671d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2347baffb64f6d2b2901e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:54:00 2019 +0100 services: Associate notify handle with service handle instead of service entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 -- programs/services/rpc.c | 68 +++++++++++++++++++++---------------------- programs/services/services.h | 4 --- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 1552791..e4ff7d7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2383,7 +2383,6 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) /* it's possible to have multiple notifications using different service handles */ dr = pNotifyServiceStatusChangeW(svc2, SERVICE_NOTIFY_STOPPED, &data2.notify); - todo_wine ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); /* stop service and receive notifiction */ @@ -2394,7 +2393,6 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) dr2 = SleepEx(100, TRUE); ok(dr == WAIT_IO_COMPLETION || dr2 == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); - todo_wine ok(data2.was_called == TRUE, "APC wasn't called\n"); /* test cancelation: create notify on svc that will block until service diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 623e1fa..8299dbf 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -75,23 +75,24 @@ struct sc_manager_handle /* service control manager handle */ struct scmdatabase *db; }; -struct sc_service_handle /* service handle */ -{ - struct sc_handle hdr; - struct list entry; - struct service_entry *service_entry; -}; - struct sc_notify_handle { struct sc_handle hdr; - struct sc_service_handle *service; HANDLE event; DWORD notify_mask; LONG ref; SC_RPC_NOTIFY_PARAMS_LIST *params_list; }; +struct sc_service_handle /* service handle */ +{ + struct sc_handle hdr; + struct list entry; + BOOL status_notified; + struct service_entry *service_entry; + struct sc_notify_handle *notify; +}; + static void sc_notify_retain(struct sc_notify_handle *notify) { InterlockedIncrement(&notify->ref); @@ -313,12 +314,10 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) struct sc_service_handle *service = (struct sc_service_handle *)hdr; service_lock(service->service_entry); list_remove(&service->entry); - if (service->service_entry->notify && - service->service_entry->notify->service == service) + if (service->notify) { - SetEvent(service->service_entry->notify->event); - sc_notify_release(service->service_entry->notify); - service->service_entry->notify = NULL; + SetEvent(service->notify->event); + sc_notify_release(service->notify); } service_unlock(service->service_entry); release_service(service->service_entry); @@ -432,6 +431,8 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; + service->notify = NULL; + service->status_notified = FALSE; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); service_lock(entry); @@ -835,7 +836,7 @@ static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_e status->dwServiceFlags = 0; } -static void fill_notify(struct sc_notify_handle *notify) +static void fill_notify(struct sc_notify_handle *notify, struct service_entry *service) { SC_RPC_NOTIFY_PARAMS_LIST *list; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; @@ -848,7 +849,7 @@ static void fill_notify(struct sc_notify_handle *notify) cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); cparams->dwNotifyMask = notify->notify_mask; - fill_status_process(&cparams->ServiceStatus, notify->service->service_entry); + fill_status_process(&cparams->ServiceStatus, service); cparams->dwNotificationStatus = ERROR_SUCCESS; cparams->dwNotificationTriggered = 1 << (cparams->ServiceStatus.dwCurrentState - SERVICE_STOPPED); cparams->pszServiceNames = NULL; @@ -867,7 +868,7 @@ DWORD __cdecl svcctl_SetServiceStatus( SC_RPC_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { - struct sc_service_handle *service; + struct sc_service_handle *service, *service_handle; struct process_entry *process; DWORD err, mask; @@ -895,17 +896,19 @@ DWORD __cdecl svcctl_SetServiceStatus( } mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); - if (service->service_entry->notify && - (service->service_entry->notify->notify_mask & mask)) + LIST_FOR_EACH_ENTRY(service_handle, &service->service_entry->handles, struct sc_service_handle, entry) { - struct sc_notify_handle *notify = service->service_entry->notify; - fill_notify(notify); - service->service_entry->notify = NULL; - sc_notify_release(notify); - service->service_entry->status_notified = TRUE; + struct sc_notify_handle *notify = service_handle->notify; + if (notify && (notify->notify_mask & mask)) + { + fill_notify(notify, service->service_entry); + sc_notify_release(notify); + service_handle->notify = NULL; + service_handle->status_notified = TRUE; + } + else + service_handle->status_notified = FALSE; } - else - service->service_entry->status_notified = FALSE; service_unlock(service->service_entry); @@ -1736,32 +1739,29 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( notify->hdr.type = SC_HTYPE_NOTIFY; notify->hdr.access = 0; - notify->service = service; - notify->event = CreateEventW(NULL, TRUE, FALSE, NULL); notify->notify_mask = params.u.params->dwNotifyMask; service_lock(service->service_entry); - if (service->service_entry->notify) + if (service->notify) { service_unlock(service->service_entry); - HeapFree(GetProcessHeap(), 0, notify); + sc_notify_release(notify); return ERROR_ALREADY_REGISTERED; } mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); - if (!service->service_entry->status_notified && - (notify->notify_mask & mask)) + if (!service->status_notified && (notify->notify_mask & mask)) { - fill_notify(notify); - service->service_entry->status_notified = TRUE; + fill_notify(notify, service->service_entry); + service->status_notified = TRUE; } else { sc_notify_retain(notify); - service->service_entry->notify = notify; + service->notify = notify; } sc_notify_retain(notify); diff --git a/programs/services/services.h b/programs/services/services.h index c78f71c..e1481d9 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,8 +45,6 @@ struct process_entry HANDLE overlapped_event; }; -struct sc_notify_handle; - struct service_entry { struct list entry; @@ -65,8 +63,6 @@ struct service_entry BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; - BOOL status_notified; - struct sc_notify_handle *notify; struct list handles; };

1 0

Nikolay Sivov : d3dx9: Use wincodecs directly without initializing COM system.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 77c3761ad4e557f9fa311299e77746bf225a575a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77c3761ad4e557f9fa311299… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 28 15:51:46 2019 +0300 d3dx9: Use wincodecs directly without initializing COM system. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 1 + dlls/d3dx9_25/Makefile.in | 1 + dlls/d3dx9_26/Makefile.in | 1 + dlls/d3dx9_27/Makefile.in | 1 + dlls/d3dx9_28/Makefile.in | 1 + dlls/d3dx9_29/Makefile.in | 1 + dlls/d3dx9_30/Makefile.in | 1 + dlls/d3dx9_31/Makefile.in | 1 + dlls/d3dx9_32/Makefile.in | 1 + dlls/d3dx9_33/Makefile.in | 1 + dlls/d3dx9_34/Makefile.in | 1 + dlls/d3dx9_35/Makefile.in | 1 + dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/surface.c | 37 +++++++++++++------------------------ dlls/d3dx9_37/Makefile.in | 1 + dlls/d3dx9_38/Makefile.in | 1 + dlls/d3dx9_39/Makefile.in | 1 + dlls/d3dx9_40/Makefile.in | 1 + dlls/d3dx9_41/Makefile.in | 1 + dlls/d3dx9_42/Makefile.in | 1 + dlls/d3dx9_43/Makefile.in | 1 + 21 files changed, 33 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77c3761ad4e557f9fa31…

1 0

Zebediah Figura : wined3d: Store vertex shader boolean constants in the wined3d_stateblock_state structure.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 28b0f53f6e1f7c5cdd5ead1a77dc4341509b54d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28b0f53f6e1f7c5cdd5ead1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:55 2019 -0600 wined3d: Store vertex shader boolean constants in the wined3d_stateblock_state structure. 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 | 17 +++++++++-------- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14cb620..331def2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2396,23 +2396,24 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, if (count > WINED3D_MAX_CONSTS_B - start_idx) count = WINED3D_MAX_CONSTS_B - start_idx; - memcpy(&device->update_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); - if (TRACE_ON(d3d)) - { - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); - } + memcpy(&device->update_stateblock_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); if (device->recording) { for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsB |= (1u << i); + return WINED3D_OK; } - else + + memcpy(&device->state.vs_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) { - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dd1e638..112d8b7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -727,9 +727,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) unsigned int idx = stateblock->contained_vs_consts_b[i]; TRACE("Setting vs_consts_b[%u] to %s.\n", - idx, src_state->vs_consts_b[idx] ? "TRUE" : "FALSE"); + idx, state->vs_consts_b[idx] ? "TRUE" : "FALSE"); - stateblock->state.vs_consts_b[idx] = src_state->vs_consts_b[idx]; + stateblock->stateblock_state.vs_consts_b[idx] = state->vs_consts_b[idx]; } /* Pixel shader float constants. */ @@ -1020,8 +1020,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { + state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i]; wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - 1, &stateblock->state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); + 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } apply_lights(device, &stateblock->state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fedf2b8..52106f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2973,6 +2973,7 @@ struct wined3d_stateblock_state struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; + BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; }; struct wined3d_device

1 0

Alexandre Julliard : kernel32/tests: Add tests for dll fallback when image type doesn' t match current platform.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: b1dbe76d7a61740004be6328d1b26ea058d0204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dbe76d7a61740004be6328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:43 2019 +0100 kernel32/tests: Add tests for dll fallback when image type doesn't match current platform. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 118 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 89a3f31..165c05e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winnls.h" #include "wine/test.h" #include "delayloadhandler.h" @@ -67,6 +68,9 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pLdrLoadDll)(LPCWSTR,DWORD,const UNICODE_STRING *,HMODULE*); +static NTSTATUS (WINAPI *pLdrUnloadDll)(HMODULE); +static void (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING,LPCWSTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -508,6 +512,53 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static const WCHAR wldr_nameW[] = {'w','l','d','r','t','e','s','t','.','d','l','l',0}; +static WCHAR load_test_name[MAX_PATH], load_fallback_name[MAX_PATH]; +static WCHAR load_path[MAX_PATH]; + +static void init_load_path( const char *fallback_dll ) +{ + static const WCHAR pathW[] = {'P','A','T','H',0}; + static const WCHAR ldrW[] = {'l','d','r',0}; + static const WCHAR sepW[] = {';',0}; + static const WCHAR bsW[] = {'\\',0}; + WCHAR path[MAX_PATH]; + + GetTempPathW( MAX_PATH, path ); + GetTempFileNameW( path, ldrW, 0, load_test_name ); + GetTempFileNameW( path, ldrW, 0, load_fallback_name ); + DeleteFileW( load_test_name ); + ok( CreateDirectoryW( load_test_name, NULL ), "failed to create dir\n" ); + DeleteFileW( load_fallback_name ); + ok( CreateDirectoryW( load_fallback_name, NULL ), "failed to create dir\n" ); + lstrcpyW( load_path, load_test_name ); + lstrcatW( load_path, sepW ); + lstrcatW( load_path, load_fallback_name ); + lstrcatW( load_path, sepW ); + GetEnvironmentVariableW( pathW, load_path + lstrlenW(load_path), + ARRAY_SIZE(load_path) - lstrlenW(load_path) ); + lstrcatW( load_test_name, bsW ); + lstrcatW( load_test_name, wldr_nameW ); + lstrcatW( load_fallback_name, bsW ); + lstrcatW( load_fallback_name, wldr_nameW ); + MultiByteToWideChar( CP_ACP, 0, fallback_dll, -1, path, MAX_PATH ); + MoveFileW( path, load_fallback_name ); +} + +static void delete_load_path(void) +{ + WCHAR *p; + + DeleteFileW( load_test_name ); + for (p = load_test_name + lstrlenW(load_test_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_test_name ); + DeleteFileW( load_fallback_name ); + for (p = load_fallback_name + lstrlenW(load_fallback_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_fallback_name ); +} + static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) { if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) @@ -521,12 +572,14 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG const void *section_data, int line ) { char dll_name[MAX_PATH]; + WCHAR path[MAX_PATH]; + UNICODE_STRING name; LARGE_INTEGER size; HANDLE file, map; - NTSTATUS status; + NTSTATUS status, expect_status, ldr_status; ULONG file_size; - BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; - HMODULE mod; + BOOL has_code = FALSE, il_only = FALSE, want_32bit = FALSE, expect_fallback = FALSE, wrong_machine = FALSE; + HMODULE mod = 0, ldr_mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -536,6 +589,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + expect_status = status; + if (get_com_dir_size( nt_header )) { /* invalid COR20 header seems to corrupt internal loader state on Windows */ @@ -587,8 +642,56 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( mod != NULL || broken(il_only) || /* <= win7 */ broken( wrong_machine ), /* win8 */ "%u: loading failed err %u\n", line, GetLastError() ); + if (!mod && wrong_machine) expect_status = STATUS_INVALID_IMAGE_FORMAT; } if (mod) FreeLibrary( mod ); + expect_fallback = !mod; + } + + /* test fallback to another dll further in the load path */ + + MultiByteToWideChar( CP_ACP, 0, dll_name, -1, path, MAX_PATH ); + CopyFileW( path, load_test_name, FALSE ); + pRtlInitUnicodeString( &name, wldr_nameW ); + ldr_status = pLdrLoadDll( load_path, 0, &name, &ldr_mod ); + if (!ldr_status) + { + GetModuleFileNameW( ldr_mod, path, MAX_PATH ); + if (!lstrcmpiW( path, load_test_name )) + { + if (!expect_status) + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + else + ok( !expect_fallback, "%u: got test dll but expected failure %x\n", line, expect_status ); + } + else if (!lstrcmpiW( path, load_fallback_name )) + { + trace( "%u: loaded fallback\n", line ); + if (!expect_status) + ok( expect_fallback || + /* win10 also falls back for 32-bit dll without code, even though it could be loaded */ + (is_win64 && !has_code && + nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC), + "%u: got fallback but expected test dll\n", line ); + else + ok( broken(expect_status == STATUS_INVALID_IMAGE_FORMAT), /* <= vista */ + "%u: got fallback but expected failure %x\n", line, expect_status ); + } + else ok( 0, "%u: got unexpected path %s instead of %s\n", line, wine_dbgstr_w(path), wine_dbgstr_w(load_test_name)); + pLdrUnloadDll( ldr_mod ); + } + else if (ldr_status == STATUS_DLL_INIT_FAILED || ldr_status == STATUS_ACCESS_VIOLATION) + { + /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + } + else todo_wine_if( !expect_status ) + { + ok( ldr_status == expect_status || + broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), + "%u: wrong status %x/%x\n", line, ldr_status, expect_status ); + ok( !expect_fallback || broken(il_only) || broken(wrong_machine), + "%u: failed with %x expected fallback\n", line, ldr_status ); } done: @@ -995,7 +1098,6 @@ static void test_Loader(void) nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.OptionalHeader.SectionAlignment = page_size; - nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; nt_header.OptionalHeader.FileAlignment = page_size; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); @@ -1006,6 +1108,10 @@ static void test_Loader(void) section.VirtualAddress = page_size; section.Misc.VirtualSize = page_size; + create_test_dll_sections( &dos_header, &nt_header, &section, section_data, dll_name ); + init_load_path( dll_name ); + + nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); @@ -1336,6 +1442,7 @@ static void test_Loader(void) } section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; + delete_load_path(); } static void test_filenames(void) @@ -3721,6 +3828,9 @@ START_TEST(loader) pNtFreeVirtualMemory = (void *)GetProcAddress(ntdll, "NtFreeVirtualMemory"); pLdrLockLoaderLock = (void *)GetProcAddress(ntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); + pLdrLoadDll = (void *)GetProcAddress(ntdll, "LdrLoadDll"); + pLdrUnloadDll = (void *)GetProcAddress(ntdll, "LdrUnloadDll"); + pRtlInitUnicodeString = (void *)GetProcAddress(ntdll, "RtlInitUnicodeString"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData");

1 0

Alexandre Julliard : kernel32/tests: Try loading the dll also for matching platform type.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 5613526bd41a76b3e0effa10868ced85b77d8efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5613526bd41a76b3e0effa10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:00 2019 +0100 kernel32/tests: Try loading the dll also for matching platform type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 54 +++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cc5af21..89a3f31 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -508,6 +508,14 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) +{ + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + return ((const IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + else + return ((const IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; +} + /* helper to test image section mapping */ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAGE_SECTION_HEADER *sections, const void *section_data, int line ) @@ -517,7 +525,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG HANDLE file, map; NTSTATUS status; ULONG file_size; - BOOL has_code; + BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; HMODULE mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -528,6 +536,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + if (get_com_dir_size( nt_header )) + { + /* invalid COR20 header seems to corrupt internal loader state on Windows */ + if (get_com_dir_size( nt_header ) < sizeof(IMAGE_COR20_HEADER)) goto done; + if (!((const IMAGE_COR20_HEADER *)section_data)->Flags) goto done; + } + if (!status) { SECTION_BASIC_INFORMATION info; @@ -540,21 +555,22 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", info.Size.u.HighPart, info.Size.u.LowPart, file_size ); has_code = query_image_section( line, dll_name, nt_header, section_data ); + + if (get_com_dir_size( nt_header )) + { + const IMAGE_COR20_HEADER *cor_header = section_data; + il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; + if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; + } + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); /* test loading dll of wrong 32/64 bitness */ if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR32_MAGIC : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) { - SetLastError( 0xdeadbeef ); - mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); - if (!has_code && nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + if (!has_code && is_win64) { - BOOL il_only = FALSE, want_32bit = FALSE; - if (((const IMAGE_NT_HEADERS32 *)nt_header)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress) - { - const IMAGE_COR20_HEADER *cor_header = section_data; - il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; - if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; - } ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ "%u: loading failed err %u\n", line, GetLastError() ); } @@ -563,9 +579,19 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); } - if (mod) FreeLibrary( mod ); } + else + { + wrong_machine = (nt_header->FileHeader.Machine == get_alt_machine( nt_header_template.FileHeader.Machine )); + + ok( mod != NULL || broken(il_only) || /* <= win7 */ + broken( wrong_machine ), /* win8 */ + "%u: loading failed err %u\n", line, GetLastError() ); + } + if (mod) FreeLibrary( mod ); } + +done: if (map) CloseHandle( map ); CloseHandle( file ); DeleteFileA( dll_name ); @@ -736,6 +762,7 @@ static void test_Loader(void) nt_header.OptionalHeader.SizeOfImage = td[i].size_of_image; nt_header.OptionalHeader.SizeOfHeaders = td[i].size_of_headers; + section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); SetLastError(0xdeadbeef); @@ -3728,7 +3755,6 @@ START_TEST(loader) return; } - test_Loader(); test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); @@ -3736,4 +3762,6 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + /* loader test must be last, it can corrupt the internal loader state on Windows */ + test_Loader(); }

1 0

Alexandre Julliard : kernel32/tests: Add helper function for machine type manipulations.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 27193d36af35f7cae981eba70aebe44b4c282c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27193d36af35f7cae981eba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:22:08 2019 +0100 kernel32/tests: Add helper function for machine type manipulations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 23dfc93..cc5af21 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -167,6 +167,32 @@ static IMAGE_SECTION_HEADER section = static const char filler[0x1000]; static const char section_data[0x10] = "section data"; +/* return an alternate machine of the same 32/64 bitness */ +static WORD get_alt_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_ARMNT; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_AMD64; + } + return 0; +} + +/* return the machine of the alternate 32/64 bitness */ +static WORD get_alt_bitness_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_AMD64; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_ARMNT; + } + return 0; +} + static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, const IMAGE_NT_HEADERS *nt_header, char dll_name[MAX_PATH] ) { @@ -692,7 +718,7 @@ static void test_Loader(void) SIZE_T size; BOOL ret; NTSTATUS status; - WORD alt_machine, orig_machine = nt_header_template.FileHeader.Machine; + WORD orig_machine = nt_header_template.FileHeader.Machine; IMAGE_NT_HEADERS nt_header; IMAGE_COR20_HEADER cor_header; @@ -1013,26 +1039,12 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); @@ -1118,7 +1130,7 @@ static void test_Loader(void) ok( status == (is_wow64 ? STATUS_INVALID_IMAGE_FORMAT : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); - nt64.FileHeader.Machine = alt_machine; + nt64.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, section_data, __LINE__ ); ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); @@ -1232,7 +1244,7 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(!status) /* win8 */, "NtCreateSection error %08x\n", status ); - nt32.FileHeader.Machine = alt_machine; + nt32.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status );

1 0

Matteo Bruni : ddraw: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 3c87df0bc06761be4fa12ff8f64674b5c078311c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c87df0bc06761be4fa12ff8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:08 2019 +0100 ddraw: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 48803f8..4b58b75 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3471,7 +3471,7 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -3663,7 +3663,7 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2ba29a7..4b4af63 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -131,8 +131,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, desc.byte_width = new_size * sizeof(*indices); desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -639,7 +638,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer)))

1 0