July 2020 - Wine-devel - list.winehq.org

[PATCH vkd3d 4/5] vkd3d-shader: Add a compiler message for unsupported DXBC versions.
by Henri Verbeet 23 Jul '20

23 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5a070ad..8e5c49c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1992,6 +1992,8 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (version != 0x00000001) { WARN("Got unexpected DXBC version %#x.\n", version); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION, + "DXBC version %#x is not supported.", version); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 40f986b..f9bd6ab 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -64,6 +64,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, + VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Validate DXBC checksums.
by Henri Verbeet 23 Jul '20

23 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 18 ++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b5c5c77..5a070ad 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1944,6 +1944,7 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_message_context *message_context, int (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { + uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; DWORD chunk_count; @@ -1970,8 +1971,21 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me return VKD3D_ERROR_INVALID_ARGUMENT; } - WARN("Ignoring DXBC checksum.\n"); - skip_dword_unknown(&ptr, 4); + read_dword(&ptr, &checksum[0]); + read_dword(&ptr, &checksum[1]); + read_dword(&ptr, &checksum[2]); + read_dword(&ptr, &checksum[3]); + vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum); + if (memcmp(checksum, calculated_checksum, sizeof(checksum))) + { + WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match " + "calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + checksum[0], checksum[1], checksum[2], checksum[3], + calculated_checksum[0], calculated_checksum[1], + calculated_checksum[2], calculated_checksum[3]); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, "Invalid DXBC checksum."); + return VKD3D_ERROR_INVALID_ARGUMENT; + } read_dword(&ptr, &version); TRACE("version: %#x.\n", version); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5cf8e8e..40f986b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -63,6 +63,7 @@ enum vkd3d_shader_error { VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Add a compiler message for invalid DXBC magic.
by Henri Verbeet 23 Jul '20

23 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2901998..b5c5c77 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1966,6 +1966,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC, "Invalid DXBC magic."); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b820012..5cf8e8e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -62,6 +62,7 @@ enum vkd3d_shader_error { VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, + VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.11.0

1 0

[PATCH 2/2] jscript: Fix `this` within IDispatchEx::InvokeEx
by Puetz Kevin A 23 Jul '20

23 Jul '20

Subject: jscript: Fix `this` within IDispatchEx::InvokeEx Latent bug revealed by 614ea7e6243ead003bcfe4624895154972f3445f; Now that cross-context calls go through disp_call* instead of jsdisp_call*, and thus through InvokeEx, the `this` pointer is lost when calling methods inherited from a prototype. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- Jacek: this is mostly per our discussion IRC yesterday, but it seems I also had to make a similar change in the case for PROP_JSVAL for the case of an object subclassed with members written in Jscript to work. Seems reasonable, and passes the tests I came up with, but does that seem right to you too? Index: wine/dlls/jscript/dispex.c =================================================================== --- wine.orig/dlls/jscript/dispex.c +++ wine/dlls/jscript/dispex.c @@ -419,7 +419,7 @@ static HRESULT invoke_prop_func(jsdisp_t return hres; } case PROP_PROTREF: - return invoke_prop_func(This->prototype, jsthis, This->prototype->props+prop->u.ref, + return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); case PROP_JSVAL: { if(!is_object_instance(prop->u.val)) { @@ -429,7 +429,7 @@ static HRESULT invoke_prop_func(jsdisp_t TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - return disp_call_value(This->ctx, get_object(prop->u.val), jsthis, flags, argc, argv, r); + return disp_call_value(This->ctx, get_object(prop->u.val), jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, flags, argc, argv, r); } case PROP_ACCESSOR: FIXME("accessor\n"); Index: wine/dlls/jscript/tests/run.c =================================================================== --- wine.orig/dlls/jscript/tests/run.c +++ wine/dlls/jscript/tests/run.c @@ -2784,7 +2784,7 @@ static void test_invokeex(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *dispex; - VARIANT v; + VARIANT v, arg; BSTR str; HRESULT hres; @@ -2834,6 +2834,92 @@ static void test_invokeex(void) IDispatchEx_Release(dispex); IActiveScript_Release(script); + + // test InvokeEx following prototype chain of builtin object (PROP_PROTREF) + hres = parse_script_expr(L"o = new Array(); o.push(\"foo\"); o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"push"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + dp.rgvarg = &arg; + dp.cArgs = 1; + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(L"bar"); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + + str = SysAllocString(L"join"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + V_BSTR(&arg) = SysAllocString(L";"); + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo;bar"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + VariantClear(&v); + + dp.rgvarg = NULL; + dp.cArgs = 0; + + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); + + // test InvokeEx following prototype chain of JScript objects (PROP_JSVAL) + hres = parse_script_expr(L"function c() { this.func = function() { return this.prop1 * this.prop2 }; this.prop1 = 6; this.prop2 = 9; }; var o = new c(); o.prop2 = 7; o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"prop1"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"prop2"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 7, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_variant(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); } static void test_eval(void)

1 0

[PATCH] quartz: Allow the arguments to IMediaSeeking::GetPositions() to be NULL.
by Zebediah Figura 22 Jul '20

22 Jul '20

This allows "UNDER NIGHT IN-BIRTH Exe:Late" to render video. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 18 ++++++++++-------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e135f4b6cc7..3b06d32c20a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2441,16 +2441,18 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * return hr; } -static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, - LONGLONG *pStop) +static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, + LONGLONG *current, LONGLONG *stop) { - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = S_OK; - TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); - hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); - if (SUCCEEDED(hr)) - hr = IMediaSeeking_GetStopPosition(iface, pStop); + TRACE("graph %p, current %p, stop %p.\n", graph, current, stop); + + if (current) + hr = IMediaSeeking_GetCurrentPosition(iface, current); + if (SUCCEEDED(hr) && stop) + hr = IMediaSeeking_GetStopPosition(iface, stop); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9219b30cec7..4fcd27b2918 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4098,14 +4098,14 @@ static void test_graph_seeking(void) ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, &stop); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); current = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, NULL); -- 2.27.0

1 2

[PATCH 1/3] gdiplus/tests: Add metafile FillRegion test.
by Shawn M. Chapla 22 Jul '20

22 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 97 +++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 8179e1a5fd..f0b31b4f9c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3174,6 +3174,102 @@ static void test_unknownfontdecode(void) GdipDisposeImage((GpImage*)metafile); } +static const emfplus_record fillregion_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeRegion << 8, 1 }, + { EmfPlusRecordTypeFillRegion, 0x8000, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeRegion << 8) | 2, 1 }, + { EmfPlusRecordTypeFillRegion, 2, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_fillregion(void) +{ + static const GpPointF dst_points[3] = {{0.0, 0.0}, {100.0, 0.0}, {0.0, 100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpRectF solidrect = {20.0, 20.0, 20.0, 20.0}; + static const GpRectF hatchrect = {50.0, 50.0, 20.0, 20.0}; + + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + GpBitmap *bitmap; + GpBrush *solidbrush, *hatchbrush; + GpRegion *solidregion, *hatchregion; + ARGB color; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateRegionRect(&solidrect, &solidregion); + expect(Ok, stat); + + stat = GdipCreateSolidFill(0xffaabbcc, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipFillRegion(graphics, solidbrush, solidregion); + expect(Ok, stat); + + stat = GdipCreateRegionRect(&hatchrect, &hatchregion); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, 0xffff0000, 0xff0000ff, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipFillRegion(graphics, hatchbrush, hatchregion); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + expect(Ok, stat); + + check_metafile(metafile, fillregion_records, "regionfill metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "regionfill.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, fillregion_records, "regionfill playback", + dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 25, 25, &color); + expect(Ok, stat); + todo_wine expect(0xffaabbcc, color); + + stat = GdipBitmapGetPixel(bitmap, 56, 56, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 57, 57, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + GdipDeleteRegion(solidregion); + GdipDeleteRegion(hatchregion); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3225,6 +3321,7 @@ START_TEST(metafile) test_restoredc(); test_drawdriverstring(); test_unknownfontdecode(); + test_fillregion(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

3 7

[PATCH 3/3] windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565.
by Ziqing Hui 22 Jul '20

22 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- We have "32bpp ARGB", "32bpp XRGB", "64bpp ABGR", "96bpp ABGR", "128bpp ABGR". For the 16bpp 5:6:5 image, it should be "RGB565" instead of "BGR565". dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Simplify init_decoder().
by Ziqing Hui 22 Jul '20

22 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Remove the test data in test_dds_decoder_initialize().
by Ziqing Hui 22 Jul '20

22 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 87 ++++++++++++---------------- 1 file changed, 36 insertions(+), 51 deletions(-)

2 1

[PATCH 5/5] include: Fix conflicting definitions of NULL, wchar_t, wint_t, wctype_t.
by Puetz Kevin A 22 Jul '20

22 Jul '20

When <basetyps.h> defines wchar_t, it must obey -f(no-)short-wchar by referring to __WCHAR_TYPE__ which may not be `unsigned short`. Similarly, windef.h defining NULL may need to use GCC's __null. Otherwise one-definition-rule problems arise depending on whether wine or libc headers are included first. Implementing these by deferring to the C89-specified libc headers, (or msvcrt's versions with -mno-cygwin) ensures matching definitions. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/basetyps.h | 8 +++++--- include/tchar.h | 9 +-------- include/windef.h | 11 +++++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index b0dd5d77f4..e6243d5a59 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -91,9 +91,11 @@ typedef unsigned long error_status_t; #endif #ifndef _WCHAR_T_DEFINED -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif +# ifndef __cplusplus +# define __need_wchar_t // tells GCC's stddef.h to only define wchar_t +# include <stddef.h> +# undef __need_wchar_t +# endif #define _WCHAR_T_DEFINED #endif diff --git a/include/tchar.h b/include/tchar.h index 6c9035c219..0049ea7e7a 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -232,14 +232,7 @@ extern "C" { #endif /* tchar mappings */ #ifdef _UNICODE -#if !defined(_WINT_T_DEFINED) && !defined(__WINT_TYPE__) -typedef unsigned short wint_t; -#endif - -#ifndef _WCTYPE_T_DEFINED -typedef unsigned short wctype_t; -#define _WCTYPE_T_DEFINED -#endif +#include <wchar.h> #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) diff --git a/include/windef.h b/include/windef.h index 521c3ab451..e26ffe6ff4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -206,11 +206,14 @@ extern "C" { /* Misc. constants. */ -#undef NULL -#ifdef __cplusplus -#define NULL 0 -#else +#ifndef NULL +#ifdef RC_INVOKED #define NULL ((void*)0) +#else +#define __need_NULL // tells GCC's stddef.h to only define NULL +#include <stddef.h> +#undef __need_NULL +#endif #endif #ifdef FALSE

2 6