February 2022 - Wine-commits

Alexandre Julliard : tzres: Build in data-only mode.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 457c5df7d33144e45e0b275cf3cd060ec8403f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457c5df7d33144e45e0b275c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:20 2022 +0100 tzres: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/tzres/Makefile.in b/dlls/tzres/Makefile.in index 86e5bcdbf7b..8d4710e7b78 100644 --- a/dlls/tzres/Makefile.in +++ b/dlls/tzres/Makefile.in @@ -1,2 +1,5 @@ MODULE = tzres.dll + +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = tzres.rc

1 0

Alexandre Julliard : usp10: Build in data-only mode.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: d5fc074b9f2cf2e52711d832ca76eaaa5277bb8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fc074b9f2cf2e52711d832… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:26 2022 +0100 usp10: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/Makefile.in | 2 ++ dlls/usp10/usp10.spec | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 158b7f8d3c9..016891af651 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -1,2 +1,4 @@ MODULE = usp10.dll IMPORTLIB = usp10 + +EXTRADLLFLAGS = -Wb,--data-only diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 5344d21075d..70bce16902d 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() gdi32.LpkPresent @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) gdi32.ScriptApplyDigitSubstitution @ stdcall ScriptApplyLogicalWidth(ptr long long ptr ptr ptr ptr ptr ptr) gdi32.ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr) gdi32.ScriptBreak @@ -21,7 +21,7 @@ @ stdcall ScriptLayout(long ptr ptr ptr) gdi32.ScriptLayout @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) gdi32.ScriptPlace @ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) gdi32.ScriptPlaceOpenType -@ stub ScriptPositionSingleGlyph +@ stdcall ScriptPositionSingleGlyph() gdi32.ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(long ptr) gdi32.ScriptRecordDigitSubstitution @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) gdi32.ScriptShape @ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) gdi32.ScriptShapeOpenType @@ -36,9 +36,9 @@ @ stdcall ScriptString_pLogAttr(ptr) gdi32.ScriptString_pLogAttr @ stdcall ScriptString_pSize(ptr) gdi32.ScriptString_pSize @ stdcall ScriptString_pcOutChars(ptr) gdi32.ScriptString_pcOutChars -@ stub ScriptSubstituteSingleGlyph +@ stdcall ScriptSubstituteSingleGlyph() gdi32.ScriptSubstituteSingleGlyph @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) gdi32.ScriptTextOut @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) gdi32.ScriptXtoCP -@ stub UspAllocCache -@ stub UspAllocTemp -@ stub UspFreeMem +@ stdcall UspAllocCache() gdi32.UspAllocCache +@ stdcall UspAllocTemp() gdi32.UspAllocTemp +@ stdcall UspFreeMem() gdi32.UspFreeMem

1 0

Alexandre Julliard : wmi: Build in data-only mode.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 141be028802f1675366802d49af01982525c2e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=141be028802f1675366802d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:32 2022 +0100 wmi: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index ac1e2f0f673..de7719654ff 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -1,2 +1,4 @@ MODULE = wmi.dll IMPORTS = advapi32 + +EXTRADLLFLAGS = -Wb,--data-only

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_gl pointer to wined3d_context_gl_create_bo().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 7c16fb7ce311e0d7e5a4c7d3ae586cd7ec54edc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c16fb7ce311e0d7e5a4c7d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:09 2022 -0600 wined3d: Pass a wined3d_device_gl pointer to wined3d_context_gl_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +- dlls/wined3d/context_gl.c | 116 +---------------------------------------- dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/texture.c | 5 +- dlls/wined3d/view.c | 5 +- dlls/wined3d/wined3d_private.h | 6 +-- 6 files changed, 127 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c16fb7ce311e0d7e5a4…

1 0

Zebediah Figura : wined3d: Protect access to the OpenGL wined3d_allocator with a critical section.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 4a3cefab75e797398923c54340beb5764c42a28e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a3cefab75e797398923c543… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:10 2022 -0600 wined3d: Protect access to the OpenGL wined3d_allocator with a critical section. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ dlls/wined3d/context_gl.c | 12 ++++++++++-- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/wined3d_private.h | 11 +++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2e31d140dd5..bc54f46222f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4274,6 +4274,8 @@ static HRESULT adapter_gl_create_device(struct wined3d *wined3d, const struct wi return hr; } + wined3d_lock_init(&device_gl->allocator_cs, "wined3d_device_gl.allocator_cs"); + *device = &device_gl->d; return WINED3D_OK; } @@ -4283,6 +4285,8 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) struct wined3d_device_gl *device_gl = wined3d_device_gl(device); wined3d_device_cleanup(&device_gl->d); + wined3d_lock_cleanup(&device_gl->allocator_cs); + heap_free(device_gl->retired_blocks); heap_free(device_gl); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8901bafcce3..8217d04686c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2629,6 +2629,14 @@ static void wined3d_context_gl_poll_fences(struct wined3d_context_gl *context_gl } } +static void wined3d_device_gl_free_memory(struct wined3d_device_gl *device_gl, struct wined3d_allocator_block *block) +{ + assert(block->chunk->allocator == &device_gl->allocator); + wined3d_device_gl_allocator_lock(device_gl); + wined3d_allocator_block_free(block); + wined3d_device_gl_allocator_unlock(device_gl); +} + static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *context_gl) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); @@ -2651,7 +2659,7 @@ static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *cont continue; } - wined3d_allocator_block_free(r->block); + wined3d_device_gl_free_memory(device_gl, r->block); if (i != --count) *r = blocks[count]; else @@ -2718,7 +2726,7 @@ static void wined3d_context_gl_destroy_allocator_block(struct wined3d_context_gl if (device_gl->completed_fence_id > fence_id) { - wined3d_allocator_block_free(block); + wined3d_device_gl_free_memory(device_gl, block); TRACE("Freed block %p.\n", block); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84d2e3a0ce8..e302e1917a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1059,20 +1059,25 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct struct wined3d_allocator *allocator = &device_gl->allocator; struct wined3d_allocator_block *block; + wined3d_device_gl_allocator_lock(device_gl); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + wined3d_device_gl_allocator_unlock(device_gl); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) { + wined3d_device_gl_allocator_unlock(device_gl); *id = 0; return NULL; } *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; + wined3d_device_gl_allocator_unlock(device_gl); return block; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48b760edc1b..96ce75fbb58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4194,6 +4194,7 @@ struct wined3d_device_gl /* Textures for when no other textures are bound. */ struct wined3d_dummy_textures dummy_textures; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; uint64_t completed_fence_id; uint64_t current_fence_id; @@ -4212,6 +4213,16 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) +{ + EnterCriticalSection(&device_gl->allocator_cs); +} + +static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl *device_gl) +{ + LeaveCriticalSection(&device_gl->allocator_cs); +} + bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Allow passing a NULL context to wined3d_device_gl_create_bo().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 95173d6f6592a3ebd1985277a080f007efcb815c URL: https://source.winehq.org/git/wine.git/?a=commit;h=95173d6f6592a3ebd1985277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:11 2022 -0600 wined3d: Allow passing a NULL context to wined3d_device_gl_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e302e1917a6..9488e8c642e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -961,11 +961,15 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct wined3d_allocator *allocator, struct wined3d_context *context, unsigned int memory_type, size_t chunk_size) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_allocator_chunk_gl *chunk_gl; + struct wined3d_context_gl *context_gl; TRACE("allocator %p, context %p, memory_type %u, chunk_size %zu.\n", allocator, context, memory_type, chunk_size); + if (!context) + return NULL; + context_gl = wined3d_context_gl(context); + if (!(chunk_gl = heap_alloc(sizeof(*chunk_gl)))) return NULL; @@ -1063,12 +1067,13 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { - *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + if (context_gl) + *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); wined3d_device_gl_allocator_unlock(device_gl); return NULL; } - if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) + if (!(block = wined3d_allocator_allocate(allocator, context_gl ? &context_gl->c : NULL, memory_type, size))) { wined3d_device_gl_allocator_unlock(device_gl); *id = 0; @@ -1119,7 +1124,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset; } - else + else if (context_gl) { WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); @@ -1133,6 +1138,9 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win } else { + if (!context_gl) + return false; + GL_EXTCALL(glGenBuffers(1, &id)); if (!id) {

1 0

Zebediah Figura : wined3d: Don't use persistent BOs from the client thread if we might need to do vertex attribute conversion.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: ec5a71068b850b6c2aa98b81393b1479465c249e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5a71068b850b6c2aa98b81… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:12 2022 -0600 wined3d: Don't use persistent BOs from the client thread if we might need to do vertex attribute conversion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 +++++++++ dlls/wined3d/shader_spirv.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d8628cea7..9f4a39cfe7e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3077,12 +3077,21 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str * a texture can be invalidated to even count. */ if (resource->type == WINED3D_RTYPE_BUFFER && (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) { + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; struct wined3d_client_resource *client = &resource->client; struct wined3d_device *device = context->device; struct wined3d_bo_address addr; struct wined3d_bo *bo; uint8_t *map_ptr; + /* We can't use persistent maps if we might need to do vertex attribute + * conversion; that will cause the CS thread to invalidate the BO. */ + if (!d3d_info->xyzrhw || !d3d_info->vertex_bgra || !d3d_info->ffp_generic_attributes) + { + TRACE("Not returning a persistent buffer because we might need to do vertex attribute conversion.\n"); + return NULL; + } + if (flags & WINED3D_MAP_DISCARD) { if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1e6a03040b9..9ad11f34ebd 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1176,6 +1176,8 @@ static void spirv_vertex_pipe_vk_vp_enable(const struct wined3d_context *context static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { memset(caps, 0, sizeof(*caps)); + caps->xyzrhw = TRUE; + caps->ffp_generic_attributes = TRUE; } static uint32_t spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info)

1 0

Dmitry Timoshkov : riched20/tests: Add a test to see what richedit class flavours should be available.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: d54a0e2bea4548bb5d9c0cca9f918d7c46591e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d54a0e2bea4548bb5d9c0cca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 16 10:44:30 2022 +0300 riched20/tests: Add a test to see what richedit class flavours should be available. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f7c00383a..20bf0358712 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8994,6 +8994,38 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %u\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -9003,6 +9035,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE);

1 0

Eric Pouech : newdev: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 6a213b1c67cc9f668bd65c0540225d37bd42771d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a213b1c67cc9f668bd65c05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:28 2022 +0100 newdev: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/Makefile.in | 1 - dlls/newdev/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index 25f2fea0518..c447a388614 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 72e7cbc690d..54f572c3d08 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -101,11 +101,11 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar DIF_NEWDEVICEWIZARD_FINISHINSTALL, }; - TRACE("parent %p, hardware_id %s, inf_path %s, flags %#x, reboot %p.\n", + TRACE("parent %p, hardware_id %s, inf_path %s, flags %#lx, reboot %p.\n", parent, debugstr_w(hardware_id), debugstr_w(inf_path), flags, reboot); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (reboot) *reboot = FALSE; @@ -154,7 +154,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar */ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); return TRUE; } @@ -163,6 +163,6 @@ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOO */ BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); return TRUE; }

1 0

Eric Pouech : ntdsapi: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 23bd3bc237cc90498af8282f5d40dd40d1e367cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bd3bc237cc90498af8282f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:34 2022 +0100 ntdsapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 1 - dlls/ntdsapi/ntdsapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 350a1e2aa5b..263b0d45333 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 2438197a7a3..a6b6c90c9d7 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -218,7 +218,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const CHAR **names, PDS_NAME_RESULTA *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -228,6 +228,6 @@ DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT of DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const WCHAR **names, PDS_NAME_RESULTW *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0