May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input().
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 620e2d671860799830e4d79ff19bb0a8f5fd9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620e2d671860799830e4d79ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:02 2017 +0200 wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input(). We declare min(vec4_varyings(4, gl_info), input_count) shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef6b759..20e1b0b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6791,8 +6791,9 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p { struct wined3d_string_buffer *buffer = &priv->shader_buffer; + input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", min(vec4_varyings(4, gl_info), input_count)); + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory5.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: a7aca059f27e68b6991c4dec04a59b576b1f45b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7aca059f27e68b6991c4dec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 22:38:15 2017 +0300 dwrite: Update to IDWriteFactory5. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 50 +++---- dlls/dwrite/gdiinterop.c | 12 +- dlls/dwrite/layout.c | 14 +- dlls/dwrite/main.c | 346 ++++++++++++++++++++++++++----------------- dlls/dwrite/tests/font.c | 11 +- 7 files changed, 271 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7aca059f27e68b6991c4…

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHScale().
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 8b1df91902d9809d02df7996b64c6ff187ed6609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1df91902d9809d02df7996b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:29 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHScale(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5a5eccf..6effa74 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -25,10 +25,6 @@ #define ARRAY_SIZE 5 -#define admitted_error 0.0001f - -#define relative_error(exp, out) (fabsf(exp) < 1e-38f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -3590,8 +3586,9 @@ static void test_D3DXSHRotateZ(void) static void test_D3DXSHScale(void) { + float a[49], b[49], expected, *received_array; unsigned int i, order; - FLOAT a[49], b[49], expected, *received_array; + BOOL equal; for (i = 0; i < 49; i++) { @@ -3611,7 +3608,8 @@ static void test_D3DXSHScale(void) /* D3DXSHScale does not modify the elements of the array after the order * order-th element */ else expected = a[i]; - ok(relative_error(b[i], expected) < admitted_error, "order %d, element %d, expected %f, received %f\n", order, i, expected, b[i]); + equal = compare_float(b[i], expected, 0); + ok(equal, "order %u, element %u, expected %.8e, received %.8e.\n", order, i, expected, b[i]); } } }

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXFloat_Array().
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 38587126f1b949708d045250a41dfcba8b26fe53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38587126f1b949708d045250a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:31 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXFloat_Array(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 258e959..2cf22a4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2513,7 +2513,7 @@ static void test_D3DXFloat_Array(void) out = D3DXFloat16To32Array(&single.f, &half, 0); ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); - for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) + for (i = 0; i < ARRAY_SIZE(testdata); ++i) { out = D3DXFloat32To16Array(&half, &testdata[i].single_in.f, 1); ok(out == &half, "Got %p, expected %p.\n", out, &half);

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight().
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 1db76b03bdba3eb67ffdc69455be9a9b24b13c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db76b03bdba3eb67ffdc6945… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:28 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 171 ++++++++++++++++++++++++--------------------- 1 file changed, 92 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1db76b03bdba3eb67ffdc…

1 0

Paul Gofman : d3dx9/tests: Add tests for setting strings in effect.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 97dcf42ff2c21dd521f79916bf66900c8cc6f68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dcf42ff2c21dd521f79916b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 5 14:34:31 2017 +0300 d3dx9/tests: Add tests for setting strings in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c0ff4bd..6e8024f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2402,12 +2402,18 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) static void test_effect_setvalue_object(IDirect3DDevice9 *device) { - ID3DXEffect *effect; - D3DXHANDLE parameter; - IDirect3DTexture9 *texture; + static const char expected_string[] = "test_string_1"; + static const char expected_string2[] = "test_longer_string_2"; + static const char *expected_string_array[] = {expected_string, expected_string2}; + const char *string_array[ARRAY_SIZE(expected_string_array)]; + const char *string, *string2; IDirect3DTexture9 *texture_set; - HRESULT hr; + IDirect3DTexture9 *texture; + D3DXHANDLE parameter; + ID3DXEffect *effect; + unsigned int i; ULONG count; + HRESULT hr; hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); @@ -2434,6 +2440,47 @@ static void test_effect_setvalue_object(IDirect3DDevice9 *device) count = IDirect3DTexture9_Release(texture); ok(!count, "Got reference count %u, expected 0.\n", count); + hr = effect->lpVtbl->SetString(effect, "s", expected_string); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + string = NULL; + hr = effect->lpVtbl->GetString(effect, "s", &string); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetString(effect, "s", &string2); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(string != expected_string, "String pointers are the same.\n"); + ok(string == string2, "String pointers differ.\n"); + todo_wine + ok(!strcmp(string, expected_string), "Unexpected string '%s'.\n", string); + + string = expected_string2; + hr = effect->lpVtbl->SetValue(effect, "s", &string, sizeof(string) - 1); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetValue(effect, "s", &string, sizeof(string)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetValue(effect, "s", &string, sizeof(string) * 2); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + string = NULL; + hr = effect->lpVtbl->GetValue(effect, "s", &string, sizeof(string)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(string != expected_string2, "String pointers are the same.\n"); + todo_wine + ok(!strcmp(string, expected_string2), "Unexpected string '%s'.\n", string); + + hr = effect->lpVtbl->SetValue(effect, "s_2", expected_string_array, + sizeof(expected_string_array)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetValue(effect, "s_2", string_array, + sizeof(string_array)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(expected_string_array); ++i) + { + todo_wine + ok(!strcmp(string_array[i], expected_string_array[i]), "Unexpected string '%s', i %u.\n", + string_array[i], i); + } effect->lpVtbl->Release(effect); }

1 0

Nikolay Sivov : user32/msgbox: Fix static control id.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 9ee82b9465c33ecf28ca61c4f6cd8434d242fb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee82b9465c33ecf28ca61c4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 17:49:59 2017 +0300 user32/msgbox: Fix static control id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/msgbox.c | 5 +---- dlls/user32/resources.h | 2 +- dlls/user32/tests/dialog.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 0839f97..d3d11d6 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -28,15 +28,12 @@ #include "winternl.h" #include "dlgs.h" #include "user_private.h" +#include "resources.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dialog); WINE_DECLARE_DEBUG_CHANNEL(msgbox); -#define MSGBOX_IDICON stc1 -#define MSGBOX_IDTEXT 100 -#define IDS_ERROR 2 - struct ThreadWindows { UINT numHandles; diff --git a/dlls/user32/resources.h b/dlls/user32/resources.h index d9cc9cc..3cb8c48 100644 --- a/dlls/user32/resources.h +++ b/dlls/user32/resources.h @@ -26,5 +26,5 @@ #define MDI_IDC_LISTBOX 100 #define IDS_MDI_MOREWINDOWS 13 #define MSGBOX_IDICON stc1 -#define MSGBOX_IDTEXT 100 +#define MSGBOX_IDTEXT 0xffff #define IDS_ERROR 2 diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index a37c678..6b9d704 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1522,6 +1522,47 @@ static void test_timer_message(void) DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); } +static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + if (code == HCBT_ACTIVATE) + { + HWND msgbox = (HWND)wParam, msghwnd; + char text[64]; + + if (msgbox) + { + text[0] = 0; + GetWindowTextA(msgbox, text, sizeof(text)); + ok(!strcmp(text, "MSGBOX caption"), "Unexpected window text \"%s\"\n", text); + + msghwnd = GetDlgItem(msgbox, 0xffff); + ok(msghwnd != NULL, "Expected static control\n"); + + text[0] = 0; + GetWindowTextA(msghwnd, text, sizeof(text)); + ok(!strcmp(text, "Text"), "Unexpected window text \"%s\"\n", text); + + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); + } + } + + return CallNextHookEx(NULL, code, wParam, lParam); +} + +static void test_MessageBox(void) +{ + HHOOK hook; + int ret; + + hook = SetWindowsHookExA(WH_CBT, msgbox_hook_proc, NULL, GetCurrentThreadId()); + + ret = MessageBoxA(NULL, "Text", "MSGBOX caption", MB_OKCANCEL); + ok(ret == IDCANCEL, "got %d\n", ret); + + UnhookWindowsHookEx(hook); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -1539,4 +1580,5 @@ START_TEST(dialog) test_MessageBoxFontTest(); test_SaveRestoreFocus(); test_timer_message(); + test_MessageBox(); }

1 0

Nikolay Sivov : api-ms-win-core-memory-l1-1-2: Update spec file.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 36b7d6f51c24dc2e017576ae25a68aaaa7259210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b7d6f51c24dc2e017576ae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 09:44:38 2017 +0300 api-ms-win-core-memory-l1-1-2: Update spec file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 2ad54b7..866d20e 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -1,8 +1,39 @@ @ stdcall AllocateUserPhysicalPages(long ptr ptr) kernel32.AllocateUserPhysicalPages @ stub AllocateUserPhysicalPagesNuma +@ stub CreateFileMappingFromApp +@ stub CreateFileMappingNumaW +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile @ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetMemoryErrorHandlingCapabilities +@ stub GetProcessWorkingSetSizeEx +@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch @ stub MapUserPhysicalPages +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stub MapViewOfFileFromApp +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stub PrefetchVirtualMemory +@ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification +@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch +@ stub SetProcessWorkingSetSizeEx +@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stub UnmapViewOfFileEx @ stub UnregisterBadMemoryNotification +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stdcall VirtualAllocEx(long ptr long long long) kernel32.VirtualAllocEx @ stub VirtualAllocExNuma +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualLock(ptr long) kernel32.VirtualLock +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stdcall VirtualProtectEx(long ptr long long ptr) kernel32.VirtualProtectEx +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory

1 0

Nikolay Sivov : webservices/tests: Enable WsInitializeMessage() tests ( Coverity).
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: aaf4e75a62bb711c4f25968af91ae238595f5f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf4e75a62bb711c4f25968af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 23:24:57 2017 +0300 webservices/tests: Enable WsInitializeMessage() tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index f6a6ba1..868ead5 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -165,7 +165,6 @@ static void test_WsInitializeMessage(void) WS_ADDRESSING_VERSION addr_version; BOOL addressed; - return; hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Nikolay Sivov : ntdll: Move EventWrite() to ntdll.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 77887b474e60d21157cc1c59784b2b4c6c42dedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=77887b474e60d21157cc1c597… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 17:51:20 2017 +0300 ntdll: Move EventWrite() to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ---------- dlls/ntdll/misc.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0f9e776..ff56343 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -293,7 +293,7 @@ @ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister @ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister -@ stdcall EventWrite(int64 ptr long ptr) +@ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite # @ stub EventWriteEndScenario # @ stub EventWriteEx # @ stub EventWriteStartScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 059c34d..1547aa4 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -835,16 +835,6 @@ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) } /****************************************************************************** - * EventWrite [ADVAPI32.@] - */ -ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, - PEVENT_DATA_DESCRIPTOR data ) -{ - FIXME("%s, %p, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor, count, data); - return ERROR_SUCCESS; -} - -/****************************************************************************** * EventWriteTransfer [ADVAPI32.@] */ ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity, diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index bf786d6..8f0c51c 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -466,3 +466,13 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); return FALSE; } + +/****************************************************************************** + * EtwEventWrite (NTDLL.@) + */ +ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor, ULONG count, + EVENT_DATA_DESCRIPTOR *data ) +{ + FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4decd3a..9adf1ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -45,6 +45,7 @@ @ stdcall EtwEventRegister(ptr ptr ptr ptr) @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) +@ stdcall EtwEventWrite(int64 ptr long ptr) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) @ stdcall EtwUnregisterTraceGuids(int64)

1 0