- wine-devel - winehq.org

[PATCH 1/2] user32/tests: Add some tests for classes with non-zero low word instance.
by Dmitry Timoshkov 17 Feb '20

17 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2702fa00b9..b07ff8548f 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -98,6 +98,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) LONG i; WCHAR str[20]; ATOM classatom; + HINSTANCE hInstance2; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -121,6 +122,26 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) "RegisterClass of the same class should fail for the second time\n"); /* Setup windows */ + hInstance2 = (HINSTANCE)(((ULONG_PTR)hInstance & ~0xffff) | 0xdead); + + hTestWnd = CreateWindowW (className, winName, + WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, + 0, hInstance2, 0); +todo_wine_if (!global) + ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); + +todo_wine_if (!global) + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p != %p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); +todo_wine_if (!global) + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, + "Wrong GWL instance %p != %p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); + + DestroyWindow(hTestWnd); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, @@ -128,6 +149,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(hTestWnd!=0, "Failed to create window\n"); + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p/%p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance, + "Wrong GWL instance %p/%p for window %s\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance); + + /* test initial values of valid classwords */ for(i=0; i<NUMCLASSWORDS; i++) { @@ -1491,6 +1520,8 @@ START_TEST(class) ClassTest(hInstance,FALSE); ClassTest(hInstance,TRUE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), FALSE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), TRUE); CreateDialogParamTest(hInstance); test_styles(); test_builtinproc(); -- 2.20.1

2 1

[PATCH v3 1/6] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams 16 Feb '20

16 Feb '20

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

1 5

[PATCH] msi: Avoid an uninitialized compiler warning in InstallerImpl_SummaryInformation.
by Gerald Pfeifer 16 Feb '20

16 Feb '20

According to my visually tracing to the sources this looks like a false positive, alas a tricky one, and GCC 10 warns, hence this straightforward approach to silence it - which is conservative programming in any case. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..489adc96a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1837,7 +1837,7 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, UINT ret; HRESULT hr; MSIHANDLE hsuminfo; - IDispatch *dispatch; + IDispatch *dispatch = 0; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) -- 2.25.0

1 0

[PATCH v2] shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Roman Pišl 16 Feb '20

16 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..188524d6a9 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1109,6 +1109,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); info = GetPropW( hWnd, szBrowseFolderInfo ); + if (!info) + return FALSE; switch (msg) { -- 2.20.1

1 0

[PATCH] shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Roman Pišl 16 Feb '20

16 Feb '20

Also checks are added to all other paths where info is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/shell32/brsfolder.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..f226c97822 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1113,15 +1113,19 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, switch (msg) { case WM_NOTIFY: + if (!info) return FALSE; return BrsFolder_OnNotify( info, (UINT)wParam, (LPNMHDR)lParam); case WM_COMMAND: + if (!info) return FALSE; return BrsFolder_OnCommand( info, wParam ); case WM_WINDOWPOSCHANGING: + if (!info) return FALSE; return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam); case WM_SIZE: + if (!info) return FALSE; if (info->layout) /* new style dialogs */ LayoutUpdate(hWnd, info->layout, g_layout_info, ARRAY_SIZE(g_layout_info)); return 0; @@ -1147,18 +1151,23 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETSELECTIONA: + if (!info) return FALSE; return BrsFolder_OnSetSelectionA(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETSELECTIONW: + if (!info) return FALSE; return BrsFolder_OnSetSelectionW(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETEXPANDED: /* unicode only */ + if (!info) return FALSE; return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); case SHV_CHANGE_NOTIFY: + if (!info) return FALSE; return BrsFolder_OnChange(info, (const LPCITEMIDLIST*)wParam, (LONG)lParam); case WM_DESTROY: + if (!info) return FALSE; return BrsFolder_OnDestroy(info); } return FALSE; -- 2.20.1

2 1

[PATCH v2 1/6] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams 15 Feb '20

15 Feb '20

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

1 5

[PATCH] ntdll: Add missing spec file entry for TpStartAsyncIoOperation().
by Nikolay Sivov 15 Feb '20

15 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7aa953ca6c..57055ae34e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1083,6 +1083,7 @@ @ stdcall TpSetTimer(ptr ptr long long) @ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) +@ stdcall TpStartAsyncIoOperation(ptr) @ stdcall TpWaitForTimer(ptr long) @ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) -- 2.25.0

1 0

[PATCH v2] gdiplus: Each pen dash array element must be greater than zero.
by Jeff Smith 15 Feb '20

15 Feb '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/pen.c | 5 +---- dlls/gdiplus/tests/pen.c | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 8bcb91819a..156f90a19d 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, for(i = 0; i < count; i++){ sum += dash[i]; - if(dash[i] < 0.0) + if(dash[i] <= 0.0) return InvalidParameter; } - if(sum == 0.0 && count) - return InvalidParameter; - heap_free(pen->dashes); pen->dashes = NULL; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ceab92acff..85528a3700 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -175,7 +175,7 @@ static void test_dasharray(void) dashes[4] = 14.0; dashes[5] = -100.0; dashes[6] = -100.0; - dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 0.0; + dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 1.0; /* setting the array sets the type to custom */ GdipGetPenDashStyle(pen, &style); @@ -217,6 +217,7 @@ static void test_dasharray(void) expectf(-100.0, dashes[6]); /* Some invalid array values. */ + dashes[9] = 0.0; status = GdipSetPenDashArray(pen, &dashes[7], 5); expect(InvalidParameter, status); dashes[9] = -1.0; -- 2.23.0

2 1

[PATCH 1/3] ntdll: Add threadpool stack information exports.
by Nikolay Sivov 15 Feb '20

15 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Stack sizes are only stored as pool parameters for now. These are meant to replace 178405 and 178406. dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/threadpool.c | 32 ++++++++++++++++++++++ dlls/ntdll/threadpool.c | 50 ++++++++++++++++++++++++++++++++--- include/winternl.h | 2 ++ 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bda..7aa953ca6c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1070,6 +1070,7 @@ @ stdcall TpDisassociateCallback(ptr) @ stdcall TpIsTimerSet(ptr) @ stdcall TpPostWork(ptr) +@ stdcall TpQueryPoolStackInformation(ptr ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) @ stdcall TpReleasePool(ptr) @@ -1078,6 +1079,7 @@ @ stdcall TpReleaseWork(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) +@ stdcall TpSetPoolStackInformation(ptr ptr) @ stdcall TpSetTimer(ptr ptr long long) @ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index bf5493cac0..912a77b82a 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -30,6 +30,7 @@ static NTSTATUS (WINAPI *pTpCallbackMayRunLong)(TP_CALLBACK_INSTANCE *); static VOID (WINAPI *pTpCallbackReleaseSemaphoreOnCompletion)(TP_CALLBACK_INSTANCE *,HANDLE,DWORD); static VOID (WINAPI *pTpDisassociateCallback)(TP_CALLBACK_INSTANCE *); static BOOL (WINAPI *pTpIsTimerSet)(TP_TIMER *); +static NTSTATUS (WINAPI *pTpQueryPoolStackInformation)(TP_POOL *, TP_POOL_STACK_INFORMATION *info); static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpPostWork)(TP_WORK *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); @@ -37,6 +38,7 @@ static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL, static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseTimer)(TP_TIMER *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); +static NTSTATUS (WINAPI *pTpSetPoolStackInformation)(TP_POOL *, TP_POOL_STACK_INFORMATION *info); static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); static VOID (WINAPI *pTpSetTimer)(TP_TIMER *,LARGE_INTEGER *,LONG,LONG); static VOID (WINAPI *pTpSetWait)(TP_WAIT *,HANDLE,LARGE_INTEGER *); @@ -72,12 +74,14 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpDisassociateCallback); NTDLL_GET_PROC(TpIsTimerSet); NTDLL_GET_PROC(TpPostWork); + NTDLL_GET_PROC(TpQueryPoolStackInformation); NTDLL_GET_PROC(TpReleaseCleanupGroup); NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); NTDLL_GET_PROC(TpReleaseTimer); NTDLL_GET_PROC(TpReleaseWait); NTDLL_GET_PROC(TpReleaseWork); + NTDLL_GET_PROC(TpSetPoolStackInformation); NTDLL_GET_PROC(TpSetPoolMaxThreads); NTDLL_GET_PROC(TpSetTimer); NTDLL_GET_PROC(TpSetWait); @@ -601,6 +605,7 @@ static void CALLBACK work2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP static void test_tp_work(void) { + TP_POOL_STACK_INFORMATION stack_info, stack_info2; TP_CALLBACK_ENVIRON environment; TP_WORK *work; TP_POOL *pool; @@ -615,6 +620,33 @@ static void test_tp_work(void) ok(pool != NULL, "expected pool != NULL\n"); pTpSetPoolMaxThreads(pool, 1); + if (pTpQueryPoolStackInformation) + { + status = pTpQueryPoolStackInformation(pool, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + status = pTpSetPoolStackInformation(pool, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "Failed to get stack information, status %#x.\n", status); + ok(stack_info.StackReserve > 0 && stack_info.StackCommit > 0, "Unexpected stack info.\n"); + + stack_info2.StackReserve = 0; + stack_info2.StackCommit = 0; + status = pTpSetPoolStackInformation(pool, &stack_info2); + ok(!status, "Failed to get stack information, status %#x.\n", status); + + memset(&stack_info2, 0xcc, sizeof(stack_info2)); + status = pTpQueryPoolStackInformation(pool, &stack_info2); + ok(!status, "Failed to get stack information, status %#x.\n", status); + ok(!stack_info2.StackReserve && !stack_info2.StackCommit, "Unexpected stack info.\n"); + + /* Restore to original default values. */ + status = pTpSetPoolStackInformation(pool, &stack_info); + ok(!status, "Failed to get stack information, status %#x.\n", status); + } + /* allocate new work item */ work = NULL; memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a7ad321a8b..b7a096f981 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -131,6 +131,7 @@ struct threadpool int min_workers; int num_workers; int num_busy_workers; + TP_POOL_STACK_INFORMATION stack_info; }; enum threadpool_objtype @@ -1648,6 +1649,7 @@ static void tp_waitqueue_unlock( struct threadpool_object *wait ) */ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); struct threadpool *pool; unsigned int i; @@ -1666,10 +1668,12 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) list_init( &pool->pools[i] ); RtlInitializeConditionVariable( &pool->update_event ); - pool->max_workers = 500; - pool->min_workers = 0; - pool->num_workers = 0; - pool->num_busy_workers = 0; + pool->max_workers = 500; + pool->min_workers = 0; + pool->num_workers = 0; + pool->num_busy_workers = 0; + pool->stack_info.StackReserve = nt->OptionalHeader.SizeOfStackReserve; + pool->stack_info.StackCommit = nt->OptionalHeader.SizeOfStackCommit; TRACE( "allocated threadpool %p\n", pool ); @@ -2989,3 +2993,41 @@ VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending ) tp_object_cancel( this ); tp_object_wait( this, FALSE ); } + +/*********************************************************************** + * TpSetPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpSetPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + this->stack_info = *stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * TpQueryPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpQueryPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + *stack_info = this->stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index ea6707714d..5298eaa0f7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3021,6 +3021,7 @@ NTSYSAPI void WINAPI TpCallbackUnloadDllOnCompletion(TP_CALLBACK_INSTANCE * NTSYSAPI void WINAPI TpDisassociateCallback(TP_CALLBACK_INSTANCE *); NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); +NTSYSAPI NTSTATUS WINAPI TpQueryPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); NTSYSAPI void WINAPI TpReleasePool(TP_POOL *); @@ -3029,6 +3030,7 @@ NTSYSAPI void WINAPI TpReleaseWait(TP_WAIT *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); NTSYSAPI void WINAPI TpSetPoolMaxThreads(TP_POOL *,DWORD); NTSYSAPI BOOL WINAPI TpSetPoolMinThreads(TP_POOL *,DWORD); +NTSYSAPI NTSTATUS WINAPI TpSetPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); NTSYSAPI void WINAPI TpSetWait(TP_WAIT *,HANDLE,LARGE_INTEGER *); NTSYSAPI NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); -- 2.25.0

4 8

[PATCH 2/2] ntdll/tests: Add tests for ProcessQuotaLimits class
by Vijay Kiran Kamuju 15 Feb '20

15 Feb '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] ntdll: add stub implementation for ProcessQuotaLimits
by Vijay Kiran Kamuju 15 Feb '20

15 Feb '20

based on patch from Qian Hong Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44812 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v4 1/5] d3dcompiler: Return an instruction list instead of a single instruction from nodes representing expressions.
by Zebediah Figura 15 Feb '20

15 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 6 + dlls/d3dcompiler_43/hlsl.y | 326 +++++++++++----------- dlls/d3dcompiler_43/utils.c | 46 +-- 3 files changed, 183 insertions(+), 195 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5fc3161f5f0..9c58830ffe2 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -984,6 +984,7 @@ struct parse_initializer { struct hlsl_ir_node **args; unsigned int args_count; + struct list *instrs; }; struct parse_variable_def @@ -1120,6 +1121,11 @@ static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *nod return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); } +static inline struct hlsl_ir_node *node_from_list(struct list *list) +{ + return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d81d6afa9cc..87a5273d2d8 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -255,56 +255,49 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } -static struct hlsl_ir_if *loop_condition(struct list *cond_list) +static BOOL append_conditional_break(struct list *cond_list) { - struct hlsl_ir_node *cond, *not_cond; - struct hlsl_ir_if *out_cond; + struct hlsl_ir_node *condition, *not; struct hlsl_ir_jump *jump; - unsigned int count = list_count(cond_list); + struct hlsl_ir_if *iff; - if (!count) - return NULL; - if (count != 1) - ERR("Got multiple expressions in a for condition.\n"); + /* E.g. "for (i = 0; ; ++i)". */ + if (!list_count(cond_list)) + return TRUE; - cond = LIST_ENTRY(list_head(cond_list), struct hlsl_ir_node, entry); - out_cond = d3dcompiler_alloc(sizeof(*out_cond)); - if (!out_cond) + condition = node_from_list(cond_list); + if (!(not = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, condition, condition->loc))) { ERR("Out of memory.\n"); - return NULL; + return FALSE; } - out_cond->node.type = HLSL_IR_IF; - if (!(not_cond = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, cond, cond->loc))) + list_add_tail(cond_list, &not->entry); + + if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - return NULL; + return FALSE; } - out_cond->condition = not_cond; - jump = d3dcompiler_alloc(sizeof(*jump)); - if (!jump) + iff->node.type = HLSL_IR_IF; + iff->condition = not; + list_add_tail(cond_list, &iff->node.entry); + + if (!(iff->then_instrs = d3dcompiler_alloc(sizeof(*iff->then_instrs)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - d3dcompiler_free(not_cond); - return NULL; + return FALSE; } - jump->node.type = HLSL_IR_JUMP; - jump->type = HLSL_IR_JUMP_BREAK; - out_cond->then_instrs = d3dcompiler_alloc(sizeof(*out_cond->then_instrs)); - if (!out_cond->then_instrs) + list_init(iff->then_instrs); + + if (!(jump = d3dcompiler_alloc(sizeof(*jump)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - d3dcompiler_free(not_cond); - d3dcompiler_free(jump); - return NULL; + return FALSE; } - list_init(out_cond->then_instrs); - list_add_head(out_cond->then_instrs, &jump->node.entry); - - return out_cond; + jump->node.type = HLSL_IR_JUMP; + jump->type = HLSL_IR_JUMP_BREAK; + list_add_head(iff->then_instrs, &jump->node.entry); + return TRUE; } enum loop_type @@ -315,7 +308,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct hlsl_ir_node *iter, struct list *body, struct source_location *loc) + struct list *iter, struct list *body, struct source_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -340,20 +333,19 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l goto oom; list_init(loop->body); - cond_jump = loop_condition(cond); - if (!cond_jump) + if (!append_conditional_break(cond)) goto oom; if (type != LOOP_DO_WHILE) - list_add_tail(loop->body, &cond_jump->node.entry); + list_move_tail(loop->body, cond); list_move_tail(loop->body, body); if (iter) - list_add_tail(loop->body, &iter->entry); + list_move_tail(loop->body, iter); if (type == LOOP_DO_WHILE) - list_add_tail(loop->body, &cond_jump->node.entry); + list_move_tail(loop->body, cond); d3dcompiler_free(init); d3dcompiler_free(cond); @@ -369,7 +361,7 @@ oom: d3dcompiler_free(list); free_instr_list(init); free_instr_list(cond); - free_instr(iter); + free_instr_list(iter); free_instr_list(body); return NULL; } @@ -388,9 +380,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - unsigned int i; - for (i = 0; i < initializer->args_count; ++i) - free_instr(initializer->args[i]); + free_instr_list(initializer->instrs); d3dcompiler_free(initializer->args); } @@ -508,6 +498,9 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, return; } + list_move_tail(list, initializer->instrs); + d3dcompiler_free(initializer->instrs); + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -526,6 +519,7 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, break; } deref->node.loc = node->loc; + list_add_tail(list, &deref->node.entry); assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, BWRITERSP_WRITEMASK_ALL, node); list_add_tail(list, &assignment->entry); } @@ -533,9 +527,6 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); } - /* Free initializer elements in excess. */ - for (; i < initializer->args_count; ++i) - free_instr(initializer->args[i]); d3dcompiler_free(initializer->args); } @@ -609,6 +600,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); + struct hlsl_ir_deref *deref; TRACE("Variable with initializer.\n"); if (type->type <= HLSL_CLASS_LAST_NUMERIC @@ -661,7 +653,10 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, continue; } - assignment = make_assignment(&new_var_deref(var)->node, ASSIGN_OP_ASSIGN, + deref = new_var_deref(var); + list_add_tail(statements_list, &deref->node.entry); + list_add_tail(statements_list, &v->initializer.args[0]->entry); + assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, BWRITERSP_WRITEMASK_ALL, v->initializer.args[0]); d3dcompiler_free(v->initializer.args); list_add_tail(statements_list, &assignment->entry); @@ -880,6 +875,35 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr return NULL; } +static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) +{ + list_add_tail(list, &node->entry); + return list; +} + +static struct list *append_binop(struct list *first, struct list *second, struct hlsl_ir_node *node) +{ + list_move_tail(first, second); + d3dcompiler_free(second); + list_add_tail(first, &node->entry); + return first; +} + +static struct list *make_list(struct hlsl_ir_node *node) +{ + struct list *list; + + if (!(list = d3dcompiler_alloc(sizeof(*list)))) + { + ERR("Out of memory.\n"); + free_instr(node); + return NULL; + } + list_init(list); + list_add_tail(list, &node->entry); + return list; +} + %} %locations @@ -1024,12 +1048,12 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <variable_def> type_spec %type <initializer> complex_initializer %type <initializer> initializer_expr_list -%type <instr> initializer_expr +%type <list> initializer_expr %type <modifiers> var_modifiers %type <list> field %type <list> parameters %type <list> param_list -%type <instr> expr +%type <list> expr %type <intval> array %type <list> statement %type <list> statement_list @@ -1048,21 +1072,21 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <list> variables_def %type <list> variables_def_optional %type <if_body> if_body -%type <instr> primary_expr -%type <instr> postfix_expr -%type <instr> unary_expr -%type <instr> mul_expr -%type <instr> add_expr -%type <instr> shift_expr -%type <instr> relational_expr -%type <instr> equality_expr -%type <instr> bitand_expr -%type <instr> bitxor_expr -%type <instr> bitor_expr -%type <instr> logicand_expr -%type <instr> logicor_expr -%type <instr> conditional_expr -%type <instr> assignment_expr +%type <list> primary_expr +%type <list> postfix_expr +%type <list> unary_expr +%type <list> mul_expr +%type <list> add_expr +%type <list> shift_expr +%type <list> relational_expr +%type <list> equality_expr +%type <list> bitand_expr +%type <list> bitxor_expr +%type <list> bitor_expr +%type <list> logicand_expr +%type <list> logicor_expr +%type <list> conditional_expr +%type <list> assignment_expr %type <list> expr_statement %type <unary_op> unary_op %type <assign_op> assign_op @@ -1615,7 +1639,7 @@ array: /* Empty */ { FIXME("Array.\n"); $$ = 0; - free_instr($2); + free_instr_list($2); } var_modifiers: /* Empty */ @@ -1672,7 +1696,8 @@ complex_initializer: initializer_expr $$.args_count = 1; if (!($$.args = d3dcompiler_alloc(sizeof(*$$.args)))) YYABORT; - $$.args[0] = $1; + $$.args[0] = node_from_list($1); + $$.instrs = $1; } | '{' initializer_expr_list '}' { @@ -1693,14 +1718,17 @@ initializer_expr_list: initializer_expr $$.args_count = 1; if (!($$.args = d3dcompiler_alloc(sizeof(*$$.args)))) YYABORT; - $$.args[0] = $1; + $$.args[0] = node_from_list($1); + $$.instrs = $1; } | initializer_expr_list ',' initializer_expr { $$ = $1; if (!($$.args = d3dcompiler_realloc($$.args, ($$.args_count + 1) * sizeof(*$$.args)))) YYABORT; - $$.args[$$.args_count++] = $3; + $$.args[$$.args_count++] = node_from_list($3); + list_move_tail($$.instrs, $3); + d3dcompiler_free($3); } boolean: KW_TRUE @@ -1742,15 +1770,14 @@ jump_statement: KW_RETURN expr ';' jump->node.type = HLSL_IR_JUMP; set_location(&jump->node.loc, &@1); jump->type = HLSL_IR_JUMP_RETURN; - jump->node.data_type = $2->data_type; - jump->return_value = $2; + jump->node.data_type = node_from_list($2)->data_type; + jump->return_value = node_from_list($2); FIXME("Check for valued return on void function.\n"); FIXME("Implicit conversion to the return type if needed, " "error out if conversion not possible.\n"); - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $2; list_add_tail($$, &jump->node.entry); } @@ -1764,18 +1791,17 @@ selection_statement: KW_IF '(' expr ')' if_body } instr->node.type = HLSL_IR_IF; set_location(&instr->node.loc, &@1); - instr->condition = $3; + instr->condition = node_from_list($3); instr->then_instrs = $5.then_instrs; instr->else_instrs = $5.else_instrs; - if ($3->data_type->dimx > 1 || $3->data_type->dimy > 1) + if (instr->condition->data_type->dimx > 1 || instr->condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc.file, instr->node.loc.line, instr->node.loc.col, HLSL_LEVEL_ERROR, "if condition requires a scalar"); } - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); - list_add_head($$, &instr->node.entry); + $$ = $3; + list_add_tail($$, &instr->node.entry); } if_body: statement @@ -1792,32 +1818,14 @@ if_body: statement loop_statement: KW_WHILE '(' expr ')' statement { struct source_location loc; - struct list *cond = d3dcompiler_alloc(sizeof(*cond)); - - if (!cond) - { - ERR("Out of memory.\n"); - YYABORT; - } - list_init(cond); - list_add_head(cond, &$3->entry); set_location(&loc, &@1); - $$ = create_loop(LOOP_WHILE, NULL, cond, NULL, $5, &loc); + $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, &loc); } | KW_DO statement KW_WHILE '(' expr ')' ';' { struct source_location loc; - struct list *cond = d3dcompiler_alloc(sizeof(*cond)); - - if (!cond) - { - ERR("Out of memory.\n"); - YYABORT; - } - list_init(cond); - list_add_head(cond, &$5->entry); set_location(&loc, &@1); - $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); + $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, &loc); } | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { @@ -1846,10 +1854,7 @@ expr_statement: ';' } | expr ';' { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); - if ($1) - list_add_head($$, &$1->entry); + $$ = $1; } primary_expr: C_FLOAT @@ -1864,7 +1869,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | C_INTEGER { @@ -1878,7 +1884,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | boolean { @@ -1892,7 +1899,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | VAR_IDENTIFIER { @@ -1908,8 +1916,9 @@ primary_expr: C_FLOAT } if ((deref = new_var_deref(var))) { - $$ = &deref->node; - set_location(&$$->loc, &@1); + set_location(&deref->node.loc, &@1); + if (!($$ = make_list(&deref->node))) + YYABORT; } else $$ = NULL; @@ -1926,43 +1935,48 @@ postfix_expr: primary_expr | postfix_expr OP_INC { struct source_location loc; + struct hlsl_ir_node *inc; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_POSTINC, $1, loc); + inc = new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - $$->data_type = clone_hlsl_type($$->data_type); - $$->data_type->modifiers |= HLSL_MODIFIER_CONST; + inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); } | postfix_expr OP_DEC { struct source_location loc; + struct hlsl_ir_node *inc; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_POSTDEC, $1, loc); + inc = new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - $$->data_type = clone_hlsl_type($$->data_type); - $$->data_type->modifiers |= HLSL_MODIFIER_CONST; + inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); } | postfix_expr '.' any_identifier { + struct hlsl_ir_node *node = node_from_list($1); struct source_location loc; set_location(&loc, &@2); - if ($1->data_type->type == HLSL_CLASS_STRUCT) + if (node->data_type->type == HLSL_CLASS_STRUCT) { - struct hlsl_type *type = $1->data_type; + struct hlsl_type *type = node->data_type; struct hlsl_struct_field *field; $$ = NULL; @@ -1970,7 +1984,7 @@ postfix_expr: primary_expr { if (!strcmp($3, field->name)) { - struct hlsl_ir_deref *deref = new_record_deref($1, field); + struct hlsl_ir_deref *deref = new_record_deref(node, field); if (!deref) { @@ -1978,7 +1992,7 @@ postfix_expr: primary_expr YYABORT; } deref->node.loc = loc; - $$ = &deref->node; + $$ = append_unop($1, &deref->node); break; } } @@ -1989,18 +2003,18 @@ postfix_expr: primary_expr YYABORT; } } - else if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + else if (node->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { struct hlsl_ir_swizzle *swizzle; - swizzle = get_swizzle($1, $3, &loc); + swizzle = get_swizzle(node, $3, &loc); if (!swizzle) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "invalid swizzle %s", debugstr_a($3)); YYABORT; } - $$ = &swizzle->node; + $$ = append_unop($1, &swizzle->node); } else { @@ -2015,7 +2029,7 @@ postfix_expr: primary_expr * subcomponent access. * We store it as an array dereference in any case. */ struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); - struct hlsl_type *expr_type = $1->data_type; + struct hlsl_type *expr_type = node_from_list($1)->data_type; struct source_location loc; TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); @@ -2048,24 +2062,24 @@ postfix_expr: primary_expr hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "expression is not array-indexable"); d3dcompiler_free(deref); - free_instr($1); - free_instr($3); + free_instr_list($1); + free_instr_list($3); YYABORT; } - if ($3->data_type->type != HLSL_CLASS_SCALAR) + if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "array index is not scalar"); d3dcompiler_free(deref); - free_instr($1); - free_instr($3); + free_instr_list($1); + free_instr_list($3); YYABORT; } deref->type = HLSL_IR_DEREF_ARRAY; - deref->v.array.array = $1; - deref->v.array.index = $3; + deref->v.array.array = node_from_list($1); + deref->v.array.index = node_from_list($3); - $$ = &deref->node; + $$ = append_binop($1, $3, &deref->node); } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ @@ -2104,7 +2118,7 @@ postfix_expr: primary_expr constructor->args_count = $4.args_count; memcpy(constructor->args, $4.args, $4.args_count * sizeof(*$4.args)); d3dcompiler_free($4.args); - $$ = &constructor->node; + $$ = append_unop($4.instrs, &constructor->node); } unary_expr: postfix_expr @@ -2116,26 +2130,26 @@ unary_expr: postfix_expr struct source_location loc; set_location(&loc, &@1); - if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_PREINC, $2, loc); + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), loc)); } | OP_DEC unary_expr { struct source_location loc; set_location(&loc, &@1); - if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_PREDEC, $2, loc); + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), loc)); } | unary_op unary_expr { @@ -2150,14 +2164,13 @@ unary_expr: postfix_expr else { set_location(&loc, &@1); - $$ = new_unary_expr(ops[$1], $2, loc); + $$ = append_unop($2, new_unary_expr(ops[$1], node_from_list($2), loc)); } } /* var_modifiers just to avoid shift/reduce conflicts */ | '(' var_modifiers type array ')' unary_expr { - struct hlsl_ir_expr *expr; - struct hlsl_type *src_type = $6->data_type; + struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; struct source_location loc; @@ -2182,8 +2195,7 @@ unary_expr: postfix_expr YYABORT; } - expr = new_cast($6, dst_type, &loc); - $$ = expr ? &expr->node : NULL; + $$ = append_unop($6, &new_cast(node_from_list($6), dst_type, &loc)->node); } unary_op: '+' @@ -2212,21 +2224,21 @@ mul_expr: unary_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_MUL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MUL, node_from_list($1), node_from_list($3), loc)); } | mul_expr '/' unary_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_DIV, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_DIV, node_from_list($1), node_from_list($3), loc)); } | mul_expr '%' unary_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_MOD, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MOD, node_from_list($1), node_from_list($3), loc)); } add_expr: mul_expr @@ -2238,14 +2250,14 @@ add_expr: mul_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_ADD, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_ADD, node_from_list($1), node_from_list($3), loc)); } | add_expr '-' mul_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_SUB, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_SUB, node_from_list($1), node_from_list($3), loc)); } shift_expr: add_expr @@ -2270,28 +2282,28 @@ relational_expr: shift_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_LESS, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LESS, node_from_list($1), node_from_list($3), loc)); } | relational_expr '>' shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_GREATER, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GREATER, node_from_list($1), node_from_list($3), loc)); } | relational_expr OP_LE shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_LEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LEQUAL, node_from_list($1), node_from_list($3), loc)); } | relational_expr OP_GE shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_GEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GEQUAL, node_from_list($1), node_from_list($3), loc)); } equality_expr: relational_expr @@ -2303,14 +2315,14 @@ equality_expr: relational_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_EQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_EQUAL, node_from_list($1), node_from_list($3), loc)); } | equality_expr OP_NE relational_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_NEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_NEQUAL, node_from_list($1), node_from_list($3), loc)); } bitand_expr: equality_expr @@ -2374,18 +2386,20 @@ assignment_expr: conditional_expr | unary_expr assign_op assignment_expr { struct source_location loc; + struct hlsl_ir_node *instr; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "l-value is const"); YYABORT; } - $$ = make_assignment($1, $2, BWRITERSP_WRITEMASK_ALL, $3); - if (!$$) + if (!(instr = make_assignment(node_from_list($1), $2, + BWRITERSP_WRITEMASK_ALL, node_from_list($3)))) YYABORT; - $$->loc = loc; + instr->loc = loc; + $$ = append_binop($3, $1, instr); } assign_op: '=' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0cae62b60fc..3f5a57ffa40 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1278,10 +1278,14 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { + struct hlsl_ir_expr *cast; + if (compare_hlsl_types(node->data_type, type)) return node; TRACE("Implicit conversion of expression to %s\n", debug_hlsl_type(type)); - return &new_cast(node, type, loc)->node; + if ((cast = new_cast(node, type, loc))) + list_add_after(&node->entry, &cast->node.entry); + return &cast->node; } struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, @@ -1468,8 +1472,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig hlsl_report_message(rhs->loc.file, rhs->loc.line, rhs->loc.col, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", debug_hlsl_type(rhs->data_type), debug_hlsl_type(type)); - free_instr(lhs); - free_instr(rhs); d3dcompiler_free(assign); return NULL; } @@ -1481,8 +1483,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig if (!converted_rhs) { ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); - free_instr(lhs); - free_instr(rhs); d3dcompiler_free(assign); return NULL; } @@ -1502,11 +1502,9 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig } else { - struct hlsl_ir_deref *lhs_deref = deref_from_node(lhs), *new_deref; - TRACE("Adding an expression for the compound assignment.\n"); - new_deref = new_var_deref(lhs_deref->v.var); - expr = new_binary_expr(op, &new_deref->node, rhs, left->loc); + expr = new_binary_expr(op, lhs, rhs, lhs->loc); + list_add_after(&rhs->entry, &expr->entry); assign->rhs = expr; } } @@ -2173,60 +2171,32 @@ static void free_ir_constant(struct hlsl_ir_constant *constant) static void free_ir_deref(struct hlsl_ir_deref *deref) { - switch (deref->type) - { - case HLSL_IR_DEREF_VAR: - /* Variables are shared among nodes in the tree. */ - break; - case HLSL_IR_DEREF_ARRAY: - free_instr(deref->v.array.array); - free_instr(deref->v.array.index); - break; - case HLSL_IR_DEREF_RECORD: - free_instr(deref->v.record.record); - break; - } d3dcompiler_free(deref); } static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) { - free_instr(swizzle->val); d3dcompiler_free(swizzle); } static void free_ir_constructor(struct hlsl_ir_constructor *constructor) { - unsigned int i; - for (i = 0; i < constructor->args_count; ++i) - free_instr(constructor->args[i]); d3dcompiler_free(constructor); } static void free_ir_expr(struct hlsl_ir_expr *expr) { - unsigned int i; - - for (i = 0; i < 3; ++i) - { - if (!expr->operands[i]) - break; - free_instr(expr->operands[i]); - } free_instr_list(expr->subexpressions); d3dcompiler_free(expr); } static void free_ir_assignment(struct hlsl_ir_assignment *assignment) { - free_instr(assignment->lhs); - free_instr(assignment->rhs); d3dcompiler_free(assignment); } static void free_ir_if(struct hlsl_ir_if *if_node) { - free_instr(if_node->condition); free_instr_list(if_node->then_instrs); free_instr_list(if_node->else_instrs); d3dcompiler_free(if_node); @@ -2234,8 +2204,6 @@ static void free_ir_if(struct hlsl_ir_if *if_node) static void free_ir_jump(struct hlsl_ir_jump *jump) { - if (jump->type == HLSL_IR_JUMP_RETURN) - free_instr(jump->return_value); d3dcompiler_free(jump); } -- 2.25.0

5 10

[PATCH] ntoskrnl: Fix emulation of RIP-relative addressing.
by Brendan Shanks 14 Feb '20

14 Feb '20

The target address is relative to the RIP of the next instruction, not the current RIP. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 05bdd23e82..77803f07d7 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -522,7 +522,7 @@ static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i * * Return the address of an instruction operand (from the mod/rm byte). */ -static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, +static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, int addl_instr_len, int long_addr, int rex, int segprefix, int *len ) { int mod, rm, ss = 0, off, have_sib = 0; @@ -566,6 +566,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, if (!long_addr) base &= 0xffffffff; GET_VAL( &off, DWORD ); base += (signed long)off; + base += (signed long)*len + (signed long)addl_instr_len; } break; @@ -793,7 +794,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0xb6: /* movzx Eb, Gv */ case 0xb7: /* movzx Ew, Gv */ { - BYTE *data = INSTR_GetOperandAddr( context, instr + 2, long_addr, + BYTE *data = INSTR_GetOperandAddr( context, instr + 2, prefixlen + 2, long_addr, rex, segprefix, &len ); unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; SIZE_T offset = data - user_shared_data; @@ -815,7 +816,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ { - BYTE *data = INSTR_GetOperandAddr( context, instr + 1, long_addr, + BYTE *data = INSTR_GetOperandAddr( context, instr + 1, prefixlen + 1, long_addr, rex, segprefix, &len ); unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; SIZE_T offset = data - user_shared_data; -- 2.24.1

1 0

[PATCH v5 0/2] Add emulation for UMIP instructions
by Brendan Shanks 14 Feb '20

14 Feb '20

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous patch: Switch the return values of emulate_umip_instr() to make is_privileged_instr() simpler Brendan Shanks (2): ntdll: Add emulation for UMIP instructions. ntdll/tests: Add tests for UMIP instructions. dlls/ntdll/signal_i386.c | 307 +++++++++++++++++++++++++++- dlls/ntdll/signal_x86_64.c | 346 +++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 375 +++++++++++++++++++++++++++++++++++ 3 files changed, 1012 insertions(+), 16 deletions(-) -- 2.24.1

1 3

[PATCH] wincodecs: Return WINCODEC_ERR_PALETTEUNAVAILABLE for jpeg decoder frame.
by Nikolay Sivov 14 Feb '20

14 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/tests/jpegformat.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1df898f28c..0ecbbf48fc 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -635,8 +635,9 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c index c1e46c4869..341e42c28c 100644 --- a/dlls/windowscodecs/tests/jpegformat.c +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -47,6 +47,8 @@ static void test_decode_adobe_cmyk(void) { IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; + IWICImagingFactory *factory; + IWICPalette *palette; HRESULT hr; HGLOBAL hjpegdata; char *jpegdata; @@ -77,6 +79,10 @@ static void test_decode_adobe_cmyk(void) ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); ok(hjpegdata != 0, "GlobalAlloc failed\n"); if (hjpegdata) @@ -125,13 +131,27 @@ static void test_decode_adobe_cmyk(void) broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ "unexpected image data\n"); } + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(framedecode); } IStream_Release(jpegstream); } GlobalFree(hjpegdata); } + IWICBitmapDecoder_Release(decoder); + IWICImagingFactory_Release(factory); } -- 2.25.0

3 2

[PATCH] gdiplus: Each pen dash array element must be greater than zero.
by Jeff Smith 14 Feb '20

14 Feb '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/pen.c | 5 +---- dlls/gdiplus/tests/pen.c | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 8bcb91819a..156f90a19d 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, for(i = 0; i < count; i++){ sum += dash[i]; - if(dash[i] < 0.0) + if(dash[i] <= 0.0) return InvalidParameter; } - if(sum == 0.0 && count) - return InvalidParameter; - heap_free(pen->dashes); pen->dashes = NULL; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ceab92acff..3c4507f9d5 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -222,6 +222,9 @@ static void test_dasharray(void) dashes[9] = -1.0; status = GdipSetPenDashArray(pen, &dashes[7], 5); expect(InvalidParameter, status); + dashes[9] = 1.0; + status = GdipSetPenDashArray(pen, &dashes[7], 5); + expect(InvalidParameter, status); /* Try to set with count = 0. */ GdipSetPenDashStyle(pen, DashStyleDot); -- 2.23.0

2 1

[PATCH 1/2] d3dcompiler: Free variable definitions data on allocation errors.
by Matteo Bruni 14 Feb '20

14 Feb '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 52b2b6310b6..b6478bf3fed 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -530,6 +530,15 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, d3dcompiler_free(initializer->args); } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + d3dcompiler_free(v->name); + d3dcompiler_free((void *)v->semantic); + d3dcompiler_free(v->reg_reservation); + d3dcompiler_free(v); +} + static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { struct hlsl_type *type; @@ -543,7 +552,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, { ERR("Out of memory.\n"); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) - d3dcompiler_free(v); + free_parse_variable_def(v); d3dcompiler_free(var_list); return NULL; } @@ -558,7 +567,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, if (!var) { ERR("Out of memory.\n"); - d3dcompiler_free(v); + free_parse_variable_def(v); continue; } if (v->array_size) -- 2.24.1

1 1

[PATCH v2 3/3] ntdll: Add semi-stub for RtlIpv6AddressToString(Ex)A
by Alex Henrie 14 Feb '20

14 Feb '20

All of the strings produced by the semi-stub are valid IPv6 addresses, though not necessarily in the same format that Windows would give them in. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46788 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove always-false if statement from RtlIpv6AddressToStringA --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/rtl.c | 77 +++++++++++++++++ dlls/ntdll/tests/rtl.c | 189 +++++++++++++++++++++-------------------- 3 files changed, 177 insertions(+), 93 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7aa953ca6c..db7949044c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -774,8 +774,8 @@ @ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) -# @ stub RtlIpv6AddressToStringA -# @ stub RtlIpv6AddressToStringExA +@ stdcall RtlIpv6AddressToStringA(ptr ptr) +@ stdcall RtlIpv6AddressToStringExA(ptr long long ptr ptr) # @ stub RtlIpv6AddressToStringExW # @ stub RtlIpv6AddressToStringW # @ stub RtlIpv6StringToAddressA diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 15ff037fef..b6cb02be04 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1196,6 +1196,83 @@ CHAR * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *pin, LPSTR buffer) return buffer + size - 1; } +/*********************************************************************** + * RtlIpv6AddressToStringExA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6AddressToStringExA(const IN6_ADDR *address, ULONG scope, USHORT port, char *str, ULONG *size) +{ + char buffer[60]; + ULONG needed; + NTSTATUS ret; + + FIXME("(%p %u %u %p %p): semi-stub\n", address, scope, port, str, size); + + if (!address || !str || !size) + return STATUS_INVALID_PARAMETER; + + if (scope && port) + { + needed = sprintf(buffer, "[%x:%x:%x:%x:%x:%x:%x:%x%%%u]:%u", + ntohs(address->u.Word[0]), ntohs(address->u.Word[1]), + ntohs(address->u.Word[2]), ntohs(address->u.Word[3]), + ntohs(address->u.Word[4]), ntohs(address->u.Word[5]), + ntohs(address->u.Word[6]), ntohs(address->u.Word[7]), + scope, ntohs(port)); + } + else if (scope) + { + needed = sprintf(buffer, "%x:%x:%x:%x:%x:%x:%x:%x%%%u", + ntohs(address->u.Word[0]), ntohs(address->u.Word[1]), + ntohs(address->u.Word[2]), ntohs(address->u.Word[3]), + ntohs(address->u.Word[4]), ntohs(address->u.Word[5]), + ntohs(address->u.Word[6]), ntohs(address->u.Word[7]), + scope); + } + else if (port) + { + needed = sprintf(buffer, "[%x:%x:%x:%x:%x:%x:%x:%x]:%u", + ntohs(address->u.Word[0]), ntohs(address->u.Word[1]), + ntohs(address->u.Word[2]), ntohs(address->u.Word[3]), + ntohs(address->u.Word[4]), ntohs(address->u.Word[5]), + ntohs(address->u.Word[6]), ntohs(address->u.Word[7]), + ntohs(port)); + } + else + { + needed = sprintf(buffer, "%x:%x:%x:%x:%x:%x:%x:%x", + ntohs(address->u.Word[0]), ntohs(address->u.Word[1]), + ntohs(address->u.Word[2]), ntohs(address->u.Word[3]), + ntohs(address->u.Word[4]), ntohs(address->u.Word[5]), + ntohs(address->u.Word[6]), ntohs(address->u.Word[7])); + } + needed++; + + if (*size >= needed) + { + strcpy(str, buffer); + ret = STATUS_SUCCESS; + } + else + { + ret = STATUS_INVALID_PARAMETER; + } + + *size = needed; + return ret; +} + +/*********************************************************************** + * RtlIpv6AddressToStringA [NTDLL.@] + */ +char * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *address, char *str) +{ + ULONG size = 46; + if (!address || !str) return str - 1; + str[45] = 0; /* this byte is set even though the string is always shorter */ + RtlIpv6AddressToStringExA(address, 0, 0, str, &size); + return str + size - 1; +} + /*********************************************************************** * get_pointer_obfuscator (internal) */ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 559a7d625c..c7470258fb 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1791,80 +1791,81 @@ static void test_RtlIpv6AddressToString(void) LPCSTR result; IN6_ADDR ip; DWORD_PTR len; - struct + static const struct { PCSTR address; int ip[8]; + BOOL todo; } tests[] = { /* ipv4 addresses & ISATAP addresses */ - { "::13.1.68.3", { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "::ffff:13.1.68.3", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0x344 } }, - { "::feff:d01:4403", { 0, 0, 0, 0, 0, 0xfffe, 0x10d, 0x344 } }, - { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, - { "::100:d01:4403", { 0, 0, 0, 0, 0, 1, 0x10d, 0x344 } }, - { "::1:d01:4403", { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "::ffff:0:4403", { 0, 0, 0, 0, 0, 0xffff, 0, 0x344 } }, - { "::ffff:13.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0 } }, - { "::ffff:0:0", { 0, 0, 0, 0, 0, 0xffff, 0, 0 } }, - { "::ffff:0:13.1.68.3", { 0, 0, 0, 0, 0xffff, 0, 0x10d, 0x344 } }, - { "::ffff:ffff:d01:4403", { 0, 0, 0, 0, 0xffff, 0xffff, 0x10d, 0x344 } }, - { "::ffff:0:0:d01:4403", { 0, 0, 0, 0xffff, 0, 0, 0x10d, 0x344 } }, - { "::ffff:255.255.255.255", { 0, 0, 0, 0, 0, 0xffff, 0xffff, 0xffff } }, - { "::ffff:129.144.52.38", { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, - { "::5efe:129.144.52.38", { 0, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111:2222:3333:4444:0:5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111:2222:3333::5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111:2222::5efe:129.144.52.38", { 0x1111, 0x2222, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111::5efe:129.144.52.38", { 0x1111, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "::200:5efe:129.144.52.38", { 0, 0, 0, 0, 2, 0xfe5e, 0x9081, 0x2634 } }, - { "::100:5efe:8190:3426", { 0, 0, 0, 0, 1, 0xfe5e, 0x9081, 0x2634 } }, + { "::13.1.68.3", { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "::ffff:13.1.68.3", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0x344 }, TRUE }, + { "::feff:d01:4403", { 0, 0, 0, 0, 0, 0xfffe, 0x10d, 0x344 }, TRUE }, + { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 }, TRUE }, + { "::100:d01:4403", { 0, 0, 0, 0, 0, 1, 0x10d, 0x344 }, TRUE }, + { "::1:d01:4403", { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "::ffff:0:4403", { 0, 0, 0, 0, 0, 0xffff, 0, 0x344 }, TRUE }, + { "::ffff:13.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0 }, TRUE }, + { "::ffff:0:0", { 0, 0, 0, 0, 0, 0xffff, 0, 0 }, TRUE }, + { "::ffff:0:13.1.68.3", { 0, 0, 0, 0, 0xffff, 0, 0x10d, 0x344 }, TRUE }, + { "::ffff:ffff:d01:4403", { 0, 0, 0, 0, 0xffff, 0xffff, 0x10d, 0x344 }, TRUE }, + { "::ffff:0:0:d01:4403", { 0, 0, 0, 0xffff, 0, 0, 0x10d, 0x344 }, TRUE }, + { "::ffff:255.255.255.255", { 0, 0, 0, 0, 0, 0xffff, 0xffff, 0xffff }, TRUE }, + { "::ffff:129.144.52.38", { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 }, TRUE }, + { "::5efe:129.144.52.38", { 0, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111:2222:3333::5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111:2222::5efe:129.144.52.38", { 0x1111, 0x2222, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111::5efe:129.144.52.38", { 0x1111, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "::200:5efe:129.144.52.38", { 0, 0, 0, 0, 2, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "::100:5efe:8190:3426", { 0, 0, 0, 0, 1, 0xfe5e, 0x9081, 0x2634 }, TRUE }, /* 'normal' addresses */ - { "::1", { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::1", { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, { "0:1:2:3:4:5:6:7", { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, - { "1080::8:800:200c:417a", { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, + { "1080::8:800:200c:417a", { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 }, TRUE }, { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, - { "1111:2222:3333:4444:5555:6666::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, + { "1111:2222:3333:4444:5555:6666::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 }, TRUE }, { "1111:2222:3333:4444:5555:6666:0:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, - { "1111:2222:3333:4444:5555::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, + { "1111:2222:3333:4444:5555::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 }, TRUE }, { "1111:2222:3333:4444:5555:0:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7b7b, 0x7b7b } }, { "1111:2222:3333:4444:5555:0:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7777, 0x8888 } }, - { "1111:2222:3333:4444:5555::8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 } }, - { "1111::", { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "1111::7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555::8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 }, TRUE }, + { "1111::", { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "1111::7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b }, TRUE }, { "1111:0:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, { "1111:0:3333:4444:5555:6666:7777:8888", { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, - { "1111::4444:5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, - { "1111::4444:5555:6666:7777:8888", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, - { "1111::5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, - { "1111::5555:6666:7777:8888", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888 } }, - { "1111::6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b } }, - { "1111::6666:7777:8888", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888 } }, - { "1111::7777:8888", { 0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888 } }, - { "1111::8888", { 0x1111, 0, 0, 0, 0, 0, 0, 0x8888 } }, + { "1111::4444:5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b }, TRUE }, + { "1111::4444:5555:6666:7777:8888", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 }, TRUE }, + { "1111::5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b }, TRUE }, + { "1111::5555:6666:7777:8888", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888 }, TRUE }, + { "1111::6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b }, TRUE }, + { "1111::6666:7777:8888", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888 }, TRUE }, + { "1111::7777:8888", { 0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888 }, TRUE }, + { "1111::8888", { 0x1111, 0, 0, 0, 0, 0, 0, 0x8888 }, TRUE }, { "1:2:3:4:5:6:102:304", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x201, 0x403 } }, { "1:2:3:4:5:6:7:8", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800 } }, - { "1:2:3:4:5:6::", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0 } }, + { "1:2:3:4:5:6::", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0 }, TRUE }, { "1:2:3:4:5:6:0:8", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0x800 } }, - { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, + { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 }, TRUE }, { "2001:0:4136:e378:8000:63bf:3fff:fdd2", { 0x120, 0, 0x3641, 0x78e3, 0x80, 0xbf63, 0xff3f, 0xd2fd } }, - { "2001:db8::1428:57ab", { 0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57 } }, + { "2001:db8::1428:57ab", { 0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57 }, TRUE }, { "2001:db8:1234:ffff:ffff:ffff:ffff:ffff", { 0x120, 0xb80d, 0x3412, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, { "2001:0:ce49:7601:2cad:dfff:7c94:fffe", { 0x120, 0, 0x49ce, 0x176, 0xad2c, 0xffdf, 0x947c, 0xfeff } }, - { "2001:db8:85a3::8a2e:370:7334", { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 } }, - { "3ffe:b00::1:0:0:a", { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 } }, - { "::a:b:c:d:e", { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 } }, - { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "2001:db8:85a3::8a2e:370:7334", { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 }, TRUE }, + { "3ffe:b00::1:0:0:a", { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 }, TRUE }, + { "::a:b:c:d:e", { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 }, TRUE }, + { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b }, TRUE }, { "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, { "1111:2222:3333:4444:5555:6666:7777:1", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 } }, { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, - { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 } }, - { "1111::3333:4444:5555:6666:7777", { 0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777 } }, - { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 } }, - { "1111::3333", { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 } }, - { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, - { "2001::ffd3", { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "1111::3333:4444:5555:6666:7777", { 0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777 }, TRUE }, + { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "1111::3333", { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 }, TRUE }, + { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 }, TRUE }, + { "2001::ffd3", { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, }; unsigned int i; @@ -1880,6 +1881,7 @@ static void test_RtlIpv6AddressToString(void) result = pRtlIpv6AddressToStringA(&ip, buffer); len = strlen(buffer); +todo_wine ok(result == (buffer + len) && !strcmp(buffer, "::"), "got %p with '%s' (expected %p with '::')\n", result, buffer, buffer + len); @@ -1895,6 +1897,7 @@ static void test_RtlIpv6AddressToString(void) result = pRtlIpv6AddressToStringA(&ip, buffer); len = strlen(buffer); +todo_wine_if(tests[i].todo) ok(result == (buffer + len) && !strcmp(buffer, tests[i].address), "got %p with '%s' (expected %p with '%s')\n", result, buffer, buffer + len, tests[i].address); @@ -1910,42 +1913,43 @@ static void test_RtlIpv6AddressToStringEx(void) NTSTATUS res; IN6_ADDR ip; ULONG len; - struct + static const struct { PCSTR address; ULONG scopeid; USHORT port; int ip[8]; + BOOL todo; } tests[] = { /* ipv4 addresses & ISATAP addresses */ - { "::13.1.68.3", 0, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "::13.1.68.3%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "::13.1.68.3%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "[::13.1.68.3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "[::13.1.68.3%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - { "[::13.1.68.3]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, - - { "::1:d01:4403", 0, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "::1:d01:4403%1", 1, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "::1:d01:4403%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "[::1:d01:4403%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "[::1:d01:4403%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - { "[::1:d01:4403]:256", 0, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, - - { "1111:2222:3333:4444:0:5efe:129.144.52.38", 0, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111:2222:3333:4444:0:5efe:129.144.52.38%1", 1, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819", 0xffffbbbb, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:65518",0xffffbbbb, 0xeeff, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - { "[1111:2222:3333:4444:0:5efe:129.144.52.38]:256", 0, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, - - { "::1", 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "::1%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "::1%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "[::1%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "[::1%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "[::1]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::13.1.68.3", 0, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "::13.1.68.3%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "::13.1.68.3%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "[::13.1.68.3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "[::13.1.68.3%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + { "[::13.1.68.3]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 }, TRUE }, + + { "::1:d01:4403", 0, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "::1:d01:4403%1", 1, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "::1:d01:4403%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "[::1:d01:4403%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "[::1:d01:4403%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + { "[::1:d01:4403]:256", 0, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 }, TRUE }, + + { "1111:2222:3333:4444:0:5efe:129.144.52.38", 0, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38%1", 1, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819", 0xffffbbbb, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:65518",0xffffbbbb, 0xeeff, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38]:256", 0, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 }, TRUE }, + + { "::1", 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, + { "::1%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, + { "::1%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, + { "[::1%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, + { "[::1%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, + { "[::1]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 }, TRUE }, { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", 0, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, { "1111:2222:3333:4444:5555:6666:7b7b:7b7b%1", 1, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1954,19 +1958,19 @@ static void test_RtlIpv6AddressToStringEx(void) { "[1111:2222:3333:4444:5555:6666:7b7b:7b7b%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, { "[1111:2222:3333:4444:5555:6666:7b7b:7b7b]:256", 0, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, - { "1111::", 0, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "1111::%1", 1, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "1111::%4294949819", 0xffffbbbb, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "[1111::%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "[1111::%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - { "[1111::]:256", 0, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, - - { "2001::ffd3", 0, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, - { "2001::ffd3%1", 1, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, - { "2001::ffd3%4294949819", 0xffffbbbb, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, - { "[2001::ffd3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, - { "[2001::ffd3%4294949819]:256", 0xffffbbbb, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, - { "[2001::ffd3]:256", 0, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "1111::", 0, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "1111::%1", 1, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "1111::%4294949819", 0xffffbbbb, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "[1111::%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "[1111::%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + { "[1111::]:256", 0, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 }, TRUE }, + + { "2001::ffd3", 0, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, + { "2001::ffd3%1", 1, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, + { "2001::ffd3%4294949819", 0xffffbbbb, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, + { "[2001::ffd3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, + { "[2001::ffd3%4294949819]:256", 0xffffbbbb, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, + { "[2001::ffd3]:256", 0, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff }, TRUE }, }; unsigned int i; @@ -1983,6 +1987,7 @@ static void test_RtlIpv6AddressToStringEx(void) res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); +todo_wine ok(len == 3 && !strcmp(buffer, "::"), "got len %d with '%s' (expected 3 with '::')\n", len, buffer); @@ -2006,6 +2011,7 @@ static void test_RtlIpv6AddressToStringEx(void) res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); ok(buffer[0] == '#', "got first char %c (expected '#')\n", buffer[0]); +todo_wine ok(len == 3, "got len %d (expected len 3)\n", len); for (i = 0; i < ARRAY_SIZE(tests); i++) @@ -2018,6 +2024,7 @@ static void test_RtlIpv6AddressToStringEx(void) res = pRtlIpv6AddressToStringExA(&ip, tests[i].scopeid, tests[i].port, buffer, &len); ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); +todo_wine_if(tests[i].todo) ok(len == (strlen(tests[i].address) + 1) && !strcmp(buffer, tests[i].address), "got len %d with '%s' (expected %d with '%s')\n", len, buffer, (int)strlen(tests[i].address), tests[i].address); } -- 2.25.0

1 0

[PATCH 1/3] widl: Generate name for a tagless enum.
by Dmitry Timoshkov 14 Feb '20

14 Feb '20

Otherwise widl crashes while generating a typelib for typedef struct _s { int type; union { int field; } u; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3a11d2ddd7..b70057eda1 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2208,6 +2208,9 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) if (-1 < tunion->typelib_idx) return; + if (!tunion->name) + tunion->name = gen_name(); + tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_UNION, tunion->name, tunion->attrs); msft_typeinfo->typeinfo->size = 0; -- 2.20.1

2 3

[tools] testbot: Highlight the 'silenced test' lines.
by Francois Gouget 14 Feb '20

14 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9f0f31307e..601ff0fcd8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -317,7 +317,9 @@ sub GetReportLineCategory($) return "todo"; } if ($Line =~ /: Tests skipped: / or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped / or + $Line =~ /^[_.a-z0-9-]+:\d+ Line has been silenced after \d+ occurrences$/ or + $Line =~ /^[0-9a-f]+:[_a-z0-9]+: Silenced \d+ todos, \d+ skips and \d+ traces\.$/) { return "skip"; } -- 2.20.1

1 0

[PATCH] winhttp/tests: Use wide character string literals.
by Hans Leidekker 14 Feb '20

14 Feb '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 55 +-- dlls/winhttp/tests/url.c | 115 ++---- dlls/winhttp/tests/winhttp.c | 645 ++++++++++++------------------ 3 files changed, 326 insertions(+), 489 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index e2bbb714fe..435e262d18 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -28,12 +28,6 @@ #include "wine/test.h" -static const WCHAR user_agent[] = {'w','i','n','e','t','e','s','t',0}; -static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR tests_hello_html[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; -static const WCHAR tests_redirect[] = {'/','t','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; -static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; - enum api { winhttp_connect = 1, @@ -191,7 +185,7 @@ static void test_connection_cache( void ) info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); event = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -208,11 +202,11 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, test_winehq, 0, 0 ); + con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); setup_test( &info, winhttp_send_request, __LINE__ ); @@ -240,7 +234,7 @@ static void test_connection_cache( void ) WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -289,7 +283,7 @@ static void test_connection_cache( void ) } - ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); if (unload) @@ -304,11 +298,11 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, test_winehq, 0, 0 ); + con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -339,7 +333,7 @@ static void test_connection_cache( void ) WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -431,7 +425,7 @@ static void test_redirect( void ) info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); @@ -440,11 +434,11 @@ static void test_redirect( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, test_winehq, 0, 0 ); + con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, tests_redirect, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/redirect", NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); setup_test( &info, winhttp_send_request, __LINE__ ); @@ -512,7 +506,7 @@ static void test_async( void ) info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - ses = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); event = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -536,14 +530,14 @@ static void test_async( void ) setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); - con = WinHttpConnect( ses, test_winehq, 0, 0 ); + con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); err = GetLastError(); ok(con != NULL, "failed to open a connection %u\n", err); ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); - req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); err = GetLastError(); ok(req != NULL, "failed to open a request %u\n", err); ok(err == ERROR_SUCCESS, "got %u\n", err); @@ -718,7 +712,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ses = WinHttpOpen(NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); @@ -787,14 +781,14 @@ static void open_async_request(int port, struct test_request *req, struct info * info->count = ARRAY_SIZE( open_socket_request_test ); } - req->session = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + req->session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(req->session != NULL, "failed to open session %u\n", GetLastError()); WinHttpSetOption( req->session, WINHTTP_OPTION_CONTEXT_VALUE, &info, sizeof(struct info *) ); WinHttpSetStatusCallback( req->session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); setup_test( info, winhttp_connect, __LINE__ ); - req->connection = WinHttpConnect( req->session, localhostW, port, 0 ); + req->connection = WinHttpConnect( req->session, L"localhost", port, 0 ); ok(req->connection != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( info, winhttp_open_request, __LINE__ ); @@ -808,10 +802,8 @@ static void open_async_request(int port, struct test_request *req, struct info * static void open_socket_request(int port, struct test_request *req, struct info *info) { - static const WCHAR socketW[] = {'/','s','o','c','k','e','t',0}; - ResetEvent( server_socket_done ); - open_async_request( port, req, info, socketW, FALSE ); + open_async_request( port, req, info, L"/socket", FALSE ); WaitForSingleObject( server_socket_available, INFINITE ); } @@ -951,8 +943,6 @@ static void test_persistent_connection(int port) struct test_request req; struct info info; - static const WCHAR testW[] = {'/','t','e','s','t',0}; - trace("Testing persistent connection...\n"); info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -969,7 +959,7 @@ static void test_persistent_connection(int port) close_request( &req, &info, FALSE ); /* chunked connection test */ - open_async_request( port, &req, &info, testW, TRUE ); + open_async_request( port, &req, &info, L"/test", TRUE ); server_read_data( "GET /test HTTP/1.1\r\n" ); server_send_reply( &req, &info, "HTTP/1.1 200 OK\r\n" @@ -983,7 +973,7 @@ static void test_persistent_connection(int port) close_request( &req, &info, FALSE ); /* HTTP/1.1 connections are persistent by default, no additional header is needed */ - open_async_request( port, &req, &info, testW, TRUE ); + open_async_request( port, &req, &info, L"/test", TRUE ); server_read_data( "GET /test HTTP/1.1\r\n" ); server_send_reply( &req, &info, "HTTP/1.1 200 OK\r\n" @@ -994,7 +984,7 @@ static void test_persistent_connection(int port) read_request_data( &req, &info, "xx", FALSE ); close_request( &req, &info, FALSE ); - open_async_request( port, &req, &info, testW, TRUE ); + open_async_request( port, &req, &info, L"/test", TRUE ); server_read_data( "GET /test HTTP/1.1\r\n" ); server_send_reply( &req, &info, "HTTP/1.1 200 OK\r\n" @@ -1011,7 +1001,6 @@ static void test_persistent_connection(int port) START_TEST (notification) { - static const WCHAR quitW[] = {'/','q','u','i','t',0}; struct server_info si; HANDLE thread; DWORD ret; @@ -1040,7 +1029,7 @@ START_TEST (notification) test_persistent_connection( si.port ); /* send the basic request again to shutdown the server thread */ - test_basic_request( si.port, NULL, quitW ); + test_basic_request( si.port, NULL, L"/quit" ); WaitForSingleObject( thread, 3000 ); CloseHandle( thread ); diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 37a6e4a10b..35d23c5b08 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -33,80 +33,45 @@ static WCHAR username[] = {'u','s','e','r','n','a','m','e',0}; static WCHAR password[] = {'p','a','s','s','w','o','r','d',0}; static WCHAR about[] = {'/','s','i','t','e','/','a','b','o','u','t',0}; static WCHAR query[] = {'?','q','u','e','r','y',0}; -static WCHAR escape[] = {' ','!','"','#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_','`','{','|','}','~',0}; +static WCHAR escape[] = {' ','!','"','#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>', + '?','@','[','\\',']','^','_','`','{','|','}','~',0}; static WCHAR escape2[] = {'\r',0x1f,' ','\n',0x7f,'\r','\n',0}; static WCHAR escape3[] = {'?','t','e','x','t','=',0xfb00,0}; static WCHAR escape4[] = {'/','t','e','x','t','=',0xfb00,0}; -static const WCHAR url1[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url2[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':',0}; -static const WCHAR url3[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url4[] = {'h','t','t','p',':','/','/',0}; -static const WCHAR url5[] = - {'f','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url6[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','2','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url7[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','s','i','t','e','/','a','b','o','u','t', - '%','2','0','!','%','2','2','%','2','3','$','%','2','5','&','\'','(',')','*','+',',','-','.','/',':',';','%','3','C','=','%','3','E','?','@','%', - '5','B','%','5','C','%','5','D','%','5','E','_','%','6','0','%','7','B','%','7','C','%','7','D','%','7','E',0}; -static const WCHAR url8[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url9[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url10[] = - {'h','t','t','p','s',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; -static const WCHAR url11[] = - {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; -static const WCHAR url12[] = - {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; -static const WCHAR url13[] = - {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; -static const WCHAR url14[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t',0}; -static const WCHAR url15[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','6','5','5','3','6',0}; -static const WCHAR url16[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','0',0}; -static const WCHAR url17[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':',0}; -static const WCHAR url18[] = - {'h','t','t','p',':','/','/','%','0','D','%','1','F','%','2','0','%','0','A','%','7','F','%','0','D','%','0','A',0}; -static const WCHAR url19[] = - {'h','t','t','p',':','/','/','?','t','e','x','t','=',0xfb00,0}; -static const WCHAR url20[] = - {'h','t','t','p',':','/','/','/','t','e','x','t','=',0xfb00,0}; -static const WCHAR url21[] = - {'h','t','t','p','s',':','/','/','n','b','a','2','k','1','9','-','w','s','.','2','k','s','p','o','r','t','s','.','c','o','m',':','1','9','1','3','3', - '/','n','b','a','/','v','4','/','A','c','c','o','u','n','t','s','/','g','e','t','_','a','c','c','o','u','n','t','?','x','=','3','7','8','9','5','2', - '6','7','7','5','2','6','5','6','6','3','8','7','6',0}; - -static const WCHAR url_k1[] = - {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', - '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; -static const WCHAR url_k2[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR url_k3[] = - {'h','t','t','p','s',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','p','o','s','t','?',0}; -static const WCHAR url_k4[] = - {'H','T','T','P',':','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR url_k5[] = - {'h','t','t','p',':','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR url_k6[] = - {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR url_k7[] = - {'w','w','w',0}; -static const WCHAR url_k8[] = - {'h','t','t','p',0}; -static const WCHAR url_k9[] = - {'h','t','t','p',':','/','/','w','i','n','e','h','q','?',0}; -static const WCHAR url_k10[] = - {'h','t','t','p',':','/','/','w','i','n','e','h','q','/','p','o','s','t',';','a',0}; +static const WCHAR url1[] = L"http://username:password@www.winehq.org/site/about?query"; +static const WCHAR url2[] = L"http://username:"; +static const WCHAR url3[] = L"http://www.winehq.org/site/about?query"; +static const WCHAR url4[] = L"http://"; +static const WCHAR url5[] = L"ftp://username:password@www.winehq.org:80/site/about?query"; +static const WCHAR url6[] = L"http://username:password@www.winehq.org:42/site/about?query"; +static const WCHAR url7[] = L"http://username:password@www.winehq.org/site/about%20!%22%23$%25&'()" + "*+,-./:;%3C=%3E?@%5B%5C%5D%5E_%60%7B%7C%7D%7E"; +static const WCHAR url8[] = L"http://username:password@www.winehq.org:0/site/about?query"; +static const WCHAR url9[] = L"http://username:password@www.winehq.org:80/site/about?query"; +static const WCHAR url10[] = L"https://username:password@www.winehq.org:443/site/about?query"; +static const WCHAR url11[] = L"http://example.net/path?var1=example@example.com&var2=x&var3=y"; +static const WCHAR url12[] = L"https://tools.google.com/service/update2?w=3:BxDHoWy8ezM"; +static const WCHAR url13[] = L"http://winehq.o g/path with spaces"; +static const WCHAR url14[] = L"http://www.winehq.org/test"; +static const WCHAR url15[] = L"http://winehq.org:65536"; +static const WCHAR url16[] = L"http://winehq.org:0"; +static const WCHAR url17[] = L"http://winehq.org:"; +static const WCHAR url18[] = L"http://%0D%1F%20%0A%7F%0D%0A"; +static const WCHAR url19[] = L"http://?text=\xfb00"; +static const WCHAR url20[] = L"http:///text=\xfb00"; +static const WCHAR url21[] = L"https://nba2k19-ws.2ksports.com:19133/nba/v4/Accounts/get_account?x=3789526…"; + +static const WCHAR url_k1[] = L"http://username:password@www.winehq.org/site/about"; +static const WCHAR url_k2[] = L"http://www.winehq.org"; +static const WCHAR url_k3[] = L"https://www.winehq.org/post?"; +static const WCHAR url_k4[] = L"HTTP:www.winehq.org"; +static const WCHAR url_k5[] = L"http:/www.winehq.org"; +static const WCHAR url_k6[] = L"www.winehq.org"; +static const WCHAR url_k7[] = L"www"; +static const WCHAR url_k8[] = L"http"; +static const WCHAR url_k9[] = L"http://winehq?"; +static const WCHAR url_k10[] = L"http://winehq/post;a"; static void fill_url_components( URL_COMPONENTS *uc ) { @@ -427,10 +392,6 @@ static void reset_url_components( URL_COMPONENTS *uc ) static void WinHttpCrackUrl_test( void ) { - static const WCHAR hostnameW[] = - {'w','i','n','e','h','q','.','o',' ','g',0}; - static const WCHAR pathW[] = - {'/','p','a','t','h','%','2','0','w','i','t','h','%','2','0','s','p','a','c','e','s',0}; URL_COMPONENTSW uc; WCHAR scheme[20], user[20], pass[20], host[40], path[80], extra[40]; DWORD error; @@ -758,9 +719,9 @@ static void WinHttpCrackUrl_test( void ) uc.nPort = 0; ret = WinHttpCrackUrl( url13, 0, ICU_ESCAPE|ICU_DECODE, &uc ); ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); - ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); - ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == lstrlenW(pathW), "got %u\n", uc.dwUrlPathLength ); + ok( !lstrcmpW( uc.lpszHostName, L"winehq.o g" ), "unexpected host name\n" ); + ok( !lstrcmpW( uc.lpszUrlPath, L"/path%20with%20spaces" ), "unexpected path\n" ); + ok( uc.dwUrlPathLength == lstrlenW(L"/path%20with%20spaces"), "got %u\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 83f7809a3c..ab91940ebb 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,12 +37,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const WCHAR test_useragent[] = - {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; -static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; -static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; - static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -72,7 +66,7 @@ static void test_WinHttpQueryOption(void) DWORD feature, size; SetLastError(0xdeadbeef); - session = WinHttpOpen(test_useragent, 0, 0, 0, 0); + session = WinHttpOpen(L"winetest", 0, 0, 0, 0); ok(session != NULL, "WinHttpOpen failed to open session, error %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -150,7 +144,7 @@ static void test_WinHttpQueryOption(void) "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - connection = WinHttpConnect(session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect(session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; @@ -258,7 +252,7 @@ static void test_WinHttpOpenRequest (void) DWORD err; SetLastError(0xdeadbeef); - session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); err = GetLastError(); ok(session != NULL, "WinHttpOpen failed to open session.\n"); @@ -273,7 +267,7 @@ static void test_WinHttpOpenRequest (void) /* Test with a valid server name */ SetLastError(0xdeadbeef); - connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); err = GetLastError(); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", err); ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); @@ -317,21 +311,20 @@ static void test_WinHttpOpenRequest (void) static void test_empty_headers_param(void) { - static const WCHAR empty[] = {0}; HINTERNET ses, con, req; DWORD err; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, test_winehq, 80, 0); + con = WinHttpConnect(ses, L"test.winehq.org", 80, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); + ret = WinHttpSendRequest(req, L"", 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { @@ -348,12 +341,8 @@ static void test_empty_headers_param(void) static void test_WinHttpSendRequest (void) { - static const WCHAR content_type[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; - static const WCHAR test_file[] = {'t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; - static const WCHAR postW[] = {'P','O','S','T',0}; - static CHAR post_data[] = "mode=Test"; + static const WCHAR content_type[] = L"Content-Type: application/x-www-form-urlencoded"; + static char post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable, len; @@ -367,14 +356,14 @@ static void test_WinHttpSendRequest (void) total_len = optional_len = sizeof(post_data); memset(buffer, 0xff, sizeof(buffer)); - session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); - request = WinHttpOpenRequest(connection, postW, test_file, NULL, WINHTTP_NO_REFERER, + request = WinHttpOpenRequest(connection, L"POST", L"tests/post.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) { @@ -388,8 +377,8 @@ static void test_WinHttpSendRequest (void) len = sizeof(method); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_REQUEST_METHOD, NULL, method, &len, NULL); ok(ret, "got %u\n", GetLastError()); - ok(len == lstrlenW(postW) * sizeof(WCHAR), "got %u\n", len); - ok(!lstrcmpW(method, postW), "got %s\n", wine_dbgstr_w(method)); + ok(len == lstrlenW(L"POST") * sizeof(WCHAR), "got %u\n", len); + ok(!lstrcmpW(method, L"POST"), "got %s\n", wine_dbgstr_w(method)); context = 0xdeadbeef; ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); @@ -468,9 +457,6 @@ static void test_WinHttpTimeFromSystemTime(void) { BOOL ret; static const SYSTEMTIME time = {2008, 7, 1, 28, 10, 5, 52, 0}; - static const WCHAR expected_string[] = - {'M','o','n',',',' ','2','8',' ','J','u','l',' ','2','0','0','8',' ', - '1','0',':','0','5',':','5','2',' ','G','M','T',0}; WCHAR time_string[WINHTTP_TIME_FORMAT_BUFSIZE+1]; DWORD err; @@ -491,7 +477,7 @@ static void test_WinHttpTimeFromSystemTime(void) err = GetLastError(); ok(ret, "WinHttpTimeFromSystemTime failed: %u\n", err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); - ok(memcmp(time_string, expected_string, sizeof(expected_string)) == 0, + ok(!memcmp(time_string, L"Mon, 28 Jul 2008 10:05:52 GMT", sizeof(L"Mon, 28 Jul 2008 10:05:52 GMT")), "Time string returned did not match expected time string.\n"); } @@ -500,16 +486,10 @@ static void test_WinHttpTimeToSystemTime(void) BOOL ret; SYSTEMTIME time; static const SYSTEMTIME expected_time = {2008, 7, 1, 28, 10, 5, 52, 0}; - static const WCHAR time_string1[] = - {'M','o','n',',',' ','2','8',' ','J','u','l',' ','2','0','0','8',' ', - + '1','0',':','0','5',':','5','2',' ','G','M','T','\n',0}; - static const WCHAR time_string2[] = - {' ','m','o','n',' ','2','8',' ','j','u','l',' ','2','0','0','8',' ', - '1','0',' ','0','5',' ','5','2','\n',0}; DWORD err; SetLastError(0xdeadbeef); - ret = WinHttpTimeToSystemTime(time_string1, NULL); + ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", NULL); err = GetLastError(); ok(!ret, "WinHttpTimeToSystemTime succeeded\n"); ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); @@ -521,7 +501,7 @@ static void test_WinHttpTimeToSystemTime(void) ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); SetLastError(0xdeadbeef); - ret = WinHttpTimeToSystemTime(time_string1, &time); + ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", &time); err = GetLastError(); ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); @@ -529,7 +509,7 @@ static void test_WinHttpTimeToSystemTime(void) "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); SetLastError(0xdeadbeef); - ret = WinHttpTimeToSystemTime(time_string2, &time); + ret = WinHttpTimeToSystemTime(L" mon 28 jul 2008 10 05 52\n", &time); err = GetLastError(); ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); @@ -539,78 +519,49 @@ static void test_WinHttpTimeToSystemTime(void) static void test_WinHttpAddHeaders(void) { + static const WCHAR test_header_begin[] = + {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; HINTERNET session, request, connection; BOOL ret, reverse; WCHAR buffer[MAX_PATH]; WCHAR check_buffer[MAX_PATH]; DWORD err, index, len, oldlen; - static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; - static const WCHAR test_verb[] = {'P','O','S','T',0}; - static const WCHAR test_header_begin[] = - {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; - static const WCHAR full_path_test_header_begin[] = - {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0', - '/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; - static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; - static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; - static const WCHAR test_header_name2[] = {'n','a','m','e',0}; - static const WCHAR test_header_name3[] = {'a',0}; - static const WCHAR test_header_range[] = {'R','a','n','g','e',0}; - static const WCHAR test_header_range_bytes[] = {'R','a','n','g','e',':',' ','b','y','t','e','s','=','0','-','7','7','3','\r','\n',0}; - static const WCHAR test_header_bytes[] = {'b','y','t','e','s','=','0','-','7','7','3',0}; - - static const WCHAR test_flag_coalesce[] = {'t','e','s','t','2',',',' ','t','e','s','t','4',0}; - static const WCHAR test_flag_coalesce_reverse[] = {'t','e','s','t','3',',',' ','t','e','s','t','4',0}; - static const WCHAR test_flag_coalesce_comma[] = - {'t','e','s','t','2',',',' ','t','e','s','t','4',',',' ','t','e','s','t','5',0}; - static const WCHAR test_flag_coalesce_comma_reverse[] = - {'t','e','s','t','3',',',' ','t','e','s','t','4',',',' ','t','e','s','t','5',0}; - static const WCHAR test_flag_coalesce_semicolon[] = - {'t','e','s','t','2',',',' ','t','e','s','t','4',',',' ','t','e','s','t','5',';',' ','t','e','s','t','6',0}; - static const WCHAR test_flag_coalesce_semicolon_reverse[] = - {'t','e','s','t','3',',',' ','t','e','s','t','4',',',' ','t','e','s','t','5',';',' ','t','e','s','t','6',0}; - - static const WCHAR field[] = {'f','i','e','l','d',0}; - static const WCHAR value[] = {'v','a','l','u','e',' ',0}; - static const WCHAR value_nospace[] = {'v','a','l','u','e',0}; - static const WCHAR empty[] = {0}; - static const WCHAR test_headers[][14] = - { - {'W','a','r','n','i','n','g',':','t','e','s','t','1',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','2',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','3',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','4',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','5',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','6',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','7',0}, - {0}, - {':',0}, - {'a',':',0}, - {':','b',0}, - {'c','d',0}, - {' ','e',' ',':','f',0}, - {'f','i','e','l','d',':',' ','v','a','l','u','e',' ',0}, - {'n','a','m','e',':',' ','v','a','l','u','e',0}, - {'n','a','m','e',':',0} - }; + { + L"Warning:test1", + L"Warning:test2", + L"Warning:test3", + L"Warning:test4", + L"Warning:test5", + L"Warning:test6", + L"Warning:test7", + L"", + L":", + L"a:", + L":b", + L"cd", + L" e :f", + L"field: value ", + L"name: value", + L"name:", + }; static const WCHAR test_indices[][6] = - { - {'t','e','s','t','1',0}, - {'t','e','s','t','2',0}, - {'t','e','s','t','3',0}, - {'t','e','s','t','4',0} - }; + { + L"test1", + L"test2", + L"test3", + L"test4", + }; - session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); - request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, + request = WinHttpOpenRequest(connection, L"POST", L"/posttest.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) { @@ -622,7 +573,7 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, found 'Warning' header.\n"); SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); @@ -633,14 +584,15 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed: header index not incremented\n"); - ok(memcmp(buffer, test_indices[0], sizeof(test_indices[0])) == 0, "WinHttpQueryHeaders failed: incorrect string returned\n"); + ok(!memcmp(buffer, test_indices[0], sizeof(test_indices[0])), + "WinHttpQueryHeaders failed: incorrect string returned\n"); ok(len == 5*sizeof(WCHAR), "WinHttpQueryHeaders failed: invalid length returned, expected 5, got %d\n", len); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, second index should not exist.\n"); /* Try to fetch the header info with a buffer that's big enough to fit the @@ -651,7 +603,7 @@ static void test_WinHttpAddHeaders(void) memset(check_buffer, 0xab, sizeof(check_buffer)); memcpy(buffer, check_buffer, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer that's too small.\n"); ok(memcmp(buffer, check_buffer, sizeof(buffer)) == 0, "WinHttpQueryHeaders failed, modified the buffer when it should not have.\n"); @@ -662,7 +614,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, NULL, &len, &index); + L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); @@ -673,7 +625,7 @@ static void test_WinHttpAddHeaders(void) len = 10; SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, NULL, &len, &index); + L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); @@ -684,7 +636,7 @@ static void test_WinHttpAddHeaders(void) len = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, NULL, &len, &index); + L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); @@ -697,15 +649,14 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); memset(buffer, 0xff, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: got %d\n", ret); ok(len + sizeof(WCHAR) <= oldlen, "WinHttpQueryHeaders resulting length longer than advertized.\n"); - ok((len < sizeof(buffer) - sizeof(WCHAR)) && buffer[len / sizeof(WCHAR)] == 0, "WinHttpQueryHeaders did not append NULL terminator\n"); + ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)], + "WinHttpQueryHeaders did not append NULL terminator\n"); ok(len == lstrlenW(buffer) * sizeof(WCHAR), "WinHttpQueryHeaders returned incorrect length.\n"); - ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || - memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, - "WinHttpQueryHeaders returned invalid beginning of header string.\n"); - ok(memcmp(buffer + lstrlenW(buffer) - 4, test_header_end, sizeof(test_header_end)) == 0, + ok(!memcmp(buffer, test_header_begin, sizeof(test_header_begin)), "invalid beginning of header string.\n"); + ok(!memcmp(buffer + lstrlenW(buffer) - 4, L"\r\n\r\n", sizeof(L"\r\n\r\n")), "WinHttpQueryHeaders returned invalid end of header string.\n"); ok(index == 0, "WinHttpQueryHeaders incremented header index.\n"); @@ -713,7 +664,7 @@ static void test_WinHttpAddHeaders(void) len = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, NULL, &len, &index); + L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); @@ -725,14 +676,12 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); memset(buffer, 0xff, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed %u\n", GetLastError()); ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], "no double NULL terminator\n"); - ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || - memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, - "invalid beginning of header string.\n"); + ok(!memcmp(buffer, test_header_begin, sizeof(test_header_begin)), "invalid beginning of header string.\n"); ok(index == 0, "header index was incremented\n"); /* tests for more indices */ @@ -742,14 +691,14 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[0], sizeof(test_indices[0])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[1], sizeof(test_indices[1])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); @@ -760,18 +709,20 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); reverse = (memcmp(buffer, test_indices[1], sizeof(test_indices[1])) != 0); /* Win7 returns values in reverse order of adding */ - ok(memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); /* add if new flag */ ret = WinHttpAddRequestHeaders(request, test_headers[3], -1L, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW); @@ -780,21 +731,23 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); /* coalesce flag */ @@ -804,22 +757,24 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, - reverse ? sizeof(test_flag_coalesce_reverse) : sizeof(test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, reverse ? L"test3, test4" : L"test2, test4", + reverse ? sizeof(L"test3, test4") : sizeof(L"test2, test4")), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); /* coalesce with comma flag */ @@ -829,23 +784,25 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, - reverse ? sizeof(test_flag_coalesce_comma_reverse) : sizeof(test_flag_coalesce_comma)) == 0, + + ok(!memcmp(buffer, reverse ? L"test3, test4, test5" : L"test2, test4, test5", + reverse ? sizeof(L"test3, test4, test5") : sizeof(L"test2, test4, test5")), "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); @@ -856,23 +813,25 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, - reverse ? sizeof(test_flag_coalesce_semicolon_reverse) : sizeof(test_flag_coalesce_semicolon)) == 0, - "WinHttpQueryHeaders returned incorrect string.\n"); + + ok(!memcmp(buffer, reverse ? L"test3, test4, test5; test6" : L"test2, test4, test5; test6", + reverse ? sizeof(L"test3, test4, test5; test6") : sizeof(L"test2, test4, test5; test6")), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); /* add and replace flags */ @@ -882,21 +841,23 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 3 : 2], sizeof(test_indices[reverse ? 3 : 2])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 3 : 2], sizeof(test_indices[reverse ? 3 : 2])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, test_indices[reverse ? 1 : 3], sizeof(test_indices[reverse ? 1 : 3])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(!memcmp(buffer, test_indices[reverse ? 1 : 3], sizeof(test_indices[reverse ? 1 : 3])), + "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name, buffer, &len, &index); + L"Warning", buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0u, WINHTTP_ADDREQ_FLAG_ADD); @@ -909,9 +870,9 @@ static void test_WinHttpAddHeaders(void) memset(buffer, 0xff, sizeof(buffer)); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name3, buffer, &len, &index); + L"a", buffer, &len, &index); ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); - ok(!memcmp(buffer, empty, sizeof(empty)), "unexpected result\n"); + ok(!memcmp(buffer, L"", sizeof(L"")), "unexpected result\n"); ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); @@ -929,34 +890,34 @@ static void test_WinHttpAddHeaders(void) buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - field, buffer, &len, &index); + L"field", buffer, &len, &index); ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); - ok(!memcmp(buffer, value, sizeof(value)) || ! memcmp(buffer, value_nospace, sizeof(value_nospace)), "unexpected result\n"); + ok(!memcmp(buffer, L"value ", sizeof(L"value ")) || !memcmp(buffer, L"value", sizeof(L"value")), + "unexpected result\n"); SetLastError(0xdeadbeef); - ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, 0, + ret = WinHttpAddRequestHeaders(request, L"Range: bytes=0-773\r\n", 0, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); err = GetLastError(); ok(!ret, "unexpected success\n"); ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); - ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, ~0u, + ret = WinHttpAddRequestHeaders(request, L"Range: bytes=0-773\r\n", ~0u, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); ok(ret, "failed to add header: %u\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_range, buffer, &len, &index); + L"Range", buffer, &len, &index); ok(ret, "failed to get range header %u\n", GetLastError()); - ok(!memcmp(buffer, test_header_bytes, sizeof(test_header_bytes)), "incorrect string returned\n"); - ok(len == lstrlenW(test_header_bytes) * sizeof(WCHAR), "wrong length %u\n", len); + ok(!memcmp(buffer, L"bytes=0-773", sizeof(L"bytes=0-773")), "incorrect string returned\n"); + ok(len == lstrlenW(L"bytes=0-773") * sizeof(WCHAR), "wrong length %u\n", len); ok(index == 1, "wrong index %u\n", index); - index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name2, buffer, &len, &index); + L"name", buffer, &len, &index); ok(!ret, "unexpected success\n"); SetLastError(0xdeadbeef); @@ -971,10 +932,10 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name2, buffer, &len, &index); + L"name", buffer, &len, &index); ok(ret, "got %u\n", GetLastError()); ok(index == 1, "wrong index %u\n", index); - ok(!memcmp(buffer, value_nospace, sizeof(value_nospace)), "incorrect string\n"); + ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpAddRequestHeaders(request, test_headers[15], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); ok(ret, "got %u\n", GetLastError()); @@ -983,7 +944,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name2, buffer, &len, &index); + L"name", buffer, &len, &index); err = GetLastError(); ok(!ret, "unexpected success\n"); ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); @@ -994,10 +955,10 @@ static void test_WinHttpAddHeaders(void) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - test_header_name2, buffer, &len, &index); + L"name", buffer, &len, &index); ok(ret, "got %u\n", GetLastError()); ok(index == 1, "wrong index %u\n", index); - ok(!memcmp(buffer, value_nospace, sizeof(value_nospace)), "incorrect string\n"); + ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); @@ -1039,7 +1000,7 @@ static void test_secure_connection(void) WINHTTP_CERTIFICATE_INFO info; char buffer[32]; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); policy = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; @@ -1051,7 +1012,7 @@ static void test_secure_connection(void) err = GetLastError(); ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); - con = WinHttpConnect(ses, test_winehq, 443, 0); + con = WinHttpConnect(ses, L"test.winehq.org", 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); SetLastError( 0xdeadbeef ); @@ -1212,16 +1173,15 @@ cleanup: static void test_request_parameter_defaults(void) { - static const WCHAR empty[] = {0}; HINTERNET ses, con, req; DWORD size, status, error; WCHAR *version; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, test_winehq, 0, 0); + con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -1247,7 +1207,7 @@ static void test_request_parameter_defaults(void) WinHttpCloseHandle(req); - req = WinHttpOpenRequest(con, empty, empty, empty, NULL, NULL, 0); + req = WinHttpOpenRequest(con, L"", L"", L"", NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -1440,7 +1400,7 @@ static void test_timeouts(void) DWORD value, size; HINTERNET ses, req, con; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1601,7 +1561,7 @@ static void test_timeouts(void) ok(ret, "%u\n", GetLastError()); ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); - con = WinHttpConnect(ses, test_winehq, 0, 0); + con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); /* Timeout values should match the last one set for session */ @@ -2094,22 +2054,20 @@ static void test_timeouts(void) static void test_resolve_timeout(void) { - static const WCHAR nxdomain[] = - {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; HINTERNET ses, con, req; DWORD timeout; BOOL ret; if (! proxy_active()) { - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - con = WinHttpConnect(ses, nxdomain, 0, 0); + con = WinHttpConnect(ses, L"nxdomain.winehq.org", 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -2137,14 +2095,14 @@ static void test_resolve_timeout(void) else skip("Skipping host resolution tests, host resolution performed by proxy\n"); - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - con = WinHttpConnect(ses, test_winehq, 0, 0); + con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -2448,15 +2406,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) { - static const WCHAR test_header_end_clrf[] = {'\r','\n','\r','\n',0}; - static const WCHAR test_header_end_raw[] = {0,0}; HINTERNET ses, con, req; char buffer[0x100]; WCHAR buffer2[0x100]; DWORD count, status, size, error, supported, first, target; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2467,7 +2423,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ret = WinHttpQueryOption(ses, 0, buffer, &size); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2515,14 +2471,14 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL); ok(ret, "failed to query for raw headers: %u\n", GetLastError()); - ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, test_header_end_clrf, sizeof(test_header_end_clrf)), + ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, L"\r\n\r\n", sizeof(L"\r\n\r\n")), "WinHttpQueryHeaders returned invalid end of header string\n"); size = sizeof(buffer2); memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL); ok(ret, "failed to query for raw headers: %u\n", GetLastError()); - ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, test_header_end_raw, sizeof(test_header_end_raw)), + ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, L"", sizeof(L"")), "WinHttpQueryHeaders returned invalid end of header string\n"); ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "returned string has too many NULL characters\n"); @@ -2540,23 +2496,18 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) static void test_basic_authentication(int port) { - static const WCHAR authW[] = {'/','a','u','t','h',0}; - static const WCHAR auth_with_credsW[] = {'/','a','u','t','h','_','w','i','t','h','_','c','r','e','d','s',0}; - static WCHAR userW[] = {'u','s','e','r',0}; - static WCHAR passW[] = {'p','w','d',0}; - static WCHAR pass2W[] = {'p','w','d','2',0}; HINTERNET ses, con, req; DWORD status, size, error, supported, first, target; char buffer[32]; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2665,18 +2616,18 @@ static void test_basic_authentication(int port) ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); SetLastError(0xdeadbeef); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); SetLastError(0xdeadbeef); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, passW, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, L"pwd", NULL); error = GetLastError(); ok(!ret, "expected failure\n"); ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); ok(ret, "failed to set credentials %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2706,16 +2657,16 @@ static void test_basic_authentication(int port) WinHttpCloseHandle(ses); /* now set the credentials first to show that they get sent with the first request */ - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, auth_with_credsW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/auth_with_creds", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); ok(ret, "failed to set credentials %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2746,22 +2697,22 @@ static void test_basic_authentication(int port) /* credentials set with WinHttpSetCredentials take precedence over those set through options */ - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); ok(ret, "failed to set credentials %u\n", GetLastError()); - ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); + ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); ok(ret, "failed to set username %u\n", GetLastError()); - ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, pass2W, lstrlenW(pass2W)); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd2", lstrlenW(L"pwd2")); ok(ret, "failed to set password %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2780,22 +2731,22 @@ static void test_basic_authentication(int port) WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); + ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); ok(ret, "failed to set username %u\n", GetLastError()); - ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd", lstrlenW(L"pwd")); ok(ret, "failed to set password %u\n", GetLastError()); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, pass2W, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd2", NULL); ok(ret, "failed to set credentials %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2817,22 +2768,18 @@ static void test_basic_authentication(int port) static void test_multi_authentication(int port) { - static const WCHAR multiauthW[] = {'/','m','u','l','t','i','a','u','t','h',0}; - static const WCHAR www_authenticateW[] = - {'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0}; - static const WCHAR getW[] = {'G','E','T',0}; HINTERNET ses, con, req; DWORD supported, first, target, size, index; WCHAR buf[512]; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, getW, multiauthW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, L"GET", L"/multiauth", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, @@ -2851,7 +2798,7 @@ static void test_multi_authentication(int port) index = 0; size = sizeof(buf); - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, buf, &size, &index); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", buf, &size, &index); ok(ret, "expected success\n"); ok(!lstrcmpW(buf, L"Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); @@ -2859,7 +2806,7 @@ static void test_multi_authentication(int port) index = 0; size = 0xdeadbeef; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, NULL, &size, &index); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", NULL, &size, &index); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders returned %x(%u)\n", ret, GetLastError()); ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %u\n", size); @@ -2872,21 +2819,17 @@ static void test_multi_authentication(int port) static void test_large_data_authentication(int port) { - static const WCHAR largeauthW[] = {'/','l','a','r','g','e','a','u','t','h',0}; - static const WCHAR getW[] = {'G','E','T',0}; - static WCHAR userW[] = {'u','s','e','r',0}; - static WCHAR passW[] = {'p','w','d',0}; HINTERNET ses, con, req; DWORD status, size; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, getW, largeauthW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, L"GET", L"/largeauth", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); @@ -2901,7 +2844,7 @@ static void test_large_data_authentication(int port) ok(ret, "expected success\n"); ok(status == HTTP_STATUS_DENIED, "got %d\n", status); - ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, userW, passW, NULL); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, L"user", L"pwd", NULL); ok(ret, "expected success\n"); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); @@ -2923,18 +2866,17 @@ static void test_large_data_authentication(int port) static void test_no_headers(int port) { - static const WCHAR no_headersW[] = {'/','n','o','_','h','e','a','d','e','r','s',0}; HINTERNET ses, con, req; DWORD error; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, no_headersW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/no_headers", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2959,19 +2901,18 @@ static void test_no_headers(int port) static void test_no_content(int port) { - static const WCHAR no_contentW[] = {'/','n','o','_','c','o','n','t','e','n','t',0}; HINTERNET ses, con, req; char buf[128]; DWORD size, len = sizeof(buf), bytes_read, status; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, no_contentW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"/no_content", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); size = 12345; @@ -3043,20 +2984,18 @@ static void test_no_content(int port) static void test_head_request(int port) { - static const WCHAR verbW[] = {'H','E','A','D',0}; - static const WCHAR headW[] = {'/','h','e','a','d',0}; HINTERNET ses, con, req; char buf[128]; DWORD size, len, count, status; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, verbW, headW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, L"HEAD", L"/head", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -3102,27 +3041,24 @@ static void test_head_request(int port) static void test_not_modified(int port) { - static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; - static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; - static const WCHAR ifmodified2W[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; BOOL ret; HINTERNET session, request, connection; DWORD index, len, status, size, start = GetTickCount(); SYSTEMTIME st; - WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3], buffer[32]; + WCHAR today[(sizeof(L"If-Modified-Since: ") + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3], buffer[32]; - memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); + memcpy(today, L"If-Modified-Since: ", sizeof(L"If-Modified-Since: ")); GetSystemTime(&st); - WinHttpTimeFromSystemTime(&st, &today[ARRAY_SIZE(ifmodifiedW)]); + WinHttpTimeFromSystemTime(&st, &today[ARRAY_SIZE(L"If-Modified-Since: ") - 1]); - session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); - connection = WinHttpConnect(session, localhostW, port, 0); + connection = WinHttpConnect(session, L"localhost", port, 0); ok(connection != NULL, "WinHttpConnect failed: %u\n", GetLastError()); - request = WinHttpOpenRequest(connection, NULL, pathW, NULL, WINHTTP_NO_REFERER, + request = WinHttpOpenRequest(connection, NULL, L"/not_modified", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); @@ -3135,7 +3071,7 @@ static void test_not_modified(int port) index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - ifmodified2W, buffer, &len, &index); + L"If-Modified-Since", buffer, &len, &index); ok(ret, "failed to get header %u\n", GetLastError()); status = 0xdeadbeef; @@ -3159,35 +3095,30 @@ static void test_not_modified(int port) static void test_bad_header( int port ) { - static const WCHAR bad_headerW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', - 't','e','x','t','/','h','t','m','l','\n','\r',0}; - static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; - static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; WCHAR buffer[32]; HINTERNET ses, con, req; DWORD index, len; BOOL ret; - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); - ret = WinHttpAddRequestHeaders( req, bad_headerW, ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\r", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); ok( ret, "failed to add header %u\n", GetLastError() ); index = 0; buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - content_typeW, buffer, &len, &index ); + L"Content-Type", buffer, &len, &index ); ok( ret, "failed to query headers %u\n", GetLastError() ); - ok( !lstrcmpW( buffer, text_htmlW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); ok( index == 1, "index = %u\n", index ); WinHttpCloseHandle( req ); @@ -3197,18 +3128,17 @@ static void test_bad_header( int port ) static void test_multiple_reads(int port) { - static const WCHAR bigW[] = {'b','i','g',0}; HINTERNET ses, con, req; DWORD total_len = 0; BOOL ret; - ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, port, 0); + con = WinHttpConnect(ses, L"localhost", port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, bigW, NULL, NULL, NULL, 0); + req = WinHttpOpenRequest(con, NULL, L"big", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -3247,24 +3177,17 @@ static void test_multiple_reads(int port) static void test_cookies( int port ) { - static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; - static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; - static const WCHAR cookie3W[] = {'/','c','o','o','k','i','e','3',0}; - static const WCHAR cookie4W[] = {'/','c','o','o','k','i','e','4',0}; - static const WCHAR cookie5W[] = {'/','c','o','o','k','i','e','5',0}; - static const WCHAR cookieheaderW[] = - {'C','o','o','k','i','e',':',' ','n','a','m','e','=','v','a','l','u','e','2','\r','\n',0}; HINTERNET ses, con, req; DWORD status, size; BOOL ret; - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, cookieW, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3281,7 +3204,7 @@ static void test_cookies( int port ) WinHttpCloseHandle( req ); - req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3299,10 +3222,10 @@ static void test_cookies( int port ) WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3319,10 +3242,9 @@ static void test_cookies( int port ) WinHttpCloseHandle( req ); - req = WinHttpOpenRequest( con, NULL, cookie3W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie3", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); - - ret = WinHttpSendRequest( req, cookieheaderW, ~0u, NULL, 0, 0, 0 ); + ret = WinHttpSendRequest( req, L"Cookie: name=value2\r\n", ~0u, NULL, 0, 0, 0 ); ok( ret, "failed to send request %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); @@ -3338,13 +3260,13 @@ static void test_cookies( int port ) WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3363,13 +3285,13 @@ static void test_cookies( int port ) WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, cookie4W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie4", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3385,7 +3307,7 @@ static void test_cookies( int port ) ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); - req = WinHttpOpenRequest( con, NULL, cookie5W, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/cookie5", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3456,10 +3378,10 @@ static void test_request_path_escapes( int port ) {'/','e','s','c','a','p','e','&','t','e','x','t','=',0x541b,0x306e,0x540d,0x306f,0}; HINTERNET ses, con; - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); do_request( con, objW, 0 ); @@ -3476,19 +3398,18 @@ static void test_request_path_escapes( int port ) static void test_connection_info( int port ) { - static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; HINTERNET ses, con, req; WINHTTP_CONNECTION_INFO info; DWORD size, error; BOOL ret; - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, basicW, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/basic", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); size = sizeof(info); @@ -3535,34 +3456,24 @@ static void test_connection_info( int port ) static void test_passport_auth( int port ) { - static const WCHAR passportW[] = - {'/','p','a','s','s','p','o','r','t',0}; - static const WCHAR foundW[] = - {'F','o','u','n','d',0}; - static const WCHAR unauthorizedW[] = - {'U','n','a','u','t','h','o','r','i','z','e','d',0}; static const WCHAR headersW[] = - {'H','T','T','P','/','1','.','1',' ','4','0','1',' ','F','o','u','n','d','\r','\n', - 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','0','\r','\n', - 'L','o','c','a','t','i','o','n',':',' ','/','\r','\n', - 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',':',' ', - 'P','a','s','s','p','o','r','t','1','.','4','\r','\n','\r','\n',0}; + L"HTTP/1.1 401 Found\r\nContent-Length: 0\r\nLocation: /\r\nWWW-Authenticate: Passport1.4\r\n\r\n"; HINTERNET ses, con, req; DWORD status, size, option, err; WCHAR buf[128]; BOOL ret; - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "got %u\n", GetLastError() ); option = WINHTTP_ENABLE_PASSPORT_AUTH; ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH, &option, sizeof(option) ); ok( ret, "got %u\n", GetLastError() ); - con = WinHttpConnect( ses, localhostW, port, 0 ); + con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "got %u\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, passportW, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/passport", NULL, NULL, NULL, 0 ); ok( req != NULL, "got %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3588,7 +3499,8 @@ static void test_passport_auth( int port ) size = sizeof(buf); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_TEXT, NULL, buf, &size, NULL ); ok( ret, "got %u\n", GetLastError() ); - ok( !lstrcmpW(foundW, buf) || broken(!lstrcmpW(unauthorizedW, buf)) /* < win7 */, "got %s\n", wine_dbgstr_w(buf) ); + ok( !lstrcmpW(L"Found", buf) || broken(!lstrcmpW(L"Unauthorized", buf)) /* < win7 */, "got %s\n", + wine_dbgstr_w(buf) ); buf[0] = 0; size = sizeof(buf); @@ -3617,10 +3529,10 @@ static void test_credentials(void) WCHAR buffer[32]; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, proxy_userW, proxy_passW, 0); + ses = WinHttpOpen(L"winetest", 0, proxy_userW, proxy_passW, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, localhostW, 0, 0); + con = WinHttpConnect(ses, L"localhost", 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -3730,22 +3642,6 @@ static void test_credentials(void) static void test_IWinHttpRequest(int port) { static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; - static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; - static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; - static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url2W[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url3W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.', - 'o','r','g','/','t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; - static const WCHAR method1W[] = {'G','E','T',0}; - static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; - static const WCHAR method3W[] = {'P','O','S','T',0}; - static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; - static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; - static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; - static const WCHAR dateW[] = {'D','a','t','e',0}; - static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; - static const WCHAR utf8W[] = {'u','t','f','-','8',0}; - static const WCHAR unauthW[] = {'U','n','a','u','t','h','o','r','i','z','e','d',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; @@ -3774,15 +3670,15 @@ static void test_IWinHttpRequest(int port) V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; - method = SysAllocString( method3W ); - url = SysAllocString( url3W ); + method = SysAllocString( L"POST" ); + url = SysAllocString( L"http://test.winehq.org/tests/post.php" ); hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( method ); SysFreeString( url ); V_VT( &data ) = VT_BSTR; - V_BSTR( &data ) = SysAllocString( test_dataW ); + V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); @@ -3791,14 +3687,14 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - method = SysAllocString( method1W ); + method = SysAllocString( L"GET" ); hr = IWinHttpRequest_Open( req, method, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = IWinHttpRequest_Open( req, method, NULL, async ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - url = SysAllocString( url1W ); + url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, NULL, url, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -3817,19 +3713,19 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( url ); - url = SysAllocString( url2W ); + url = SysAllocString( L"test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); SysFreeString( method ); - method = SysAllocString( method2W ); + method = SysAllocString( L"INVALID" ); hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); SysFreeString( method ); - method = SysAllocString( method1W ); + method = SysAllocString( L"GET" ); SysFreeString( url ); - url = SysAllocString( url1W ); + url = SysAllocString( L"http://test.winehq.org" ); V_VT( &async ) = VT_ERROR; V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); @@ -3854,7 +3750,7 @@ static void test_IWinHttpRequest(int port) ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) ); - value = SysAllocString( utf8W ); + value = SysAllocString( L"utf-8" ); V_VT( &cp ) = VT_BSTR; V_BSTR( &cp ) = value; hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); @@ -3931,7 +3827,7 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); - connection = SysAllocString( connectionW ); + connection = SysAllocString( L"Connection" ); hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); @@ -3941,7 +3837,7 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_SetRequestHeader( req, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - date = SysAllocString( dateW ); + date = SysAllocString( L"Date" ); hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); @@ -3956,9 +3852,9 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( method ); - method = SysAllocString( method1W ); + method = SysAllocString( L"GET" ); SysFreeString( url ); - url = SysAllocString( url1W ); + url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3983,11 +3879,11 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - username = SysAllocString( usernameW ); + username = SysAllocString( L"username" ); hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - password = SysAllocString( passwordW ); + password = SysAllocString( L"password" ); hr = IWinHttpRequest_SetCredentials( req, NULL, password, 0xdeadbeef ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -4001,9 +3897,9 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); V_VT( &proxy_server ) = VT_BSTR; - V_BSTR( &proxy_server ) = SysAllocString( proxy_serverW ); + V_BSTR( &proxy_server ) = SysAllocString( L"proxyserver" ); V_VT( &bypass_list ) = VT_BSTR; - V_BSTR( &bypass_list ) = SysAllocString( bypas_listW ); + V_BSTR( &bypass_list ) = SysAllocString( L"bypasslist" ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); ok( hr == S_OK, "got %08x\n", hr ); @@ -4244,8 +4140,8 @@ static void test_IWinHttpRequest(int port) hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); - url = SysAllocString( test_winehq_https ); - method = SysAllocString( method3W ); + url = SysAllocString( L"https://test.winehq.org:443" ); + method = SysAllocString( L"POST" ); V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); @@ -4271,7 +4167,7 @@ static void test_IWinHttpRequest(int port) sprintf( buf, "http://localhost:%d/auth", port ); MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, ARRAY_SIZE( bufW )); url = SysAllocString( bufW ); - method = SysAllocString( method3W ); + method = SysAllocString( L"POST" ); V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); @@ -4283,14 +4179,14 @@ static void test_IWinHttpRequest(int port) ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); V_VT( &data ) = VT_BSTR; - V_BSTR( &data ) = SysAllocString( test_dataW ); + V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); + ok( !memcmp( response, L"Unauthorized", sizeof(L"Unauthorized") ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response ); status = 0xdeadbeef; @@ -4325,8 +4221,6 @@ static void request_get_property(IWinHttpRequest *request, int property, VARIANT static void test_IWinHttpRequest_Invoke(void) { - static const WCHAR utf8W[] = {'U','T','F','-','8',0}; - static const WCHAR regid[] = {'W','i','n','H','t','t','p','.','W','i','n','H','t','t','p','R','e','q','u','e','s','t','.','5','.','1',0}; WCHAR openW[] = {'O','p','e','n',0}; WCHAR optionW[] = {'O','p','t','i','o','n',0}; OLECHAR *open = openW, *option = optionW; @@ -4343,7 +4237,7 @@ static void test_IWinHttpRequest_Invoke(void) CoInitialize(NULL); - hr = CLSIDFromProgID(regid, &clsid); + hr = CLSIDFromProgID(L"WinHttp.WinHttpRequest.5.1", &clsid); ok(hr == S_OK, "CLSIDFromProgID error %#x\n", hr); bret = IsEqualIID(&clsid, &CLSID_WinHttpRequest); ok(bret || broken(!bret) /* win2003 */, "not expected %s\n", wine_dbgstr_guid(&clsid)); @@ -4423,7 +4317,7 @@ static void test_IWinHttpRequest_Invoke(void) params.cNamedArgs = 0; params.rgvarg = arg; V_VT(&arg[0]) = VT_BSTR; - utf8 = SysAllocString(utf8W); + utf8 = SysAllocString(L"UTF-8"); V_BSTR(&arg[0]) = utf8; V_VT(&arg[1]) = VT_R8; V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ @@ -4626,9 +4520,6 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) static void test_WinHttpGetProxyForUrl(void) { - static const WCHAR urlW[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR wpadW[] = {'h','t','t','p',':','/','/','w','p','a','d','/','w','p','a','d','.','d','a','t',0}; - static const WCHAR emptyW[] = {0}; BOOL ret; DWORD error; HINTERNET session; @@ -4643,7 +4534,7 @@ static void test_WinHttpGetProxyForUrl(void) ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_HANDLE, "got %u\n", error ); - session = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + session = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok( session != NULL, "failed to open session %u\n", GetLastError() ); SetLastError(0xdeadbeef); @@ -4653,19 +4544,19 @@ static void test_WinHttpGetProxyForUrl(void) ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, emptyW, NULL, NULL ); + ret = WinHttpGetProxyForUrl( session, L"", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, NULL, NULL ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); @@ -4674,7 +4565,7 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, &options, NULL ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); @@ -4683,7 +4574,7 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = 0; SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); @@ -4692,7 +4583,7 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); @@ -4702,7 +4593,7 @@ static void test_WinHttpGetProxyForUrl(void) memset( &info, 0, sizeof(info) ); SetLastError(0xdeadbeef); - ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); if (ret) { @@ -4716,10 +4607,10 @@ static void test_WinHttpGetProxyForUrl(void) options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; options.dwAutoDetectFlags = 0; - options.lpszAutoConfigUrl = wpadW; + options.lpszAutoConfigUrl = L"http://wpad/wpad.dat"; memset( &info, 0, sizeof(info) ); - ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); if (ret) { trace("Proxy.AccessType=%u\n", info.dwAccessType); @@ -4733,8 +4624,6 @@ static void test_WinHttpGetProxyForUrl(void) static void test_chunked_read(void) { - static const WCHAR verb[] = {'/','t','e','s','t','s','/','c','h','u','n','k','e','d',0}; - static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; DWORD len, err; HINTERNET ses, con = NULL, req = NULL; @@ -4742,15 +4631,15 @@ static void test_chunked_read(void) trace( "starting chunked read test\n" ); - ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "WinHttpOpen failed with error %u\n", GetLastError() ); if (!ses) goto done; - con = WinHttpConnect( ses, test_winehq, 0, 0 ); + con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); ok( con != NULL, "WinHttpConnect failed with error %u\n", GetLastError() ); if (!con) goto done; - req = WinHttpOpenRequest( con, NULL, verb, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, L"/tests/chunked", NULL, NULL, NULL, 0 ); ok( req != NULL, "WinHttpOpenRequest failed with error %u\n", GetLastError() ); if (!req) goto done; @@ -4772,7 +4661,7 @@ static void test_chunked_read(void) len = sizeof(header); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); ok( ret, "failed to get TRANSFER_ENCODING header (error %u)\n", GetLastError() ); - ok( !lstrcmpW( header, chunked ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); + ok( !lstrcmpW( header, L"chunked" ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); trace( "transfer encoding: %s\n", wine_dbgstr_w(header) ); header[0] = 0; @@ -4818,8 +4707,6 @@ done: START_TEST (winhttp) { - static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; - static const WCHAR quitW[] = {'/','q','u','i','t',0}; struct server_info si; HANDLE thread; DWORD ret; @@ -4859,7 +4746,7 @@ START_TEST (winhttp) test_IWinHttpRequest(si.port); test_connection_info(si.port); - test_basic_request(si.port, NULL, basicW); + test_basic_request(si.port, NULL, L"/basic"); test_no_headers(si.port); test_no_content(si.port); test_head_request(si.port); @@ -4874,7 +4761,7 @@ START_TEST (winhttp) test_passport_auth(si.port); /* send the basic request again to shutdown the server thread */ - test_basic_request(si.port, NULL, quitW); + test_basic_request(si.port, NULL, L"/quit"); WaitForSingleObject(thread, 3000); CloseHandle(thread); -- 2.20.1

1 0

[PATCH 3/3] ucrtbase: Use public headers for _vsnprintf implementation.
by Jacek Caban 14 Feb '20

14 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/printf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH 2/3] include: Move NULL define to corecrt.h.
by Jacek Caban 14 Feb '20

14 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt.h | 8 ++++++++ include/msvcrt/stddef.h | 8 -------- include/msvcrt/stdio.h | 8 -------- include/msvcrt/stdlib.h | 8 -------- include/msvcrt/string.h | 8 -------- include/msvcrt/time.h | 8 -------- include/msvcrt/wchar.h | 8 -------- 7 files changed, 8 insertions(+), 48 deletions(-)

1 0

[PATCH 1/3] corecrt_stdio_config.h: Add new header file.
by Jacek Caban 14 Feb '20

14 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_stdio_config.h | 30 +++++++++++++++++++++++++++ include/msvcrt/corecrt_wstdio.h | 1 + 2 files changed, 31 insertions(+) create mode 100644 include/msvcrt/corecrt_stdio_config.h

1 0

[PATCH 3/3] activeds.tlb: Add typelib.
by Dmitry Timoshkov 14 Feb '20

14 Feb '20

This patch depends on widl fixes, otherwise widl crashes while generating a typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/activeds.tlb/Makefile.in | 3 +++ dlls/activeds.tlb/activeds.tlb.idl | 21 +++++++++++++++++++++ dlls/activeds.tlb/activeds.tlb.spec | 1 + 4 files changed, 26 insertions(+) create mode 100644 dlls/activeds.tlb/Makefile.in create mode 100644 dlls/activeds.tlb/activeds.tlb.idl create mode 100644 dlls/activeds.tlb/activeds.tlb.spec diff --git a/configure.ac b/configure.ac index b3389b796b..c1a8a87913 100644 --- a/configure.ac +++ b/configure.ac @@ -2785,6 +2785,7 @@ WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$wi WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) +WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) WINE_CONFIG_MAKEFILE(dlls/actxprxy) WINE_CONFIG_MAKEFILE(dlls/adsiid) diff --git a/dlls/activeds.tlb/Makefile.in b/dlls/activeds.tlb/Makefile.in new file mode 100644 index 0000000000..7c41f5efaf --- /dev/null +++ b/dlls/activeds.tlb/Makefile.in @@ -0,0 +1,3 @@ +MODULE = activeds.tlb + +IDL_SRCS = activeds.tlb.idl diff --git a/dlls/activeds.tlb/activeds.tlb.idl b/dlls/activeds.tlb/activeds.tlb.idl new file mode 100644 index 0000000000..f8c09a1d97 --- /dev/null +++ b/dlls/activeds.tlb/activeds.tlb.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "iads.idl" diff --git a/dlls/activeds.tlb/activeds.tlb.spec b/dlls/activeds.tlb/activeds.tlb.spec new file mode 100644 index 0000000000..b427b2913c --- /dev/null +++ b/dlls/activeds.tlb/activeds.tlb.spec @@ -0,0 +1 @@ +# no exported entry points -- 2.20.1

1 0

[PATCH 2/3] widl: If a variable doesn't have a name provide an autogenerated one.
by Dmitry Timoshkov 14 Feb '20

14 Feb '20

Otherwise widl crashes while generating a typelib for a structure with an embedded anonymous union: typedef struct _s { int type; union { int f; }; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index b70057eda1..7cfe9e146c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1630,6 +1630,9 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; + if (!var->name) + var->name = gen_name(); + chat("add_var_desc(%d, %s)\n", index, var->name); id = 0x40000000 + index; -- 2.20.1

1 0

[PATCH] stdio.h: Provide sprintf and _snprintf as inline wrappers.
by Jacek Caban 14 Feb '20

14 Feb '20

It's enough for Wine debug functions to use _vsnprintf from ucrtbase importlib instead of ntdll for modules that link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/msvcp_main.c | 10 ---------- include/msvcrt/stdio.h | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 12 deletions(-)

1 0

[PATCH] user32: Initialize module handle to NULL for null driver.
by Jacek Caban 14 Feb '20

14 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 01/14] advapi32/tests: Fix some format-overflow warnings.
by Rémi Bernon 14 Feb '20

14 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 484167656f1..43d97386270 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -195,7 +195,7 @@ static void test_create_delete_svc(void) SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; - CHAR account[UNLEN + 3]; + CHAR account[MAX_PATH + UNLEN + 1]; static const CHAR servicename [] = "winetest_create_delete"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; -- 2.25.0

5 29

[PATCH 1/3] ole32: Fix CoGetApartmentType() return value for implicit MTA case.
by Nikolay Sivov 14 Feb '20

14 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 1 + dlls/ole32/tests/compobj.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index aeed3b85fa..bd28f42b33 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5264,6 +5264,7 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) apartment_release(apt); *type = APTTYPE_MTA; *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + return S_OK; } return info->apt ? S_OK : CO_E_NOTINITIALIZED; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7eb25af9e6..624120890d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -648,7 +648,8 @@ static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qual return; hr = pCoGetApartmentType(&type, &qualifier); - ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK || (type == APTTYPE_CURRENT && hr == CO_E_NOTINITIALIZED), + "Unexpected hr %#x.\n", hr); ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, expected_qualifier); -- 2.25.0

3 6

[PATCH] dinput: Increase device buffer size to 1024.
by Rémi Bernon 14 Feb '20

14 Feb '20

The buffer size was previously limited to 20 in: 8d052561724f9c8d9e7770964bfaebdd01e98e60 Testing shows that it is somewhere around 1024 on Windows, and using a smaller buffer causes some input data to be lost with high polling rate mouses. It can be spotted in Wolfenstein II: New Colossus menus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d18292192a5..bcb893e6324 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1400,7 +1400,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( EnterCriticalSection(&This->crit); This->buffersize = pd->dwData; - This->queue_len = min(This->buffersize, 20); + This->queue_len = min(This->buffersize, 1024); HeapFree(GetProcessHeap(), 0, This->data_queue); This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, -- 2.25.0

2 1

[PATCH] user32/caret.c: Avoid SetSystemTimer / KillSystemTimer with null hwnd.
by Robert Schlicht 14 Feb '20

14 Feb '20

Check that hwnd is not null before calling SetSystemTimer or KillSystemTimer in functions ShowCaret, HideCaret and SetCaretPos. Reason: If there is no caret window, the call in ShowCaret, SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); will create (and leak) a timer since TIMERID is not used if hwnd is null. Similar issues affect the other functions. Illustration: Depending on your system (Alt+Tab or Alt+Esc switching between applications), this is seen even in standard applications: (1) Start Notepad.exe. (2) Hold down Alt (do not release). (3) Rick-click to open the context menu. (4) Switch to another application without first returning the focus to the edit field by pressing Tab or Esc. (The context menu should remain open.) (5) Close the context menu while Notepad is not active. Now SetSystemTimer has been called with a null hwnd (via ShowCaret(0) in MENU_ExitTracking() in menu.c) and a timer has been leaked. When you switch back to Notepad, the caret flashes more frequently / irregularly. The patch fixes this. Signed-off-by: Robert Schlicht <patch(a)rschlicht.eu> --- dlls/user32/caret.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 686dade410..edcbc3cd6b 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -269,7 +269,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) } } SERVER_END_REQ; - if (ret && !hidden && (x != r.left || y != r.top)) + if (ret && hwnd && !hidden && (x != r.left || y != r.top)) { if (old_state) CARET_DisplayCaret( hwnd, &r ); r.right += x - r.left; @@ -314,7 +314,7 @@ BOOL WINAPI HideCaret( HWND hwnd ) } SERVER_END_REQ; - if (ret && !hidden) + if (ret && hwnd && !hidden) { if (old_state) CARET_DisplayCaret( hwnd, &r ); KillSystemTimer( hwnd, TIMERID ); @@ -352,7 +352,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) } SERVER_END_REQ; - if (ret && (hidden == 1)) /* hidden was 1 so it's now 0 */ + if (ret && hwnd && (hidden == 1)) /* hidden was 1 so it's now 0 */ { CARET_DisplayCaret( hwnd, &r ); SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); -- 2.17.1

2 1

[PATCH] dwrite/tests: Use wide string literals for some tests.
by Nikolay Sivov 14 Feb '20

14 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 99 +++-- dlls/dwrite/tests/font.c | 113 +++--- dlls/dwrite/tests/layout.c | 736 +++++++++++++++++------------------ 3 files changed, 449 insertions(+), 499 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 99b415a3fb..38d6a68ef8 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1,7 +1,7 @@ /* * Text analyzing tests * - * Copyright 2012-2014 Nikolay Sivov for CodeWeavers + * Copyright 2012-2020 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,7 +34,6 @@ #include "wine/test.h" static IDWriteFactory *factory; -static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; #define LRE 0x202a #define RLE 0x202b @@ -485,7 +484,6 @@ static struct testanalysissource analysissource = { { &analysissourcevtbl } }; static IDWriteFontFace *create_fontface(void) { - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFont *font; @@ -500,7 +498,7 @@ static IDWriteFontFace *create_fontface(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1160,7 +1158,6 @@ static void compare_breakpoints(const struct linebreaks_test *test, DWRITE_LINE_ static void test_AnalyzeLineBreakpoints(void) { - static const WCHAR emptyW[] = {0}; const struct linebreaks_test *ptr = linebreaks_tests; IDWriteTextAnalyzer *analyzer; UINT32 i = 0; @@ -1169,7 +1166,7 @@ static void test_AnalyzeLineBreakpoints(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - init_textsource(&analysissource, emptyW, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + init_textsource(&analysissource, L"", DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, 0, &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1265,7 +1262,6 @@ static const struct textcomplexity_test textcomplexity_tests[] = { static void test_GetTextComplexity(void) { - static const WCHAR textW[] = {'A','B','C',0}; IDWriteTextAnalyzer1 *analyzer1; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; @@ -1288,9 +1284,9 @@ static void test_GetTextComplexity(void) if (0) { /* crashes on native */ hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, NULL, NULL); hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, &len, NULL); - hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, NULL, NULL); - hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, &len, NULL); - hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, L"ABC", 3, NULL, NULL, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, L"ABC", 3, NULL, NULL, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, L"ABC", 3, NULL, &simple, NULL, NULL); } len = 1; @@ -1303,7 +1299,7 @@ if (0) { /* crashes on native */ len = 1; simple = TRUE; indices[0] = 1; - hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, L"ABC", 3, NULL, &simple, &len, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(len == 0, "got %d\n", len); ok(simple == FALSE, "got %d\n", simple); @@ -1332,7 +1328,6 @@ if (0) { /* crashes on native */ static void test_numbersubstitution(void) { - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IDWriteNumberSubstitution *substitution; HRESULT hr; @@ -1342,8 +1337,9 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution_Release(substitution); /* invalid locale name, method does not require it */ - hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, L"dummy", + FALSE, &substitution); + ok(hr == S_OK, "Failed to create number substitution, hr %#x.\n", hr); IDWriteNumberSubstitution_Release(substitution); /* invalid method */ @@ -1358,18 +1354,22 @@ static void test_numbersubstitution(void) hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, NULL, FALSE, &substitution); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, L"dummy", + FALSE, &substitution); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, dummyW, FALSE, &substitution); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, L"dummy", + FALSE, &substitution); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, dummyW, FALSE, &substitution); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, L"dummy", + FALSE, &substitution); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* invalid locale, but it's not needed for this method */ - hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, L"dummy", FALSE, + &substitution); + ok(hr == S_OK, "Failed to create number substitution, hr %#x.\n", hr); IDWriteNumberSubstitution_Release(substitution); } @@ -1494,12 +1494,11 @@ static unsigned int get_glyph_class(const struct dwrite_fonttable *table, UINT16 static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, unsigned int size) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; BOOL exists = FALSE; unsigned int index; HRESULT hr; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(exists, "Failed to find locale name %d.\n", exists); @@ -1811,9 +1810,7 @@ static BOOL has_feature(const DWRITE_FONT_FEATURE_TAG *tags, UINT32 count, DWRIT static void test_GetTypographicFeatures(void) { - static const WCHAR localeW[] = {'c','a','d','a','b','r','a',0}; static const WCHAR arabicW[] = {0x064a,0x064f,0x0633,0}; - static const WCHAR abcW[] = {'a','b','c',0}; DWRITE_FONT_FEATURE_TAG tags[20]; IDWriteTextAnalyzer2 *analyzer2; IDWriteTextAnalyzer *analyzer; @@ -1835,7 +1832,7 @@ static void test_GetTypographicFeatures(void) fontface = create_fontface(); - get_script_analysis(abcW, &sa); + get_script_analysis(L"abc", &sa); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, 0, &count, NULL); todo_wine { @@ -1843,9 +1840,9 @@ todo_wine { ok(count > 0, "got %u\n", count); } /* invalid locale name is ignored */ - get_script_analysis(abcW, &sa); + get_script_analysis(L"abc", &sa); count = 0; - hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, localeW, 0, &count, NULL); + hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, L"cadabra", 0, &count, NULL); todo_wine { ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count > 0, "got %u\n", count); @@ -1863,7 +1860,7 @@ todo_wine { ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING); ok(ret, "expected 'mkmk' feature\n"); } - get_script_analysis(abcW, &sa); + get_script_analysis(L"abc", &sa); memset(tags, 0, sizeof(tags)); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, ARRAY_SIZE(tags), &count, tags); @@ -1900,7 +1897,7 @@ static void test_GetGlyphPlacements(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - path = create_testfontfile(test_fontfile); + path = create_testfontfile(L"wine_test_font.ttf"); fontface = create_testfontface(path); get_script_analysis(aW, &sa); @@ -2543,7 +2540,6 @@ static inline BOOL float_eq(FLOAT left, FLOAT right) static void test_GetGdiCompatibleGlyphPlacements(void) { - static const WCHAR strW[] = {'A',0}; DWRITE_SHAPING_GLYPH_PROPERTIES glyphprops[1]; DWRITE_SHAPING_TEXT_PROPERTIES textprops[1]; DWRITE_SCRIPT_ANALYSIS sa = { 0 }; @@ -2556,7 +2552,7 @@ static void test_GetGdiCompatibleGlyphPlacements(void) FLOAT advance; DWRITE_GLYPH_OFFSET offsets[1]; DWRITE_FONT_METRICS fontmetrics; - FLOAT emsize; + float emsize; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2566,21 +2562,20 @@ static void test_GetGdiCompatibleGlyphPlacements(void) IDWriteFontFace_GetMetrics(fontface, &fontmetrics); count = 0; - hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, strW, 1, fontface, - FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, 1, clustermap, - textprops, glyphs, glyphprops, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, L"A", 1, fontface, FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, 1, + clustermap, textprops, glyphs, glyphprops, &count); + ok(hr == S_OK, "Failed to get glyphs, hr %#x.\n", hr); ok(count == 1, "got %u\n", count); - for (emsize = 12.0; emsize <= 20.0; emsize += 1.0) { + for (emsize = 12.0f; emsize <= 20.0f; emsize += 1.0f) + { FLOAT compatadvance, expected, ppdip; DWRITE_GLYPH_METRICS metrics; - hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, strW, clustermap, - textprops, 1, glyphs, glyphprops, count, fontface, emsize, FALSE, FALSE, - &sa, NULL, NULL, NULL, 0, &advance, offsets); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advance > 0.0, "got %f\n", advance); + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, L"A", clustermap, textprops, 1, glyphs, glyphprops, + count, fontface, emsize, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &advance, offsets); + ok(hr == S_OK, "Failed to get glyph placements, hr %#x.\n", hr); + ok(advance > 0.0f, "Unexpected advance %f.\n", advance); /* 1 ppdip, no transform */ ppdip = 1.0; @@ -2589,24 +2584,24 @@ static void test_GetGdiCompatibleGlyphPlacements(void) ok(hr == S_OK, "got 0x%08x\n", hr); expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; - hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, - clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, - ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, L"A", clustermap, textprops, 1, glyphs, + glyphprops, count, fontface, emsize, ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, + &compatadvance, offsets); + ok(hr == S_OK, "Failed to get glyph placements, hr %#x.\n", hr); ok(compatadvance == expected, "%.0f: got advance %f, expected %f, natural %f\n", emsize, compatadvance, expected, advance); /* 1.2 ppdip, no transform */ - ppdip = 1.2; + ppdip = 1.2f; hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(fontface, emsize, ppdip, NULL, FALSE, glyphs, 1, &metrics, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; - hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, - clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, - ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, L"A", clustermap, textprops, 1, glyphs, + glyphprops, count, fontface, emsize, ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, + &compatadvance, offsets); + ok(hr == S_OK, "Failed to get glyph placements, hr %#x.\n", hr); ok(float_eq(compatadvance, expected), "%.0f: got advance %f, expected %f, natural %f\n", emsize, compatadvance, expected, advance); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 38a7b4f3f8..7c48a57eab 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2019 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2020 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -125,12 +125,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, void *); static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; -static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; -static const WCHAR arialW[] = {'A','r','i','a','l',0}; -static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; -static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; -static const WCHAR blahW[] = {'B','l','a','h','!',0}; -static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" @@ -475,7 +469,6 @@ static IDWriteFactory *create_factory(void) static IDWriteFontFace *create_fontface(IDWriteFactory *factory) { - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFont *font; @@ -490,7 +483,7 @@ static IDWriteFontFace *create_fontface(IDWriteFactory *factory) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -537,7 +530,7 @@ not_found: static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) { - IDWriteFont *font = get_font(factory, tahomaW, style); + IDWriteFont *font = get_font(factory, L"Tahoma", style); ok(font != NULL, "failed to get Tahoma\n"); return font; } @@ -576,9 +569,8 @@ static void _delete_testfontfile(const WCHAR *filename, int line) static void get_combined_font_name(const WCHAR *familyW, const WCHAR *faceW, WCHAR *nameW) { - static const WCHAR spaceW[] = {' ', 0}; lstrcpyW(nameW, familyW); - lstrcatW(nameW, spaceW); + lstrcatW(nameW, L" "); lstrcatW(nameW, faceW); } @@ -1014,7 +1006,6 @@ static ID2D1SimplifiedGeometrySink test_geomsink2 = { &test_geometrysink2_vtbl } static void test_CreateFontFromLOGFONT(void) { - static const WCHAR tahomaspW[] = {'T','a','h','o','m','a',' ',0}; IDWriteGdiInterop1 *interop1; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; @@ -1066,7 +1057,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); EXPECT_HR(hr, S_OK); @@ -1111,7 +1102,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = weights[i][0]; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); EXPECT_HR(hr, S_OK); @@ -1128,7 +1119,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = 550; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); font = NULL; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); @@ -1145,7 +1136,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; - lstrcpyW(logfont.lfFaceName, blahW); + lstrcpyW(logfont.lfFaceName, L"Blah!"); font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); @@ -1157,7 +1148,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; - lstrcpyW(logfont.lfFaceName, tahomaspW); + lstrcpyW(logfont.lfFaceName, L"Tahoma "); font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); @@ -1183,7 +1174,7 @@ static void test_CreateFontFromLOGFONT(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop1_CreateFontFromLOGFONT(interop1, &logfont, NULL, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1552,7 +1543,7 @@ static void test_GetFontFamily(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1700,7 +1691,7 @@ static void test_GetFamilyNames(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); EXPECT_HR(hr, S_OK); @@ -1825,7 +1816,7 @@ static void test_CreateFontFace(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); font = NULL; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); @@ -2137,13 +2128,12 @@ static void check_font_metrics(const WCHAR *nameW, IDWriteFontFace *fontface, co static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; BOOL exists = FALSE; UINT32 index; HRESULT hr; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(exists, "got %d\n", exists); hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); @@ -2179,7 +2169,7 @@ static void test_GetMetrics(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2448,22 +2438,22 @@ static void test_system_fontcollection(void) ret = FALSE; i = (UINT32)-1; - hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret); + hr = IDWriteFontCollection_FindFamilyName(collection, L"Tahoma", &i, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); ret = FALSE; i = (UINT32)-1; - hr = IDWriteFontCollection_FindFamilyName(collection, tahomaUppercaseW, &i, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_FindFamilyName(collection, L"TAHOMA", &i, &ret); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); ret = FALSE; i = (UINT32)-1; - hr = IDWriteFontCollection_FindFamilyName(collection, tahomaStrangecaseW, &i, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_FindFamilyName(collection, L"tAhOmA", &i, &ret); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); @@ -2517,8 +2507,8 @@ static void test_system_fontcollection(void) ret = TRUE; i = 0; - hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_FindFamilyName(collection, L"Blah!", &i, &ret); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!ret, "got %d\n", ret); ok(i == (UINT32)-1, "got %u\n", i); @@ -2712,9 +2702,10 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) exists = FALSE; logfont->lfFaceName[0] = 0; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &names, &exists); - if (SUCCEEDED(hr)) { - if (exists) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; + if (SUCCEEDED(hr)) + { + if (exists) + { WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; WCHAR nameW[256]; UINT32 index; @@ -2725,7 +2716,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); if (!exists) - IDWriteLocalizedStrings_FindLocaleName(names, enusW, &index, &exists); + IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); if (exists) { nameW[0] = 0; @@ -2968,7 +2959,6 @@ static IDWriteFontCollectionLoader *create_collection_loader(void) static void test_CustomFontCollection(void) { - static const WCHAR fontnameW[] = {'w','i','n','e','_','t','e','s','t',0}; IDWriteFontCollectionLoader *loader, *loader2, *loader3; IDWriteFontCollection *font_collection = NULL; static IDWriteFontFileLoader rloader = { &resourcefontfileloadervtbl }; @@ -3048,7 +3038,7 @@ todo_wine index = 1; exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(font_collection, fontnameW, &index, &exists); + hr = IDWriteFontCollection_FindFamilyName(font_collection, L"wine_test", &index, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); ok(index == 0, "got index %i\n", index); ok(exists, "got exists %i\n", exists); @@ -4173,7 +4163,7 @@ static void test_GetGdiInterop(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop2, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4269,7 +4259,7 @@ static void test_CreateFontFaceFromHdc(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hfont = CreateFontIndirectW(&logfont); hdc = CreateCompatibleDC(0); @@ -4447,7 +4437,7 @@ static void test_GetSimulations(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4466,7 +4456,7 @@ static void test_GetSimulations(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 0; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4487,9 +4477,6 @@ static void test_GetSimulations(void) static void test_GetFaceNames(void) { - static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; - static const WCHAR enus2W[] = {'e','n','-','U','s',0}; - static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteLocalizedStrings *strings, *strings2, *strings3; IDWriteFontFace3 *fontface3; IDWriteGdiInterop *interop; @@ -4513,7 +4500,7 @@ static void test_GetFaceNames(void) logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; logfont.lfItalic = 1; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4531,8 +4518,8 @@ static void test_GetFaceNames(void) index = 1; exists = FALSE; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enus2W, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-Us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(index == 0 && exists, "got %d, %d\n", index, exists); count = 0; @@ -4544,12 +4531,12 @@ static void test_GetFaceNames(void) buffW[0] = 0; hr = IDWriteLocalizedStrings_GetLocaleName(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); buffW[0] = 0; hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, obliqueW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"Oblique"), "got %s\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); hr = IDWriteFont_CreateFontFace(font, &fontface); @@ -4568,7 +4555,7 @@ static void test_GetFaceNames(void) buffW[0] = 0; hr = IDWriteLocalizedStrings_GetString(strings2, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "Failed to get a string, hr %#x.\n", hr); - ok(!lstrcmpW(buffW, obliqueW), "Unexpected name %s.\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"Oblique"), "Unexpected name %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings2); IDWriteFontFace3_Release(fontface3); @@ -4741,8 +4728,8 @@ if (0) { /* crashes on native */ font_count = IDWriteFontFamily_GetFontCount(family); - for (j = 0; j < font_count; j++) { - static const WCHAR spaceW[] = {' ', 0}; + for (j = 0; j < font_count; ++j) + { IDWriteFontFace *fontface; BOOL has_variations; @@ -4756,7 +4743,7 @@ if (0) { /* crashes on native */ IDWriteLocalizedStrings_Release(names); lstrcpyW(nameW, familynameW); - lstrcatW(nameW, spaceW); + lstrcatW(nameW, L" "); lstrcatW(nameW, facenameW); hr = IDWriteFont_CreateFontFace(font, &fontface); @@ -6388,14 +6375,14 @@ static void test_GetGdiCompatibleMetrics(void) factory = create_factory(); - font = get_font(factory, tahomaW, DWRITE_FONT_STYLE_NORMAL); + font = get_font(factory, L"Tahoma", DWRITE_FONT_STYLE_NORMAL); hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFont_Release(font); test_gdicompat_metrics(fontface); IDWriteFontFace_Release(fontface); - font = get_font(factory, arialW, DWRITE_FONT_STYLE_NORMAL); + font = get_font(factory, L"Arial", DWRITE_FONT_STYLE_NORMAL); if (!font) skip("Skipping tests with Arial\n"); else @@ -6546,7 +6533,7 @@ static INT32 get_gdi_font_advance(HDC hdc, FLOAT emsize) logfont.lfHeight = (LONG)-emsize; logfont.lfWeight = FW_NORMAL; logfont.lfQuality = CLEARTYPE_QUALITY; - lstrcpyW(logfont.lfFaceName, tahomaW); + lstrcpyW(logfont.lfFaceName, L"Tahoma"); hfont = CreateFontIndirectW(&logfont); SelectObject(hdc, hfont); @@ -7507,7 +7494,7 @@ static void test_GetPaletteEntries(void) IDWriteFontFace2_Release(fontface2); /* Segoe UI Emoji, with color support */ - font = get_font(factory, emojiW, DWRITE_FONT_STYLE_NORMAL); + font = get_font(factory, L"Segoe UI Emoji", DWRITE_FONT_STYLE_NORMAL); if (!font) { ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); @@ -7615,7 +7602,7 @@ static void test_TranslateColorGlyphRun(void) IDWriteFontFace_Release(fontface); /* Segoe UI Emoji, with color support */ - font = get_font((IDWriteFactory *)factory, emojiW, DWRITE_FONT_STYLE_NORMAL); + font = get_font((IDWriteFactory *)factory, L"Segoe UI Emoji", DWRITE_FONT_STYLE_NORMAL); if (!font) { IDWriteFactory2_Release(factory); skip("Segoe UI Emoji font not found.\n"); @@ -9417,8 +9404,8 @@ todo_wine ok(ref2 != ref, "Unexpected reference.\n"); IDWriteFontFaceReference_Release(ref2); - for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; id++) { - static const WCHAR fmtW[] = {'%','u',0}; + for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; ++id) + { IDWriteLocalizedStrings *values; WCHAR buffW[255], buff2W[255]; UINT32 c, ivalue = 0; @@ -9462,7 +9449,7 @@ todo_wine hr = IDWriteLocalizedStrings_GetString(values, 0, buff2W, ARRAY_SIZE(buff2W)); ok(hr == S_OK, "Failed to get property string, hr %#x.\n", hr); - wsprintfW(buffW, fmtW, ivalue); + wsprintfW(buffW, L"%u", ivalue); ok(!lstrcmpW(buffW, buff2W), "Unexpected property value %s, expected %s.\n", wine_dbgstr_w(buff2W), wine_dbgstr_w(buffW)); break; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 48b2880079..d19f91311d 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2020 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,9 +29,6 @@ #include "wine/test.h" -static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; -static const WCHAR enusW[] = {'e','n','-','u','s',0}; - struct testanalysissink { IDWriteTextAnalysisSink IDWriteTextAnalysisSink_iface; @@ -900,7 +897,6 @@ static IUnknown *create_test_effect(void) static void test_CreateTextLayout(void) { - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; IDWriteTextLayout4 *layout4; IDWriteTextLayout2 *layout2 = NULL; IDWriteTextLayout *layout; @@ -917,41 +913,41 @@ static void test_CreateTextLayout(void) ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 0.0, 0.0, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, NULL, 0.0f, 0.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1.0, 0.0, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, NULL, 1.0f, 0.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 0.0, 1.0, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, NULL, 0.0f, 1.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, NULL, 1000.0f, 1000.0f, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); layout = (void*)0xdeadbeef; hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, format, 100.0f, 100.0f, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 0.0f, 0.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 0, format, 0.0f, 0.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); EXPECT_REF(format, 1); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); EXPECT_REF(format, 1); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); @@ -1025,7 +1021,6 @@ static DWRITE_MATRIX layoutcreate_transforms[] = { static void test_CreateGdiCompatibleTextLayout(void) { - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; IDWriteTextLayout *layout; IDWriteTextFormat *format; IDWriteFactory *factory; @@ -1041,29 +1036,33 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, NULL, 0.0f, 0.0f, 0.0f, NULL, + FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1.0, 0.0, 0.0, NULL, FALSE, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, NULL, 1.0f, 0.0f, 0.0f, NULL, + FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1.0, 0.0, 1.0, NULL, FALSE, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, NULL, 1.0f, 0.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); layout = (void*)0xdeadbeef; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, 1.0, NULL, FALSE, &layout); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, NULL, 1000.0f, 1000.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(layout == NULL, "got %p\n", layout); /* create with text format */ - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); EXPECT_REF(format, 1); layout = (void*)0xdeadbeef; @@ -1071,8 +1070,9 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(layout == NULL, "got %p\n", layout); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); EXPECT_REF(format, 1); EXPECT_REF(layout, 1); @@ -1083,8 +1083,9 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteTextLayout_Release(layout); /* zero length string is okay */ - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 0, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); dimension = IDWriteTextLayout_GetMaxWidth(layout); ok(dimension == 100.0, "got %f\n", dimension); @@ -1095,19 +1096,22 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteTextLayout_Release(layout); /* negative, zero ppdip */ - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, -1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 1, format, 100.0f, 100.0f, -1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 0.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 1, format, 100.0f, 100.0f, 0.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); /* transforms */ - for (i = 0; i < ARRAY_SIZE(layoutcreate_transforms); i++) { - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 1.0, - &layoutcreate_transforms[i], FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + for (i = 0; i < ARRAY_SIZE(layoutcreate_transforms); ++i) + { + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 1, format, 100.0f, 100.0f, 1.0f, + &layoutcreate_transforms[i], FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); } @@ -1117,7 +1121,6 @@ static void test_CreateGdiCompatibleTextLayout(void) static void test_CreateTextFormat(void) { - static const WCHAR emptyW[] = {0}; IDWriteFontCollection *collection, *syscoll; DWRITE_PARAGRAPH_ALIGNMENT paralign; DWRITE_READING_DIRECTION readdir; @@ -1135,36 +1138,36 @@ static void test_CreateTextFormat(void) factory = create_factory(); /* zero/negative font size */ - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 0.0f, enusW, &format); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 0.0f, L"en-us", &format); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, -10.0f, enusW, &format); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, -10.0f, L"en-us", &format); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* invalid font properties */ - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, 1000, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, 1000, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC + 1, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_ITALIC + 1, DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC, - 10, 10.0f, enusW, &format); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC, + 10, 10.0f, L"en-us", &format); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* empty family name */ - hr = IDWriteFactory_CreateTextFormat(factory, emptyW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); IDWriteTextFormat_Release(format); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); if (0) /* crashes on native */ hr = IDWriteTextFormat_GetFontCollection(format, NULL); @@ -1255,10 +1258,8 @@ static void test_CreateTextFormat(void) static void test_GetLocaleName(void) { - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; - static const WCHAR ruW[] = {'r','u',0}; - IDWriteTextLayout *layout; IDWriteTextFormat *format, *format2; + IDWriteTextLayout *layout; IDWriteFactory *factory; WCHAR buff[10]; UINT32 len; @@ -1266,12 +1267,13 @@ static void test_GetLocaleName(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 0, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1284,12 +1286,12 @@ static void test_GetLocaleName(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); hr = IDWriteTextFormat_GetLocaleName(format2, buff, len+1); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + ok(!lstrcmpW(buff, L"ru"), "Unexpected locale name %s.\n", wine_dbgstr_w(buff)); hr = IDWriteTextFormat_GetLocaleName(format, buff, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); hr = IDWriteTextFormat_GetLocaleName(format, buff, len+1); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + ok(!lstrcmpW(buff, L"ru"), "Unexpected locale name %s.\n", wine_dbgstr_w(buff)); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); @@ -1304,7 +1306,6 @@ static const struct drawcall_entry drawellipsis_seq[] = { static void test_CreateEllipsisTrimmingSign(void) { - static const WCHAR engbW[] = {'e','n','-','G','B',0}; DWRITE_INLINE_OBJECT_METRICS metrics; DWRITE_BREAK_CONDITION before, after; struct renderer_context ctxt; @@ -1316,9 +1317,9 @@ static void test_CreateEllipsisTrimmingSign(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, engbW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-GB", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); EXPECT_REF(format, 1); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); @@ -1409,8 +1410,6 @@ if (0) {/* crashes on native */ static void test_fontweight(void) { - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; - static const WCHAR ruW[] = {'r','u',0}; IDWriteTextFormat *format, *fmt2; IDWriteTextLayout *layout; DWRITE_FONT_WEIGHT weight; @@ -1421,12 +1420,13 @@ static void test_fontweight(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&fmt2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1515,24 +1515,22 @@ static void test_fontweight(void) static void test_SetInlineObject(void) { - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; - static const WCHAR ruW[] = {'r','u',0}; - IDWriteInlineObject *inlineobj, *inlineobj2, *inlinetest; + DWRITE_TEXT_RANGE range, r2; IDWriteTextFormat *format; IDWriteTextLayout *layout; - DWRITE_TEXT_RANGE range, r2; IDWriteFactory *factory; HRESULT hr; factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1718,9 +1716,7 @@ static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, 0x64a,'7','1','.',0}; - static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a','b',0}; - static const WCHAR ruW[] = {'r','u',0}; IDWriteInlineObject *inlineobj; struct renderer_context ctxt; IDWriteTextFormat *format; @@ -1736,12 +1732,12 @@ static void test_Draw(void) memset(&ctxt, 0, sizeof(ctxt)); ctxt.snapping_disabled = TRUE; - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 100.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1773,8 +1769,8 @@ static void test_Draw(void) IDWriteTextLayout_Release(layout); /* with reduced width DrawGlyphRun() is called for every line */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 5.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 5.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1796,8 +1792,8 @@ todo_wine /* strikethrough splits ranges from renderer point of view, but doesn't break shaping */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); range.startPosition = 0; @@ -1810,9 +1806,9 @@ todo_wine ok_sequence(sequences, RENDERER_ID, draw_seq4, "draw test 4", FALSE); IDWriteTextLayout_Release(layout); - /* strikethrough somewhere in the middle */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Strike through somewhere in the middle */ + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); range.startPosition = 2; @@ -1826,8 +1822,8 @@ todo_wine IDWriteTextLayout_Release(layout); /* empty string */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 0, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); @@ -1839,8 +1835,9 @@ todo_wine ctxt.use_gdi_natural = TRUE; /* different parameter combinations with gdi-compatible layout */ - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, TRUE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, + TRUE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1868,8 +1865,9 @@ todo_wine ctxt.gdicompat = TRUE; ctxt.use_gdi_natural = FALSE; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1881,8 +1879,9 @@ todo_wine m.m11 = m.m22 = 2.0; m.m12 = m.m21 = m.dx = m.dy = 0.0; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, &m, TRUE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, &m, + TRUE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1894,8 +1893,9 @@ todo_wine m.m11 = m.m22 = 2.0; m.m12 = m.m21 = m.dx = m.dy = 0.0; - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, &m, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, 1.0f, &m, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2001,9 +2001,6 @@ static void test_GetClusterMetrics(void) 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0xa,0}; static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; - static const WCHAR strW[] = {'a','b','c','d',0}; - static const WCHAR str4W[] = {'a',' ',0}; - static const WCHAR str6W[] = {'a',' ','b',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[22]; DWRITE_TEXT_METRICS text_metrics; @@ -2021,9 +2018,9 @@ static void test_GetClusterMetrics(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteFactory_CreateTextLayout(factory, str3W, 7, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2032,8 +2029,8 @@ static void test_GetClusterMetrics(void) ok(count == 7, "got %u\n", count); IDWriteTextLayout_Release(layout); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); @@ -2170,8 +2167,8 @@ todo_wine IDWriteTextLayout_Release(layout); /* single inline object that fails to report its metrics */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); range.startPosition = 0; range.length = 4; @@ -2224,8 +2221,8 @@ todo_wine IDWriteTextLayout_Release(layout); /* zero length string */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 0, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 1; memset(metrics, 0, sizeof(metrics)); @@ -2234,9 +2231,9 @@ todo_wine ok(count == 0, "got %u\n", count); IDWriteTextLayout_Release(layout); - /* whitespace */ - hr = IDWriteFactory_CreateTextLayout(factory, str4W, 2, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Whitespace */ + hr = IDWriteFactory_CreateTextLayout(factory, L"a ", 2, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); @@ -2249,9 +2246,9 @@ todo_wine ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); IDWriteTextLayout_Release(layout); - /* layout is fully covered by inline object with after condition DWRITE_BREAK_CONDITION_MAY_NOT_BREAK */ - hr = IDWriteFactory_CreateTextLayout(factory, str4W, 2, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Layout is fully covered by inline object with after condition DWRITE_BREAK_CONDITION_MAY_NOT_BREAK. */ + hr = IDWriteFactory_CreateTextLayout(factory, L"a ", 2, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); range.startPosition = 0; range.length = ~0u; @@ -2268,8 +2265,8 @@ todo_wine IDWriteTextLayout_Release(layout); /* compare natural cluster width with gdi layout */ - hr = IDWriteFactory_CreateTextLayout(factory, str4W, 1, format, 100.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a ", 1, format, 100.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); @@ -2280,8 +2277,9 @@ todo_wine IDWriteTextLayout_Release(layout); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, str4W, 1, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"a ", 1, format, 100.0f, 100.0f, 1.0f, NULL, + FALSE, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); @@ -2360,9 +2358,9 @@ todo_wine IDWriteTextLayout_Release(layout); - /* trigger line trimming */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, lstrlenW(strW), format, 100.0f, 200.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Trigger line trimming. */ + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 100.0f, 200.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); @@ -2404,8 +2402,8 @@ todo_wine hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_NO_WRAP); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, str6W, lstrlenW(str6W), format, 1000.0f, 200.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a b", 3, format, 1000.0f, 200.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); @@ -2420,7 +2418,7 @@ todo_wine IDWriteTextLayout_Release(layout); /* Single cluster layout, trigger trimming. */ - hr = IDWriteFactory_CreateTextLayout(factory, str6W, 1, format, 1000.0f, 200.0f, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, L"a b", 1, format, 1000.0f, 200.0f, &layout); ok(hr == S_OK, "Failed to create layout, hr %#x.\n", hr); count = 0; @@ -2464,9 +2462,7 @@ todo_wine static void test_SetLocaleName(void) { - static const WCHAR eNuSW[] = {'e','N','-','u','S',0}; - static const WCHAR strW[] = {'a','b','c','d',0}; - WCHAR buffW[LOCALE_NAME_MAX_LENGTH + ARRAY_SIZE(strW)]; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH + 5]; IDWriteTextFormat *format, *format2; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; @@ -2476,50 +2472,50 @@ static void test_SetLocaleName(void) factory = create_factory(); /* create format with mixed case locale name, get it back */ - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, eNuSW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"eN-uS", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteTextFormat_GetLocaleName(format, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteTextFormat_GetLocaleName(format2, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, ARRAY_SIZE(buffW), NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); IDWriteTextFormat_Release(format2); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); range.startPosition = 0; range.length = 1; - hr = IDWriteTextLayout_SetLocaleName(layout, enusW, range); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_SetLocaleName(layout, L"en-us", range); + ok(hr == S_OK, "Failed to set locale name, hr %#x.\n", hr); hr = IDWriteTextLayout_SetLocaleName(layout, NULL, range); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); /* invalid locale name is allowed */ - hr = IDWriteTextLayout_SetLocaleName(layout, strW, range); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_SetLocaleName(layout, L"abcd", range); + ok(hr == S_OK, "Failed to set locale name, hr %#x.\n", hr); hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -2531,7 +2527,7 @@ static void test_SetLocaleName(void) range.length = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, ARRAY_SIZE(buffW), &range); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"abcd"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); ok(range.startPosition == 0 && range.length == 1, "got %u,%u\n", range.startPosition, range.length); /* get with a shorter buffer */ @@ -2541,9 +2537,9 @@ static void test_SetLocaleName(void) ok(buffW[0] == 0, "got %x\n", buffW[0]); /* name is too long */ - lstrcpyW(buffW, strW); + lstrcpyW(buffW, L"abcd"); while (lstrlenW(buffW) <= LOCALE_NAME_MAX_LENGTH) - lstrcatW(buffW, strW); + lstrcatW(buffW, L"abcd"); range.startPosition = 0; range.length = 1; @@ -2553,19 +2549,19 @@ static void test_SetLocaleName(void) buffW[0] = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, ARRAY_SIZE(buffW), NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"abcd"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); /* set initial locale name for whole text, except with a different casing */ range.startPosition = 0; range.length = 4; - hr = IDWriteTextLayout_SetLocaleName(layout, eNuSW, range); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_SetLocaleName(layout, L"eN-uS", range); + ok(hr == S_OK, "Failed to set locale name, hr %#x.\n", hr); buffW[0] = 0; range.length = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, ARRAY_SIZE(buffW), &range); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); ok((range.startPosition == 0 && range.length == ~0u) || broken(range.startPosition == 0 && range.length == 4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); @@ -2574,7 +2570,7 @@ static void test_SetLocaleName(void) range.length = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 100, buffW, ARRAY_SIZE(buffW), &range); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"en-us"), "Unexpected locale name %s.\n", wine_dbgstr_w(buffW)); ok((range.startPosition == 0 && range.length == ~0u) || broken(range.startPosition == 4 && range.length == ~0u-4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); @@ -2598,9 +2594,9 @@ static void test_SetPairKerning(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2668,7 +2664,6 @@ if (count == 3) { static void test_SetVerticalGlyphOrientation(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_VERTICAL_GLYPH_ORIENTATION orientation; IDWriteTextLayout2 *layout2; IDWriteTextFormat *format; @@ -2678,12 +2673,12 @@ static void test_SetVerticalGlyphOrientation(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextFormat_Release(format); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); @@ -2716,7 +2711,6 @@ static void test_DetermineMinWidth(void) { {'a','\n',' ',' ','b',0}, {'b',0} }, { {'a','b','c','\n',' ',' ','b',0}, {'a','b','c',0} }, }; - static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_CLUSTER_METRICS metrics[10]; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -2727,20 +2721,20 @@ static void test_DetermineMinWidth(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, lstrlenW(strW), format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_DetermineMinWidth(layout, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); IDWriteTextLayout_Release(layout); /* empty string */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 100.0f, 100.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 0, format, 100.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); minwidth = 1.0f; hr = IDWriteTextLayout_DetermineMinWidth(layout, &minwidth); @@ -2780,7 +2774,6 @@ static void test_DetermineMinWidth(void) static void test_SetFontSize(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -2790,12 +2783,12 @@ static void test_SetFontSize(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); /* negative/zero size */ r.startPosition = 1; @@ -2872,9 +2865,6 @@ static void test_SetFontSize(void) static void test_SetFontFamilyName(void) { - static const WCHAR taHomaW[] = {'T','a','H','o','m','a',0}; - static const WCHAR arialW[] = {'A','r','i','a','l',0}; - static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -2884,12 +2874,12 @@ static void test_SetFontFamilyName(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); /* NULL name */ r.startPosition = 1; @@ -2907,13 +2897,13 @@ static void test_SetFontFamilyName(void) /* set name only different in casing */ r.startPosition = 1; r.length = 1; - hr = IDWriteTextLayout_SetFontFamilyName(layout, taHomaW, r); + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"TaHoma", r); ok(hr == S_OK, "got 0x%08x\n", hr); /* zero length range */ r.startPosition = 1; r.length = 0; - hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"Arial", r); ok(hr == S_OK, "got 0x%08x\n", hr); r.startPosition = 0; @@ -2921,12 +2911,12 @@ static void test_SetFontFamilyName(void) nameW[0] = 0; hr = IDWriteTextLayout_GetFontFamilyName(layout, 1, nameW, ARRAY_SIZE(nameW), &r); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(nameW, taHomaW), "got %s\n", wine_dbgstr_w(nameW)); + ok(!lstrcmpW(nameW, L"TaHoma"), "Unexpected family name %s.\n", wine_dbgstr_w(nameW)); ok(r.startPosition == 1 && r.length == 1, "got %u, %u\n", r.startPosition, r.length); r.startPosition = 1; r.length = 1; - hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"Arial", r); ok(hr == S_OK, "got 0x%08x\n", hr); r.startPosition = 1; @@ -2937,14 +2927,14 @@ static void test_SetFontFamilyName(void) r.startPosition = 0; r.length = 4; - hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"Arial", r); ok(hr == S_OK, "got 0x%08x\n", hr); nameW[0] = 0; hr = IDWriteTextLayout_GetFontFamilyName(layout, 1, nameW, ARRAY_SIZE(nameW), &r); ok(hr == S_OK, "got 0x%08x\n", hr); ok(r.startPosition == 0 && r.length == 4, "got %u, %u\n", r.startPosition, r.length); - ok(!lstrcmpW(nameW, arialW), "got name %s\n", wine_dbgstr_w(nameW)); + ok(!lstrcmpW(nameW, L"Arial"), "Unexpected family name %s.\n", wine_dbgstr_w(nameW)); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); @@ -2953,7 +2943,6 @@ static void test_SetFontFamilyName(void) static void test_SetFontStyle(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -2963,12 +2952,12 @@ static void test_SetFontStyle(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); /* invalid style value */ r.startPosition = 1; @@ -3041,7 +3030,6 @@ static void test_SetFontStyle(void) static void test_SetFontStretch(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_FONT_STRETCH stretch; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -3051,12 +3039,12 @@ static void test_SetFontStretch(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); /* invalid stretch value */ r.startPosition = 1; @@ -3136,7 +3124,6 @@ static void test_SetFontStretch(void) static void test_SetStrikethrough(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -3146,12 +3133,12 @@ static void test_SetStrikethrough(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); r.startPosition = 1; r.length = 0; @@ -3199,9 +3186,6 @@ static void test_SetStrikethrough(void) static void test_GetMetrics(void) { static const WCHAR str2W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; - static const WCHAR strW[] = {'a','b','c','d',0}; - static const WCHAR str3W[] = {'a',0}; - static const WCHAR str4W[] = {' ',0}; DWRITE_CLUSTER_METRICS clusters[4]; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; @@ -3213,12 +3197,12 @@ static void test_GetMetrics(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); @@ -3265,8 +3249,8 @@ todo_wine IDWriteTextLayout_Release(layout); /* single cluster layout */ - hr = IDWriteFactory_CreateTextLayout(factory, str3W, 1, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 1, &count); @@ -3288,7 +3272,7 @@ todo_wine IDWriteTextLayout_Release(layout); /* Whitespace only. */ - hr = IDWriteFactory_CreateTextLayout(factory, str4W, 1, format, 500.0, 1000.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, L" ", 1, format, 500.0f, 1000.0f, &layout); ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); memset(&metrics, 0xcc, sizeof(metrics)); @@ -3312,7 +3296,6 @@ todo_wine static void test_SetFlowDirection(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_READING_DIRECTION reading; DWRITE_FLOW_DIRECTION flow; IDWriteTextFormat *format; @@ -3322,9 +3305,9 @@ static void test_SetFlowDirection(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); flow = IDWriteTextFormat_GetFlowDirection(format); ok(flow == DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM, "got %d\n", flow); @@ -3332,15 +3315,16 @@ static void test_SetFlowDirection(void) reading = IDWriteTextFormat_GetReadingDirection(format); ok(reading == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", reading); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT); ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista,win7 */, "got 0x%08x\n", hr); - if (hr == S_OK) { - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_TOP_TO_BOTTOM); @@ -3349,8 +3333,8 @@ static void test_SetFlowDirection(void) hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextLayout_Release(layout); } else @@ -3385,7 +3369,6 @@ static const struct drawcall_entry draweffect4_seq[] = { static void test_SetDrawingEffect(void) { static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ - static const WCHAR str2W[] = {'a','e','c','d',0}; IDWriteInlineObject *sign; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -3399,9 +3382,9 @@ static void test_SetDrawingEffect(void) effect = create_test_effect(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); /* string with combining mark */ hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); @@ -3439,8 +3422,8 @@ static void test_SetDrawingEffect(void) IDWriteTextLayout_Release(layout); /* simple string */ - hr = IDWriteFactory_CreateTextLayout(factory, str2W, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"aecd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); r.startPosition = 0; r.length = 2; @@ -3457,8 +3440,8 @@ static void test_SetDrawingEffect(void) hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, str2W, 4, format, 500.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"aecd", 4, format, 500.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); r.startPosition = 0; r.length = 4; @@ -3519,8 +3502,8 @@ static BOOL get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT3 BOOL exists = FALSE; HRESULT hr; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (exists) { hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); @@ -3538,7 +3521,6 @@ static void test_GetLineMetrics(void) static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; static const WCHAR str4W[] = {'a','\r',0}; - static const WCHAR emptyW[] = {0}; IDWriteFontCollection *syscollection; DWRITE_FONT_METRICS fontmetrics; DWRITE_LINE_METRICS metrics[6]; @@ -3553,9 +3535,9 @@ static void test_GetLineMetrics(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 2048.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3643,11 +3625,11 @@ static void test_GetLineMetrics(void) IDWriteFontFace_GetMetrics(fontface, &fontmetrics); hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, emptyW, 1, format, 30000.0f, 100.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"", 1, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); memset(metrics, 0, sizeof(metrics)); count = 0; @@ -3672,9 +3654,9 @@ static void test_GetLineMetrics(void) } IDWriteFontCollection_Release(syscollection); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 2048.0f, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); fontface = get_fontface_from_format(format); ok(fontface != NULL, "got %p\n", fontface); @@ -3696,9 +3678,9 @@ static void test_GetLineMetrics(void) IDWriteTextFormat_Release(format); /* line breaks */ - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteFactory_CreateTextLayout(factory, str3W, 10, format, 100.0, 300.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3867,8 +3849,6 @@ static void test_GetLineMetrics(void) static void test_SetTextAlignment(void) { - static const WCHAR strW[] = {'a',0}; - static const WCHAR stringsW[][10] = { {'a',0}, {0} @@ -3886,15 +3866,15 @@ static void test_SetTextAlignment(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); v = IDWriteTextFormat_GetTextAlignment(format); ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); v = IDWriteTextLayout_GetTextAlignment(layout); ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); @@ -4034,7 +4014,6 @@ static void test_SetTextAlignment(void) static void test_SetParagraphAlignment(void) { - static const WCHAR strW[] = {'a',0}; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -4046,15 +4025,15 @@ static void test_SetParagraphAlignment(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); v = IDWriteTextFormat_GetParagraphAlignment(format); ok(v == DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "got %d\n", v); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); v = IDWriteTextLayout_GetParagraphAlignment(layout); ok(v == DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "got %d\n", v); @@ -4111,8 +4090,8 @@ static void test_SetParagraphAlignment(void) hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_CENTER); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_GetMetrics(layout, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4128,7 +4107,6 @@ static void test_SetParagraphAlignment(void) static void test_SetReadingDirection(void) { - static const WCHAR strW[] = {'a',0}; DWRITE_CLUSTER_METRICS clusters[1]; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; @@ -4141,15 +4119,15 @@ static void test_SetReadingDirection(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); v = IDWriteTextFormat_GetReadingDirection(format); ok(v == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", v); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); v = IDWriteTextLayout_GetReadingDirection(layout); ok(v == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", v); @@ -4316,7 +4294,6 @@ static DWRITE_MATRIX compattransforms[] = { static void test_pixelsnapping(void) { - static const WCHAR strW[] = {'a',0}; IDWriteTextLayout *layout, *layout2; struct renderer_context ctxt; DWRITE_FONT_METRICS metrics; @@ -4329,15 +4306,15 @@ static void test_pixelsnapping(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); fontface = get_fontface_from_format(format); IDWriteFontFace_GetMetrics(fontface, &metrics); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); /* disabled snapping */ ctxt.snapping_disabled = TRUE; @@ -4375,10 +4352,11 @@ static void test_pixelsnapping(void) i, ctxt.originY, expectedY, baseline); /* gdicompat layout transform doesn't affect snapping */ - for (j = 0; j < ARRAY_SIZE(compattransforms); j++) { - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 500.0, 100.0, - 1.0, &compattransforms[j], FALSE, &layout2); - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + for (j = 0; j < ARRAY_SIZE(compattransforms); ++j) + { + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, L"a", 1, format, 500.0f, 100.0f, + 1.0f, &compattransforms[j], FALSE, &layout2); + ok(hr == S_OK, "%d: failed to create text layout, hr %#x.\n", i, hr); expectedY = snap_coord(&ctxt.m, ctxt.ppdip, baseline); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, originX, 0.0); @@ -4410,9 +4388,9 @@ static void test_SetWordWrapping(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); v = IDWriteTextFormat_GetWordWrapping(format); ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); @@ -4487,7 +4465,8 @@ static UINT32 WINAPI fontcollection_GetFontFamilyCount(IDWriteFontCollection *if static HRESULT WINAPI fontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) { - if (index == 123456) { + if (index == 123456) + { IDWriteFactory *factory = create_factory(); IDWriteFontCollection *syscollection; BOOL exists; @@ -4496,8 +4475,8 @@ static HRESULT WINAPI fontcollection_GetFontFamily(IDWriteFontCollection *iface, hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_FindFamilyName(syscollection, tahomaW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_FindFamilyName(syscollection, L"Tahoma", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDWriteFontCollection_GetFontFamily(syscollection, index, family); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4506,6 +4485,7 @@ static HRESULT WINAPI fontcollection_GetFontFamily(IDWriteFontCollection *iface, IDWriteFactory_Release(factory); return S_OK; } + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -4541,7 +4521,6 @@ static IDWriteFontCollection fallbackcollection = { &fallbackcollectionvtbl }; static void test_MapCharacters(void) { - static const WCHAR strW[] = {'a','b','c',0}; static const WCHAR str2W[] = {'a',0x3058,'b',0}; IDWriteLocalizedStrings *strings; IDWriteFontFallback *fallback; @@ -4579,7 +4558,7 @@ static void test_MapCharacters(void) ok(font == NULL, "got %p\n", font); /* zero length source */ - g_source = strW; + g_source = L"abc"; mappedlength = 1; scale = 0.0f; font = (void*)0xdeadbeef; @@ -4590,7 +4569,7 @@ static void test_MapCharacters(void) ok(scale == 1.0f, "got %f\n", scale); ok(font == NULL, "got %p\n", font); - g_source = strW; + g_source = L"abc"; mappedlength = 0; scale = 0.0f; font = NULL; @@ -4606,8 +4585,8 @@ todo_wine if (font) { IDWriteFont_Release(font); } - /* same latin text, full length */ - g_source = strW; + /* same Latin text, full length */ + g_source = L"abc"; mappedlength = 0; scale = 0.0f; font = NULL; @@ -4680,7 +4659,7 @@ if (font) { ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, tahomaW), "%s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); @@ -4702,7 +4681,7 @@ if (font) { hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine - ok(lstrcmpW(buffW, tahomaW), "%s\n", wine_dbgstr_w(buffW)); + ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); @@ -4712,8 +4691,6 @@ todo_wine static void test_FontFallbackBuilder(void) { - static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; - static const WCHAR strW[] = {'A',0}; IDWriteFontFallback *fallback, *fallback2; IDWriteFontFallbackBuilder *builder; IDWriteFontFallback1 *fallback1; @@ -4816,7 +4793,7 @@ static void test_FontFallbackBuilder(void) ok(hr == S_OK, "got 0x%08x\n", hr); /* fallback font missing from system collection */ - g_source = strW; + g_source = L"A"; mappedlength = 0; scale = 0.0f; font = (void*)0xdeadbeef; @@ -4838,7 +4815,7 @@ todo_wine { hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); ok(hr == S_OK, "got 0x%08x\n", hr); - g_source = strW; + g_source = L"A"; mappedlength = 0; scale = 0.0f; font = NULL; @@ -4863,7 +4840,7 @@ todo_wine { hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); ok(hr == S_OK, "got 0x%08x\n", hr); - g_source = strW; + g_source = L"A"; mappedlength = 0; scale = 0.0f; font = NULL; @@ -4883,13 +4860,13 @@ todo_wine { /* explicit locale */ range.first = 'A'; range.last = 'B'; - hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, localeW, NULL, 6.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, L"locale", NULL, 6.0f); + ok(hr == S_OK, "Failed to add mapping, hr %#x.\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); ok(hr == S_OK, "got 0x%08x\n", hr); - g_source = strW; + g_source = L"A"; mappedlength = 0; scale = 0.0f; font = NULL; @@ -4920,7 +4897,6 @@ todo_wine { static void test_fallback(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteFontFallback *fallback, *fallback2; IDWriteFontFallback1 *fallback1; DWRITE_CLUSTER_METRICS clusters[4]; @@ -4939,10 +4915,10 @@ static void test_fallback(void) /* Font does not exist in system collection. */ hr = IDWriteFactory_CreateTextFormat(factory, g_blahfontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); count = 0; @@ -4965,13 +4941,13 @@ todo_wine { IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); /* Existing font. */ - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"abcd", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextFormat_Release(format); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); @@ -5038,7 +5014,6 @@ todo_wine { static void test_SetTypography(void) { - static const WCHAR strW[] = {'a','f','i','b',0}; IDWriteTypography *typography, *typography2; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -5048,12 +5023,12 @@ static void test_SetTypography(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"afib", 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); IDWriteTextFormat_Release(format); hr = IDWriteFactory_CreateTypography(factory, &typography); @@ -5094,7 +5069,6 @@ static void test_SetTypography(void) static void test_SetLastLineWrapping(void) { - static const WCHAR strW[] = {'a',0}; IDWriteTextLayout2 *layout2; IDWriteTextFormat1 *format1; IDWriteTextLayout *layout; @@ -5105,9 +5079,9 @@ static void test_SetLastLineWrapping(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); IDWriteTextFormat_Release(format); @@ -5123,8 +5097,8 @@ static void test_SetLastLineWrapping(void) hr = IDWriteTextFormat1_SetLastLineWrapping(format1, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, (IDWriteTextFormat*)format1, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, (IDWriteTextFormat *)format1, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5143,7 +5117,6 @@ static void test_SetLastLineWrapping(void) static void test_SetOpticalAlignment(void) { - static const WCHAR strW[] = {'a',0}; DWRITE_OPTICAL_ALIGNMENT alignment; IDWriteTextLayout2 *layout2; IDWriteTextFormat1 *format1; @@ -5154,9 +5127,9 @@ static void test_SetOpticalAlignment(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); IDWriteTextFormat_Release(format); @@ -5169,8 +5142,8 @@ static void test_SetOpticalAlignment(void) alignment = IDWriteTextFormat1_GetOpticalAlignment(format1); ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NONE, "got %d\n", alignment); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, (IDWriteTextFormat*)format1, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, (IDWriteTextFormat *)format1, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5241,7 +5214,6 @@ static const struct drawcall_entry drawunderline4_seq[] = { static void test_SetUnderline(void) { - static const WCHAR encaW[] = {'e','n','-','C','A',0}; static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ IDWriteFontCollection *syscollection; DWRITE_CLUSTER_METRICS clusters[4]; @@ -5254,9 +5226,9 @@ static void test_SetUnderline(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5308,7 +5280,7 @@ todo_wine /* now set different locale for second char, draw again */ range.startPosition = 0; range.length = 1; - hr = IDWriteTextLayout_SetLocaleName(layout, encaW, range); + hr = IDWriteTextLayout_SetLocaleName(layout, L"en-CA", range); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -5414,8 +5386,8 @@ todo_wine IDWriteFontFace_GetMetrics(fontface, &fontmetrics); hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); /* Look for first supported character to avoid triggering fallback path. With fallback it's harder to test DrawUnderline() metrics, because actual resolved fontface is not passed to it. Grabbing fontface instance @@ -5465,7 +5437,6 @@ todo_wine static void test_InvalidateLayout(void) { - static const WCHAR strW[] = {'a',0}; IDWriteTextLayout3 *layout3; IDWriteTextLayout *layout; IDWriteTextFormat *format; @@ -5474,12 +5445,12 @@ static void test_InvalidateLayout(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout3, (void**)&layout3); if (hr == S_OK) { @@ -5525,7 +5496,6 @@ static void test_InvalidateLayout(void) static void test_line_spacing(void) { - static const WCHAR strW[] = {'a',0}; IDWriteTextFormat2 *format2; IDWriteTextLayout *layout; IDWriteTextFormat *format; @@ -5534,9 +5504,9 @@ static void test_line_spacing(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5550,8 +5520,8 @@ static void test_line_spacing(void) hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL+1, 0.0f, 0.0f); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); hr = IDWriteTextLayout_SetLineSpacing(layout, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5627,7 +5597,6 @@ static void test_GetOverhangMetrics(void) { 16.0f, { 10.0f, 50.0f, 20.0f }, { -1.0f, 0.0f, -3.0f, 4.0f }, { -1.0f, 4.0f, -3.0f, 0.0f } }, { 15.0f, { 10.0f, 50.0f, 20.0f }, { -1.0f, 10.0f, 3.0f, -4.0f }, { -1.0f, 15.0f, 3.0f, -9.0f } }, }; - static const WCHAR strW[] = {'A',0}; IDWriteFactory *factory; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -5636,11 +5605,11 @@ static void test_GetOverhangMetrics(void) factory = create_factory(); - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 100.0f, enusW, &format); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 100.0f, L"en-us", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, L"A", 1, format, 1000.0f, 1000.0f, &layout); ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); for (i = 0; i < ARRAY_SIZE(overhangs_tests); i++) { @@ -5686,7 +5655,6 @@ static void test_GetOverhangMetrics(void) static void test_tab_stops(void) { - static const WCHAR strW[] = {'\t','a','\t','b'}; DWRITE_CLUSTER_METRICS clusters[4]; IDWriteTextLayout *layout; IDWriteTextFormat *format; @@ -5701,8 +5669,8 @@ static void test_tab_stops(void) /* Default tab stop value. */ for (size = 1.0f; size < 25.0f; size += 5.0f) { - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, size, enusW, &format); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, size, L"en-us", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); @@ -5711,8 +5679,8 @@ static void test_tab_stops(void) IDWriteTextFormat_Release(format); } - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-us", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); hr = IDWriteTextFormat_SetIncrementalTabStop(format, 0.0f); @@ -5730,7 +5698,7 @@ static void test_tab_stops(void) tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); ok(tabstop == 100.0f, "Unexpected tab stop %f.\n", tabstop); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0f, 1000.0f, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, L"\ta\tb", 4, format, 1000.0f, 1000.0f, &layout); ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); -- 2.25.0

1 0

[PATCH v10] include: Add xact3.idl
by Alistair Leslie-Hughes 14 Feb '20

14 Feb '20

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 531 ++++++++++++++++++++++++++++++++++++++++++++ include/xact3wb.h | 2 + 3 files changed, 534 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 6a822273a9..bb870b9828 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -776,6 +776,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..46ce1d3003 --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,531 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +import "xact3wb.h"; + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +static const INT XACT_RENDERER_ID_LENGTH = 0xff; +static const INT XACT_RENDERER_NAME_LENGTH = 0xff; +static const INT XACT_CUE_NAME_LENGTH = 0xff; + +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[XACT_RENDERER_ID_LENGTH]; + WCHAR displayName[XACT_RENDERER_NAME_LENGTH]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + XACT_READFILE_CALLBACK readFileCallback; + XACT_GETOVERLAPPEDRESULT_CALLBACK getOverlappedResultCallback; +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + HANDLE file; + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +cpp_quote("#if 0") +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* properties is a keyword for midl */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; +cpp_quote("#endif") + +cpp_quote("typedef struct XACT_WAVE_INSTANCE_PROPERTIES") +cpp_quote("{") +cpp_quote(" XACT_WAVE_PROPERTIES properties;") +cpp_quote(" BOOL backgroundMusic;") +cpp_quote("} XACT_WAVE_INSTANCE_PROPERTIES;") + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + void* pvContext; +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +typedef struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + } DUMMYUNIONNAME; +} XACT_NOTIFICATION; + +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + void* pGlobalSettingsBuffer; + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + XACT_NOTIFICATION_CALLBACK fnNotificationCallback; + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + local, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount(XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat(WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize(const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + const XACT_STREAMING_PARAMETERS *pParms, + IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + DWORD *pdwSeekTable, + BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex(LPCSTR szFriendlyName); + + HRESULT GetNumCues(XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves(XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex(LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices(const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState(DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..130efc9745 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -18,6 +18,8 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#define WAVEBANK_ENTRYNAME_LENGTH 64 + typedef union WAVEBANKMINIWAVEFORMAT { struct -- 2.17.1

2 2

[PATCH 1/3] iphlpapi/tests: Add tests for GetTcp6Table
by Alex Henrie 14 Feb '20

14 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7a4821aae7..8ccbf5f9b6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -56,6 +56,7 @@ static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWO static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetTcp6Table)(PMIB_TCP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pGetUnicastIpAddressTable)(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); @@ -86,6 +87,7 @@ static void loadIPHlpApi(void) pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); + pGetTcp6Table = (void *)GetProcAddress(hLibrary, "GetTcp6Table"); pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pGetUnicastIpAddressTable = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressTable"); @@ -2095,6 +2097,51 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetTcp6Table(void) +{ + DWORD ret; + ULONG size = 0; + PMIB_TCP6TABLE buf; + + if (!pGetTcp6Table) + { + win_skip("GetTcp6Table not available\n"); + return; + } + + ret = pGetTcp6Table(NULL, &size, FALSE); + if (ret == ERROR_NOT_SUPPORTED) + { + skip("GetTcp6Table is not supported\n"); + return; + } + ok(ret == ERROR_INSUFFICIENT_BUFFER, + "GetTcp6Table(NULL, &size, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", ret); + if (ret != ERROR_INSUFFICIENT_BUFFER) return; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + + ret = pGetTcp6Table(buf, &size, FALSE); + ok(ret == NO_ERROR, + "GetTcp6Table(buf, &size, FALSE) returned %d, expected NO_ERROR\n", ret); + + if (ret == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace("TCP6 table: %u entries\n", buf->dwNumEntries); + for (i = 0; i < buf->dwNumEntries; i++) + { + trace("%u: local %s%%%u:%u remote %s%%%u:%u state %u\n", i, + ntoa6(&buf->table[i].LocalAddr), ntohs(buf->table[i].dwLocalScopeId), + ntohs(buf->table[i].dwLocalPort), ntoa6(&buf->table[i].RemoteAddr), + ntohs(buf->table[i].dwRemoteScopeId), ntohs(buf->table[i].dwRemotePort), + buf->table[i].State); + } + } + + HeapFree(GetProcessHeap(), 0, buf); +} + static void test_GetUdp6Table(void) { DWORD apiReturn; @@ -2268,6 +2315,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetTcp6Table(); test_GetUdp6Table(); test_ParseNetworkString(); freeIPHlpApi(); -- 2.25.0

1 2

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 14 Feb '20

14 Feb '20

1 0

[PATCH v2 1/4] shell32: Append a directory separator if necessary in UNIXFS_path_to_pidl().
by Zebediah Figura 14 Feb '20

14 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/shfldr_unixfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a37b1bf5881..17a5513bd94 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -640,6 +640,8 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA /* Relative dos or unix path. Concat with this folder's path */ int cBasePathLen = strlen(pUnixFolder->m_pszPath); memcpy(szCompletePath, pUnixFolder->m_pszPath, cBasePathLen); + if (szCompletePath[cBasePathLen - 1] != '/') + szCompletePath[cBasePathLen++] = '/'; WideCharToMultiByte(CP_UNIXCP, 0, path, -1, szCompletePath + cBasePathLen, FILENAME_MAX - cBasePathLen, NULL, NULL); pNextPathElement = szCompletePath + cBasePathLen - 1; -- 2.25.0

2 4

[PATCH v3 1/3] quartz/filesource: Zero-initialize the file source filter.
by Zebediah Figura 14 Feb '20

14 Feb '20

Fixes: abac070387f908f853f38eddc67206ff7c657ae2 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 11cc438be29..c1f7f69d5e2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -352,7 +352,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) CloseHandle(filter->port); strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + free(filter); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -414,31 +414,24 @@ static DWORD CALLBACK io_thread(void *arg) HRESULT AsyncReader_create(IUnknown *outer, void **out) { - AsyncReader *pAsyncRead; - - pAsyncRead = CoTaskMemAlloc(sizeof(AsyncReader)); + AsyncReader *object; - if (!pAsyncRead) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - strmbase_filter_init(&pAsyncRead->filter, outer, &CLSID_AsyncReader, &filter_ops); + strmbase_filter_init(&object->filter, outer, &CLSID_AsyncReader, &filter_ops); - pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; + object->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; + object->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; - pAsyncRead->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; - - pAsyncRead->pszFileName = NULL; - - InitializeCriticalSection(&pAsyncRead->sample_cs); - pAsyncRead->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); - InitializeConditionVariable(&pAsyncRead->sample_cv); - pAsyncRead->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - pAsyncRead->io_thread = CreateThread(NULL, 0, io_thread, pAsyncRead, 0, NULL); - - *out = &pAsyncRead->filter.IUnknown_inner; - - TRACE("-- created at %p\n", pAsyncRead); + InitializeCriticalSection(&object->sample_cs); + object->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); + InitializeConditionVariable(&object->sample_cv); + object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + TRACE("Created file source %p.\n", object); + *out = &object->filter.IUnknown_inner; return S_OK; } -- 2.25.0

1 2

[PATCH 1/5] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams 14 Feb '20

14 Feb '20

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

1 5

Re: sponsored development to make Autodesk's "DWG TrueView" installer work
by René Genz 14 Feb '20

14 Feb '20

Hi Jeremy, thank you for your reply. I like the will to improve and truthful communication. I received James' message. We continue discussion in Codeweavers bug tracker. Hence I unsubscribe from this mailing list. Lots of interesting stuff, but I cannot keep up with it. :) Kind regards, René

1 0

[PATCH 4/4 v2] dmime: Implement IDirectMusicPerformance8_PChannelInfo()
by Michael Stefaniuc 14 Feb '20

14 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Hack in CreateStandardAudioPath() no longer needed dlls/dmime/performance.c | 27 +++++++++++++++++++-------- dlls/dmime/tests/performance.c | 32 +++++++++++++++----------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 989e5ee207..b7b71637a1 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -725,18 +725,29 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) + DWORD pchannel, IDirectMusicPort **port, DWORD *group, DWORD *channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 port_params; - GUID default_port; + struct pchannel_block *block; + struct wine_rb_entry *entry; + DWORD block_num = pchannel / 16; + unsigned int index = pchannel % 16; + + TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); + entry = wine_rb_get(&This->pchannels, &block_num); + if (!entry) + return E_INVALIDARG; + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); - port_params.dwSize = sizeof(DMUS_PORTPARAMS8); - port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); - IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); + if (port) { + *port = block->pchannel[index].port; + IDirectMusicPort_AddRef(*port); + } + if (group) + *group = block->pchannel[index].group; + if (channel) + *channel = block->pchannel[index].channel; return S_OK; } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 97c43c520b..825faabc9c 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -102,11 +102,12 @@ static HRESULT test_InitAudio(void) return hr; } - port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + IDirectMusicPort_Release(port); + port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); @@ -114,8 +115,7 @@ static HRESULT test_InitAudio(void) todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); - if (port) - IDirectMusicPort_Release(port); + IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); @@ -132,7 +132,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -223,10 +223,10 @@ static HRESULT test_InitAudio(void) DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); - todo_wine ok(hr == S_OK && group == 2 && channel == 15, + ok(hr == S_OK && group == 2 && channel == 15, "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); return S_OK; @@ -349,7 +349,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); ok(hr == S_OK, "Init failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); @@ -360,18 +360,16 @@ static void test_pchannel(void) ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + ok(hr == S_OK && port == port2 && group == 1 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ - todo_wine { hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); - } /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); @@ -380,7 +378,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + ok(hr == S_OK && port == port2 && group == 0 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -411,7 +409,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + ok(hr == S_OK && port2 == port && group == 1 && channel == 7, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -421,7 +419,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -430,17 +428,17 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + ok(hr == S_OK && port2 == port && group == 1 && channel == 13, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + ok(hr == S_OK && port2 == port && group == 0 && channel == 8, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + ok(hr == S_OK && port2 == port && group == 0 && channel == 15, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); -- 2.24.1

1 0

[PATCH 3/4] dmime: Create a port in the perf CreateStandardAudioPath()
by Michael Stefaniuc 14 Feb '20

14 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 13 ++++++++++--- dlls/dmime/tests/performance.c | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b12247ea31..989e5ee207 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1070,16 +1070,17 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateAudioPath(IDirectMusicP } static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDirectMusicPerformance8 *iface, - DWORD dwType, DWORD dwPChannelCount, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) + DWORD dwType, DWORD pchannel_count, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicAudioPath *pPath; DSBUFFERDESC desc; WAVEFORMATEX format; + DMUS_PORTPARAMS params = {0}; IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; - FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, dwPChannelCount, fActivate, ppNewPath); + FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); if (NULL == ppNewPath) { return E_POINTER; @@ -1126,7 +1127,13 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_INVALIDARG; } - /* FIXME: Should we create one secondary buffer for each PChannel? */ + /* Create a port */ + params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwChannelGroups = (pchannel_count + 15) / 16; + params.dwAudioChannels = format.nChannels; + if (FAILED(hr = perf_dmport_create(This, &params))) + return hr; + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index ff275eb9c2..97c43c520b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -82,6 +82,7 @@ static HRESULT test_InitAudio(void) IDirectSound *dsound; IDirectMusicPort *port; IDirectMusicAudioPath *path; + DWORD channel, group; HRESULT hr; ULONG ref; @@ -216,6 +217,18 @@ static HRESULT test_InitAudio(void) ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound); + /* InitAudio with perf channel count not a multiple of 16 rounds up */ + create_performance(&performance, NULL, NULL, TRUE); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); + todo_wine ok(hr == S_OK && group == 2 && channel == 15, + "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + destroy_performance(performance, NULL, NULL); + return S_OK; } -- 2.24.1

1 0

[PATCH 2/4] dmime: Split out the perf default port creation
by Michael Stefaniuc 14 Feb '20

14 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 78 ++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index c492ebdcb1..b12247ea31 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -624,39 +624,57 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemoveNotificationType(IDirec return S_OK; } +static HRESULT perf_dmport_create(IDirectMusicPerformance8Impl *perf, DMUS_PORTPARAMS *params) +{ + IDirectMusicPort *port; + GUID guid; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = IDirectMusic8_GetDefaultPort(perf->dmusic, &guid))) + return hr; + + params->dwSize = sizeof(params); + params->dwValidParams |= DMUS_PORTPARAMS_SHARE; + params->fShare = TRUE; + + if (FAILED(hr = IDirectMusic8_CreatePort(perf->dmusic, &guid, params, &port, NULL))) + return hr; + if (FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) { + IDirectMusicPort_Release(port); + return hr; + } + for (i = 0; i < params->dwChannelGroups; i++) + pchannel_block_set(&perf->pchannels, i, port, i + 1, FALSE); + + return S_OK; +} + static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerformance8 *iface, - IDirectMusicPort *pPort) + IDirectMusicPort *port) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - HRESULT hr = E_FAIL; + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p): stub\n", This, pPort); - if (!This->dmusic) - return DMUS_E_NOT_INIT; - if (NULL == pPort) { - GUID port_guid; - IDirectMusicPort* pDefaultPort = NULL; - DMUS_PORTPARAMS params; - hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); - if (FAILED(hr)) return hr; - ZeroMemory(&params, sizeof(params)); - params.dwSize = sizeof(params); - params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_SHARE; - params.dwChannelGroups = 1; - params.fShare = TRUE; - hr = IDirectMusic8_CreatePort(This->dmusic, &port_guid, &params, &pDefaultPort, NULL); - if (FAILED(hr)) return hr; - hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); - if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); - } else { - IDirectMusicPort_AddRef(pPort); - } - /** - * We should remember added Ports (for example using a list) - * and control if Port is registered for each api who use ports - */ - return S_OK; + FIXME("(%p, %p): semi-stub\n", This, port); + + if (!This->dmusic) + return DMUS_E_NOT_INIT; + + if (!port) { + DMUS_PORTPARAMS params = { + .dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS, + .dwChannelGroups = 1 + }; + + return perf_dmport_create(This, &params); + } + + IDirectMusicPort_AddRef(port); + /** + * We should remember added Ports (for example using a list) + * and control if Port is registered for each api who use ports + */ + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerformance8 *iface, -- 2.24.1

1 0

[PATCH 1/4] dmime/tests: Move some ok() calls to make it clear what is being tested
by Michael Stefaniuc 14 Feb '20

14 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index e6a3fe2271..ff275eb9c2 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -270,35 +270,27 @@ static void test_createport(void) /* dwValidParams == 0 -> S_OK, filled struct */ portparams.dwValidParams = 0; - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* dwValidParams != 0, invalid param -> S_FALSE, filled struct */ portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS; portparams.dwChannelGroups = 0; - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* dwValidParams != 0, valid params -> S_OK */ - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - IDirectMusicPort_Release(port); port = NULL; @@ -307,12 +299,10 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* null GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL); -- 2.24.1

1 0

[tools] testbot/WineSendLog: Only new errors are reported to the mailing list.
by Francois Gouget 13 Feb '20

13 Feb '20

Skip over test results that contain no new error so WineSendLog does not send empty emails to the mailing list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 23930993cb..65c95de4d8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -340,7 +340,7 @@ EOF { my $LogInfo = $JobErrors->{$Key}->{$LogName}; # Skip if there are no errors - next if (!$LogInfo->{ErrCount}); + next if (!$LogInfo->{NewCount}); push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; -- 2.20.1

1 0

[PATCH v4 1/5] wined3d: Factor out wined3d_stateblock_rs_changed() function.
by Paul Gofman 13 Feb '20

13 Feb '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8405643741..7473b3118e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3942,7 +3942,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(state->rs); ++i) { - if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + if (wined3d_stateblock_rs_changed(stateblock, i)) { if (i == WINED3D_RS_BLENDFACTOR) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52b..d0564eecbd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5327,6 +5327,11 @@ static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *v *max_z = max(vp->max_z, vp->min_z + 0.001f); } +static inline BOOL wined3d_stateblock_rs_changed(const struct wined3d_stateblock *stateblock, DWORD state_id) +{ + return stateblock->changed.renderState[state_id >> 5] & (1u << (state_id & 0x1f)); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.24.1

2 8

[PATCH v2 1/3] server: Validate status in continue_debug_event.
by Rémi Bernon 13 Feb '20

13 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 4 ++++ server/debugger.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e8b481e703f..07e05e45c90 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1000,6 +1000,10 @@ static void test_debugger(void) continuestatus = DBG_CONTINUE; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); + ok(!ret, "ContinueDebugEvent unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %u\n", GetLastError()); + if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); diff --git a/server/debugger.c b/server/debugger.c index a5c39aa33e7..5b06b73b4be 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -612,8 +612,16 @@ DECL_HANDLER(wait_debug_event) /* Continue a debug event */ DECL_HANDLER(continue_debug_event) { - struct process *process = get_process_from_id( req->pid ); - if (process) + struct process *process; + + if (req->status != DBG_EXCEPTION_NOT_HANDLED && + req->status != DBG_CONTINUE) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if ((process = get_process_from_id( req->pid ))) { struct thread *thread = get_thread_from_id( req->tid ); if (thread) -- 2.25.0

2 5

[resend PATCH v3 1/4] wined3d: Support AMD alpha to coverage state.
by Paul Gofman 13 Feb '20

13 Feb '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - manage the state in state block. dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 28 ++++++++++++++++++++++++++-- dlls/wined3d/stateblock.c | 32 ++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 7 ++++++- include/wine/wined3d.h | 1 + 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 366862a05a..336d08513d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26680,7 +26680,7 @@ static void test_alpha_to_coverage(void) colour = get_readback_color(&rb, 64, 64); /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8405643741..5636ba7ddf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -529,6 +529,8 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); + wined3d_blend_state_decref(device->blend_state_atoc_enabled); + wined3d_cs_destroy(device->cs); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) @@ -3837,6 +3839,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; unsigned int i, j, count; + BOOL blend_state_set = FALSE; + struct wined3d_color color; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3946,15 +3950,24 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { if (i == WINED3D_RS_BLENDFACTOR) { - struct wined3d_color color; + struct wined3d_blend_state *blend_state = stateblock->changed.blend_state + ? state->blend_state : wined3d_device_get_blend_state(device, &color); + wined3d_color_from_d3dcolor(&color, state->rs[i]); - wined3d_device_set_blend_state(device, NULL, &color); + wined3d_device_set_blend_state(device, blend_state, &color); + blend_state_set = TRUE; } else wined3d_device_set_render_state(device, i, state->rs[i]); } } + if (stateblock->changed.blend_state && !blend_state_set) + { + wined3d_device_get_blend_state(device, &color); + wined3d_device_set_blend_state(device, state->blend_state, &color); + } + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) { for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) @@ -5759,12 +5772,23 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; + struct wined3d_blend_state_desc blend_state_desc; unsigned int i; HRESULT hr; if (!wined3d_select_feature_level(adapter, levels, level_count, &device->feature_level)) return E_FAIL; + memset(&blend_state_desc, 0, sizeof(blend_state_desc)); + blend_state_desc.alpha_to_coverage = TRUE; + + if (FAILED(hr = wined3d_blend_state_create(device, &blend_state_desc, + NULL, &wined3d_null_parent_ops, &device->blend_state_atoc_enabled))) + { + ERR("Could not create blend state object.\n"); + return hr; + } + TRACE("Device feature level %s.\n", wined3d_debug_feature_level(device->feature_level)); device->ref = 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 499d23fbbd..0d3fad0a6d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; + states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -263,6 +264,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; + states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -1017,6 +1019,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.blend_state) + stateblock->stateblock_state.blend_state = state->blend_state; + TRACE("Capture done.\n"); } @@ -1025,6 +1030,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_device *device = stateblock->device; + BOOL blend_state_set = FALSE; + struct wined3d_color color; unsigned int i; DWORD map; @@ -1121,14 +1128,24 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->rs[rs] = stateblock->stateblock_state.rs[rs]; if (rs == WINED3D_RS_BLENDFACTOR) { - struct wined3d_color color; + struct wined3d_blend_state *blend_state = stateblock->changed.blend_state + ? stateblock->stateblock_state.blend_state + : wined3d_device_get_blend_state(device, &color); + wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); - wined3d_device_set_blend_state(device, NULL, &color); + wined3d_device_set_blend_state(device, blend_state, &color); + blend_state_set = TRUE; } else wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } + if (stateblock->changed.blend_state && !blend_state_set) + { + wined3d_device_get_blend_state(device, &color); + wined3d_device_set_blend_state(device, stateblock->stateblock_state.blend_state, &color); + } + /* Texture states. */ for (i = 0; i < stateblock->num_contained_tss_states; ++i) { @@ -1426,6 +1443,17 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->stateblock_state.rs[state] = value; stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); + + if (state == WINED3D_RS_POINTSIZE + && (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE || value == WINED3D_ALPHA_TO_COVERAGE_DISABLE)) + { + stateblock->changed.blend_state = 1; + + if (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE) + stateblock->stateblock_state.blend_state = stateblock->device->blend_state_atoc_enabled; + else + stateblock->stateblock_state.blend_state = NULL; + } } void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52b..f6e5dadf2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -3314,6 +3317,7 @@ struct wined3d_device /* Context management */ struct wined3d_context **contexts; UINT context_count; + struct wined3d_blend_state *blend_state_atoc_enabled; }; void wined3d_device_cleanup(struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -3932,7 +3936,8 @@ struct wined3d_saved_states DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD store_stream_offset : 1; - DWORD padding : 4; + DWORD blend_state : 1; + DWORD padding : 3; }; struct StageState { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec8..d783e64a26 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2168,6 +2168,7 @@ struct wined3d_stateblock_state RECT scissor_rect; struct wined3d_light_state *light_state; + struct wined3d_blend_state *blend_state; }; struct wined3d_parent_ops -- 2.24.1

3 16

[PATCH v3 1/5] winegstreamer: Read samples synchronously in push_data().
by Zebediah Figura 13 Feb '20

13 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gst_cbs.c | 9 ---- dlls/winegstreamer/gst_cbs.h | 5 --- dlls/winegstreamer/gstdemux.c | 81 ++++++++++------------------------- 3 files changed, 23 insertions(+), 72 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index e7a4b41d55f..679d87c52f5 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -227,15 +227,6 @@ void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer call_cb(&cbdata); } -void release_sample_wrapper(gpointer data) -{ - struct cb_data cbdata = { RELEASE_SAMPLE }; - - cbdata.u.release_sample_data.data = data; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 46f8add57c4..a425671da76 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -42,7 +42,6 @@ enum CB_TYPE { REMOVED_DECODED_PAD, AUTOPLUG_BLACKLIST, UNKNOWN_TYPE, - RELEASE_SAMPLE, QUERY_SINK }; @@ -122,9 +121,6 @@ struct cb_data { GstCaps *caps; gpointer user; } unknown_type_data; - struct release_sample_data { - gpointer data; - } release_sample_data; struct query_sink_data { GstPad *pad; GstObject *parent; @@ -159,7 +155,6 @@ GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) D void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; -void release_sample_wrapper(gpointer data) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0b5fee30273..b62f44b6a13 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -97,8 +97,6 @@ static inline struct gstdemux *impl_from_strmbase_filter(struct strmbase_filter return CONTAINING_RECORD(iface, struct gstdemux, filter); } -static const char *media_quark_string = "media-sample"; - static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; @@ -744,21 +742,20 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } } -static void release_sample(void *data) -{ - ULONG ret; - ret = IMediaSample_Release((IMediaSample *)data); - TRACE("Releasing %p returns %u\n", data, ret); -} - static DWORD CALLBACK push_data(LPVOID iface) { LONGLONG maxlen, curlen; struct gstdemux *This = iface; - IMediaSample *buf; - DWORD_PTR user; + GstMapInfo mapping; + GstBuffer *buffer; HRESULT hr; + if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) + { + ERR("Failed to allocate memory.\n"); + return 0; + } + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); if (!This->stop) @@ -768,51 +765,30 @@ static DWORD CALLBACK push_data(LPVOID iface) TRACE("Starting..\n"); for (;;) { - REFERENCE_TIME tStart, tStop; ULONG len; - GstBuffer *gstbuf; - gsize bufsize; - BYTE *data; int ret; - hr = IMemAllocator_GetBuffer(This->alloc, &buf, NULL, NULL, 0); - if (FAILED(hr)) - break; - if (This->nextofs >= maxlen) break; - len = IMediaSample_GetSize(buf); - if (This->nextofs + len > maxlen) - len = maxlen - This->nextofs; - - tStart = MEDIATIME_FROM_BYTES(This->nextofs); - tStop = tStart + MEDIATIME_FROM_BYTES(len); - IMediaSample_SetTime(buf, &tStart, &tStop); + len = min(16384, maxlen - This->nextofs); - hr = IAsyncReader_Request(This->reader, buf, 0); - if (FAILED(hr)) { - IMediaSample_Release(buf); + if (!gst_buffer_map_range(buffer, -1, len, &mapping, GST_MAP_WRITE)) + { + ERR("Failed to map buffer.\n"); break; } - This->nextofs += len; - hr = IAsyncReader_WaitForNext(This->reader, -1, &buf, &user); - if (FAILED(hr) || !buf) { - if (buf) - IMediaSample_Release(buf); + hr = IAsyncReader_SyncRead(This->reader, This->nextofs, len, mapping.data); + gst_buffer_unmap(buffer, &mapping); + if (hr != S_OK) + { + ERR("Failed to read data, hr %#x.\n", hr); break; } - IMediaSample_GetPointer(buf, &data); - bufsize = IMediaSample_GetActualDataLength(buf); - gstbuf = gst_buffer_new_wrapped_full(0, data, bufsize, 0, bufsize, buf, release_sample_wrapper); - IMediaSample_AddRef(buf); - gst_mini_object_set_qdata(GST_MINI_OBJECT(gstbuf), g_quark_from_static_string(media_quark_string), buf, release_sample_wrapper); - if (!gstbuf) { - IMediaSample_Release(buf); - break; - } - gstbuf->duration = gstbuf->pts = -1; - ret = gst_pad_push(This->my_src, gstbuf); + This->nextofs += len; + + buffer->duration = buffer->pts = -1; + ret = gst_pad_push(This->my_src, buffer); if (ret >= 0) hr = S_OK; else @@ -825,14 +801,9 @@ static DWORD CALLBACK push_data(LPVOID iface) break; } - gst_pad_push_event(This->my_src, gst_event_new_eos()); + gst_buffer_unref(buffer); - TRACE("Almost stopping.. %08x\n", hr); - do { - IAsyncReader_WaitForNext(This->reader, 0, &buf, &user); - if (buf) - IMediaSample_Release(buf); - } while (buf); + gst_pad_push_event(This->my_src, gst_event_new_eos()); TRACE("Stopping.. %08x\n", hr); @@ -2332,12 +2303,6 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) unknown_type(data->bin, data->pad, data->caps, data->user); break; } - case RELEASE_SAMPLE: - { - struct release_sample_data *data = &cbdata->u.release_sample_data; - release_sample(data->data); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data; -- 2.25.0

3 6

Make LocalNext() return correct handles, addresses, flags and lock values for moveable blocks. Previous implementation just returned the arena block pointer and flags for fixed blocks. Needed for applications that use toolhelp to find their own memory blocks.
by Dirk Niggemann 13 Feb '20

13 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48523 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/toolhelp.dll16/toolhelp.c | 55 ++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index f2b520b6a1..5fe5afe988 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -90,6 +90,30 @@ typedef struct #define LOCAL_ARENA_HEADER( handle) ((handle) - LOCAL_ARENA_HEADER_SIZE) #define LOCAL_ARENA_PTR(ptr,arena) ((LOCALARENA *)((char *)(ptr)+(arena))) +#ifdef ALLOW_UNALIGNED_ACCESS +# define MOVEABLE_PREFIX sizeof(HLOCAL16) +#else +# define MOVEABLE_PREFIX sizeof(int) +#endif + +/* Layout of a handle entry table + * + * WORD count of entries + * LOCALHANDLEENTRY[count] entries + * WORD near ptr to next table + */ +typedef struct +{ + WORD addr; /* Address of the MOVEABLE block */ + BYTE flags; /* Flags for this block */ + BYTE lock; /* Lock count */ +} LOCALHANDLEENTRY; + + +#define HANDLE_FIXED(handle) (((handle) & 3) == 0) +#define HANDLE_MOVEABLE(handle) (((handle) & 3) == 2) + + typedef struct { WORD null; /* Always 0 */ @@ -349,15 +373,36 @@ BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry ) WORD ds = GlobalHandleToSel16( pLocalEntry->hHeap ); char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALARENA *pArena; + WORD table, lhandle; + LOCALHEAPINFO *pInfo = get_local_heap( ds ); - if (!get_local_heap( ds )) return FALSE; - if (!pLocalEntry->wNext) return FALSE; + if ( !pInfo ) return FALSE; + if ( !pLocalEntry->wNext ) return FALSE; + table = pInfo->htable; pArena = LOCAL_ARENA_PTR( ptr, pLocalEntry->wNext ); - - pLocalEntry->hHandle = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; - pLocalEntry->wAddress = pLocalEntry->hHandle; + pLocalEntry->wAddress = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; + lhandle = pLocalEntry->wAddress; pLocalEntry->wFlags = (pArena->prev & 3) + 1; pLocalEntry->wcLock = 0; + /* Find the address in the entry tables */ + while (table) + { + WORD count = *(WORD *)(ptr + table); + LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY*)(ptr+table+sizeof(WORD)); + for (; count > 0; count--, pEntry++) + if (pEntry->addr == lhandle + MOVEABLE_PREFIX) + { + lhandle = (HLOCAL16)((char *)pEntry - ptr); + table = 0; + pLocalEntry->wAddress = pEntry->addr; + pLocalEntry->wFlags = pEntry->flags; + pLocalEntry->wcLock = pEntry->lock; + TRACE("moveable handle %04x\n", lhandle); + break; + } + if ( table ) table = *(WORD *)pEntry; + } + pLocalEntry->hHandle = lhandle; pLocalEntry->wType = LT_NORMAL; if (pArena->next != pLocalEntry->wNext) /* last one? */ pLocalEntry->wNext = pArena->next; -- 2.17.2 (Apple Git-113)

1 0

[PATCH v5 1/7] vbscript: Fail if we have no context in InvokeEx.
by Gabriel Ivăncescu 13 Feb '20

13 Feb '20

The current code can't cope with it, so do the same thing as in GetDispID, to prevent a possible crash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b..36eba21 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1388,6 +1388,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if (!This->ctx) + return E_UNEXPECTED; + if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; -- 2.21.0

2 7

[PATCH 3/3] vbscript: Implement the SCRIPTITEM_CODEONLY flag.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 83 ++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.c | 2 +- 2 files changed, 79 insertions(+), 6 deletions(-)

1 0

[PATCH 2/3] vbscript: Use a helper function to lookup the global functions.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)

1 0

[PATCH 1/3] vbscript: Fail if we have no context in InvokeEx.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> The current code can't cope with it, so do the same thing as in GetDispID, to prevent a possible crash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v9] include: Add xact3.idl
by Alistair Leslie-Hughes 13 Feb '20

13 Feb '20

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 533 ++++++++++++++++++++++++++++++++++++++++++++ include/xact3wb.h | 2 + 3 files changed, 536 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index a91372eb4d..09dcb0906c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -774,6 +774,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..c49718ff39 --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,533 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +import "xact3wb.h"; + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +#define XACT_RENDERER_ID_LENGTH 0xff +#define XACT_RENDERER_NAME_LENGTH 0xff +#define XACT_CUE_NAME_LENGTH 0xff + +cpp_quote("#ifndef WAVEBANK_ENTRYNAME_LENGTH") +#define WAVEBANK_ENTRYNAME_LENGTH 64 +cpp_quote("#endif") + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[XACT_RENDERER_ID_LENGTH]; + WCHAR displayName[XACT_RENDERER_NAME_LENGTH]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + XACT_READFILE_CALLBACK readFileCallback; + XACT_GETOVERLAPPEDRESULT_CALLBACK getOverlappedResultCallback; +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + HANDLE file; + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +cpp_quote("#if 0") +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* properties is a keyword for midl */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; +cpp_quote("#endif") + +cpp_quote("typedef struct XACT_WAVE_INSTANCE_PROPERTIES") +cpp_quote("{") +cpp_quote(" XACT_WAVE_PROPERTIES properties;") +cpp_quote(" BOOL backgroundMusic;") +cpp_quote("} XACT_WAVE_INSTANCE_PROPERTIES;") + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + void* pvContext; +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +typedef struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + } DUMMYUNIONNAME; +} XACT_NOTIFICATION; + +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + void* pGlobalSettingsBuffer; + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + XACT_NOTIFICATION_CALLBACK fnNotificationCallback; + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + local, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount(XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat(WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize(const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + const XACT_STREAMING_PARAMETERS *pParms, + IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + DWORD *pdwSeekTable, + BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex(LPCSTR szFriendlyName); + + HRESULT GetNumCues(XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves(XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex(LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices(const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState(DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..130efc9745 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -18,6 +18,8 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#define WAVEBANK_ENTRYNAME_LENGTH 64 + typedef union WAVEBANKMINIWAVEFORMAT { struct -- 2.25.0

2 1

[PATCH v2 1/2] kernel32/tests: Add tests for LCMapStringW
by Fabian Maurer 13 Feb '20

13 Feb '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/locale.c | 182 +++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index adb3c43e09..e7b8e0cdad 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2708,6 +2708,187 @@ static INT LCMapStringEx_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR ds return pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, flags, src, srclen, dst, dstlen, NULL, NULL, 0); } +BYTE sortkey_results_win7_default[] = { 14, 2, 14, 9, 14, 10, 170, 133, 2, 14, 2, 1, 2, 2, 2, 14, 1, 2, 2, 2, 2, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_type1[] = { 1, 214, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_symbols1[] = { 14, 2, 14, 9, 7, 47, 8, 28, 9, 56, 10, 130, 11, 57, 12, 165, 14, 167, 14, 169, 1, 2, 2, 2, 21, 102, 2, 21, 1, 2, 2, 3, 1, 1, 0 }; +BYTE sortkey_results_win7_symbols2[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_punctuation1[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 255, 253, 131, 20, 255, 253, 132, 170, 0 }; +BYTE sortkey_results_win7_punctuation2[] = { 14, 2, 14, 9, 6, 131, 6, 132, 14, 167, 14, 169, 1, 2, 2, 2, 21, 1, 2, 2, 4, 1, 1, 0 }; +BYTE sortkey_results_win7_punctuation3[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_type5[] = { 253, 255, 168, 110, 16, 201, 14, 2, 1, 2, 68, 1, 2, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_jamo[] = { 220, 63, 16, 201, 14, 2, 1, 2, 68, 1, 4, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese1[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese2[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese3[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese4[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 196, 196, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese5[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 255, 2, 196, 196, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special1[] = { 255, 255, 255, 255, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special2[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special3[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special4[] = { 34, 2, 14, 2, 14, 2, 1, 1, 1, 196, 255, 2, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special5[] = { 255, 255, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special6[] = { 34, 2, 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special7[] = { 34, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 5, 5, 2, 196, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special8[] = { 34, 2, 14, 2, 14, 2, 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special9[] = { 34, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 5, 2, 196, 196, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special10[] = { 34, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special11[] = { 34, 2, 14, 2, 34, 2, 34, 2, 14, 2, 14, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special12[] = { 34, 13, 34, 5, 1, 1, 1, 255, 3, 5, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special13[] = { 34, 74, 34, 74, 1, 1, 1, 255, 2, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special14[] = { 34, 58, 34, 58, 1, 1, 1, 196, 196, 255, 3, 4, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special15[] = { 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 34, 2, 14, 2, 13, 3, 13, 25, 13, 29, 14, 2, 13, 3, 13, 25, 13, 29, 13, 29, 13, 29, 14, 2, 34, 2, 34, 2, 1, 2, 2, 2, 2, 2, 7, 1, 1, 196, 196, 196, 196, 196, 255, 3, 3, 4, 3, 5, 2, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special16[] = { 34, 44, 14, 53, 14, 53, 34, 74, 34, 52, 34, 52, 34, 52, 14, 9, 34, 78, 34, 50, 14, 138, 14, 138, 14, 145, 34, 78, 34, 6, 34, 6, 14, 112, 34, 6, 34, 38, 14, 159, 1, 238, 2, 7, 2, 2, 3, 2, 2, 3, 2, 2, 2, 2, 2, 2, 5, 2, 2, 238, 1, 1, 198, 198, 196, 196, 196, 255, 3, 3, 3, 4, 4, 3, 3, 3, 3, 4, 2, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 197, 196, 197, 197, 197, 197, 196, 197, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special17[] = { 34, 44, 14, 53, 14, 53, 34, 74, 34, 52, 34, 52, 34, 52, 14, 9, 34, 78, 34, 50, 14, 138, 14, 138, 14, 145, 34, 78, 34, 6, 34, 6, 14, 112, 34, 6, 34, 38, 14, 159, 1, 1, 1, 255, 2, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_missing_characters[] = { 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_expansion1[] = { 14, 2, 14, 33, 1, 1, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility1[] = { 1, 12, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_expansion2[] = { 14, 2, 7, 83, 1, 0, 41, 110, 41, 167, 41, 212, 1, 14, 2, 12, 1, 2, 2, 0, 2, 2, 5, 1, 1, 0 }; +BYTE sortkey_results_win7_null_character[] = { 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_missing_characters1[] = { 253, 255, 128, 119, 5, 128, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_expansion1[] = { 253, 255, 128, 119, 41, 32, 41, 65, 255, 255, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_unsortable[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_missing_characters2[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_expansion2[] = { 34, 2, 14, 2, 14, 33, 255, 255, 1, 1, 2, 18, 18, 1, 196, 255, 2, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_punctuation_with_cjk[] = { 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 1, 1, 1, 1, 255, 236, 25, 18, 0 }; +BYTE sortkey_results_win7_compatibility_to_expansion[] = { 7, 83, 1, 0, 1, 2, 12, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility2[] = { 41, 68, 253, 255, 77, 101, 181, 251, 1, 2, 2, 63, 1, 2, 2, 63, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility3[] = { 253, 255, 63, 216, 5, 63, 8, 227, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_type1[] = { 34, 60, 34, 60, 1, 42, 5, 1, 1, 255, 3, 4, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_language_jap1[] = { 176, 55, 253, 255, 85, 45, 208, 223, 1, 63, 1, 63, 1, 1, 0 }; + +#define run_sortkey_test(locale, str, result, flags) \ + _run_sortkey_test(locale, str, ARRAY_SIZE(str), result, ARRAY_SIZE(result), flags, __FILE__, __LINE__) + +static void _run_sortkey_test(unsigned int locale, const WCHAR* str, int str_len, BYTE* result, int result_len, int flags, const char* file, int line) +{ + int i; + BYTE buffer[1000]; + int test_len = LCMapStringW(locale, 0x00000400 | flags /* LCMAP_SORTKEY */, str, -1, (void *)buffer, sizeof(buffer)); + int difference = -1; + for (i = 0; i < result_len && i < test_len; i++) + { + if (buffer[i] != result[i]) + { + difference = i; + break; + } + } + ok_(file, line)(difference == -1, "Difference at %d\n", difference); +} + +static void test_LCMapString_sortkey(void) +{ + OSVERSIONINFOA osversion; + + osversion.dwOSVersionInfoSize = sizeof(osversion); + GetVersionExA(&osversion); + + if (broken(osversion.dwMajorVersion != 6 || osversion.dwMinorVersion != 1)) + { + skip("Unicode sorting table tests only implemented for win7. Current version is %d.%d\n", osversion.dwMajorVersion, osversion.dwMinorVersion); + return; + } + + /* Tests against the Win7 sorting tables */ + + /* en-US */ + todo_wine + run_sortkey_test(0x0409, L"abc\ue604\u00c1", sortkey_results_win7_default, 0); /* Default case */ + todo_wine + run_sortkey_test(0x0409, L"\u02f4\u02f4\u02f4", sortkey_results_win7_type1, 0); /* Type 1 */ + todo_wine + run_sortkey_test(0x0409, L"ab\uff0c\u2a74\u2364\u265f\u29d8\u2ff3yz", sortkey_results_win7_symbols1, 0); /* Symbols */ + todo_wine + run_sortkey_test(0x0409, L"ab\uff0c\u2a74\u2364\u265f\u29d8\u2ff3yz", sortkey_results_win7_symbols2, NORM_IGNORESYMBOLS); /* Symbols */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation1, 0); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation2, SORT_STRINGSORT); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation3, NORM_IGNORESYMBOLS); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"\u4d3a\u0476A", sortkey_results_win7_type5, 0); /* Type 5 */ + todo_wine + run_sortkey_test(0x0409, L"\u11ee\u0476A", sortkey_results_win7_jamo, 0); /* Jamo */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese1, 0); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese2, NORM_IGNORECASE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese3, NORM_IGNOREWIDTH); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese4, NORM_IGNOREKANATYPE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese5, NORM_IGNORENONSPACE | NORM_IGNOREWIDTH | NORM_IGNOREKANATYPE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\u30fc\u30fc", sortkey_results_win7_japanese_special1, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc", sortkey_results_win7_japanese_special2, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc", sortkey_results_win7_japanese_special3, NORM_IGNOREWIDTH); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fc", sortkey_results_win7_japanese_special4, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special5, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special6, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc\u30fc", sortkey_results_win7_japanese_special7, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fca\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special8, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc\uff67", sortkey_results_win7_japanese_special9, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\uff67\u30fc", sortkey_results_win7_japanese_special10, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\uff67\u30fca\u30fc", sortkey_results_win7_japanese_special11, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u30B1\u30FC", sortkey_results_win7_japanese_special12, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uFF9C\u3034", sortkey_results_win7_japanese_special13, NORM_IGNORENONSPACE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u3083\u309D", sortkey_results_win7_japanese_special14, NORM_IGNOREKANATYPE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"aaa\uff67\uff67\ua015a015a015\uff70\uff70a\uff67\u30fc", sortkey_results_win7_japanese_special15, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u32EBj\uA015\uFF9C\u31FA\u3034\u30FDb\u30FA\uFF8Frrs\u30F2\uFF75\u3005n\uFF75\u32E8u", sortkey_results_win7_japanese_special16, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u32EBj\uA015\uFF9C\u31FA\u3034\u30FDb\u30FA\uFF8Frrs\u30F2\uFF75\u3005n\uFF75\u32E8u", sortkey_results_win7_japanese_special17, NORM_IGNORENONSPACE | NORM_IGNOREWIDTH | NORM_IGNOREKANATYPE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u037f\u052a", sortkey_results_win7_missing_characters, 0); /* Characters not in table */ + todo_wine + run_sortkey_test(0x0409, L"\u00c6", sortkey_results_win7_expansion1, 0); /* Expansion */ + todo_wine + run_sortkey_test(0x0409, L"\u0374", sortkey_results_win7_compatibility1, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"a\u0301\u0385\u06d6", sortkey_results_win7_expansion2, 0); /* Expansion */ + run_sortkey_test(0x0409, L"\0a", sortkey_results_win7_null_character, 0); /* null character */ + todo_wine + run_sortkey_test(0x0409, L"\u9185\xD994\uFF70", sortkey_results_win7_japanese_special_with_missing_characters1, 0); /* Characters not in table & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u9185\uFCA2\uFF70", sortkey_results_win7_japanese_special_with_expansion1, 0); /* Expansion & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u200f\u30fc", sortkey_results_win7_japanese_special_with_unsortable, 0); /* Unsortable characters & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u037f\u30fc", sortkey_results_win7_japanese_special_with_missing_characters2, 0); /* Character not in table & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u00c6\u30fc", sortkey_results_win7_japanese_special_with_expansion2, 0); /* Expansion & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\x001C", sortkey_results_win7_punctuation_with_cjk, 0); /* Punctuation with CJK */ + todo_wine + run_sortkey_test(0x0409, L"\u1fee", sortkey_results_win7_compatibility_to_expansion, 0); /* Compatibility to expansion */ + todo_wine + run_sortkey_test(0x0409, L"\uFEA6\uFA83\xDD01", sortkey_results_win7_compatibility2, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"\uFA72\u30FC\u22DC", sortkey_results_win7_compatibility3, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"\u30E6\u05B6\u3005", sortkey_results_win7_japanese_special_type1, 0); /* Type 1 and Japanese special */ + + /* ja-JP */ + todo_wine + run_sortkey_test(0x0411, L"\xd835\ufa43\u4edf", sortkey_results_win7_language_jap1, 0); +} + static void test_LCMapStringEx(void) { int ret; @@ -6580,6 +6761,7 @@ START_TEST(locale) test_LCMapStringW(); test_LCMapStringEx(); test_LocaleNameToLCID(); + test_LCMapString_sortkey(); test_FoldStringA(); test_FoldStringW(); test_ConvertDefaultLocale(); -- 2.25.0

3 8

[v3 PATCH] mfplat/tests: Add more comprehensive media source tests.
by Nikolay Sivov 13 Feb '20

13 Feb '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: fixed a leak in tests. Thanks, Derek. dlls/mfplat/tests/mfplat.c | 144 ++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67123d0b69..02e4cff88a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -350,25 +350,63 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) +{ + MediaEventType event_type; + HRESULT hr, event_status; + IMFMediaEvent *event; + + hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); + ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + + hr = IMFMediaEvent_GetStatus(event, &event_status); + ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); + ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + + hr = IMFMediaEvent_GetType(event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + + if (event_type != expected_event_type) + { + IMFMediaEvent_Release(event); + return FALSE; + } + + if (value) + { + hr = IMFMediaEvent_GetValue(event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + IMFMediaEvent_Release(event); + + return TRUE; +} + static void test_source_resolver(void) { - static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; struct test_callback callback = { { &test_create_from_url_callback_vtbl } }; struct test_callback callback2 = { { &test_create_from_file_handler_callback_vtbl } }; IMFSourceResolver *resolver, *resolver2; + IMFPresentationDescriptor *descriptor; IMFSchemeHandler *scheme_handler; + IMFMediaStream *video_stream; IMFAttributes *attributes; IMFMediaSource *mediasource; - IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; + IMFMediaType *media_type; BOOL selected, do_uninit; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; WCHAR pathW[MAX_PATH]; - HRESULT hr; + int i, sample_count; WCHAR *filename; + PROPVARIANT var; + ULONG refcount; + HRESULT hr; GUID guid; if (!pMFCreateSourceResolver) @@ -428,7 +466,7 @@ static void test_source_resolver(void) hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); @@ -447,17 +485,107 @@ static void test_source_resolver(void) hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; - IMFMediaTypeHandler_Release(handler); - IMFStreamDescriptor_Release(sd); + /* Check major/minor type for the test media. */ + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + IMFMediaType_Release(media_type); + + hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); + ok(hr == S_OK, "Failed to select video stream, hr %#x.\n", hr); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); + video_stream = (IMFMediaStream *)var.punkVal; + + get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + + /* Request samples, our file is 10 frames at 25fps */ + get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); + sample_count = 10; + + /* Request one beyond EOS, otherwise EndOfStream isn't queued. */ + for (i = 0; i <= sample_count; ++i) + { + hr = IMFMediaStream_RequestSample(video_stream, NULL); + if (i == sample_count) + break; + ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); + if (hr != S_OK) + break; + } + + for (i = 0; i < sample_count; ++i) + { + static const LONGLONG MILLI_TO_100_NANO = 10000; + LONGLONG duration, time; + DWORD buffer_count; + IMFSample *sample; + BOOL ret; + + ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var); + ok(ret, "Sample %u not received.\n", i + 1); + if (!ret) + break; + + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", var.vt); + sample = (IMFSample *)var.punkVal; + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(duration == 40 * MILLI_TO_100_NANO, "Unexpected duration %s.\n", wine_dbgstr_longlong(duration)); + + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == i * 40 * MILLI_TO_100_NANO, "Unexpected time %s.\n", wine_dbgstr_longlong(time)); + + IMFSample_Release(sample); + } + + if (i == sample_count) + get_event((IMFMediaEventGenerator *)video_stream, MEEndOfStream, NULL); + + hr = IMFMediaStream_RequestSample(video_stream, NULL); + ok(hr == MF_E_END_OF_STREAM, "Unexpected hr %#x.\n", hr); + IMFMediaStream_Release(video_stream); + + get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); + + hr = IMFMediaSource_Shutdown(mediasource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + +skip_source_tests: + + IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); - IMFMediaSource_Release(mediasource); - IMFByteStream_Release(stream); + + refcount = IMFMediaSource_Release(mediasource); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + refcount = IMFByteStream_Release(stream); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Create from URL. */ callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); -- 2.25.0

2 1

[PATCH] include/dxva2api.idl: add function declarations
by Biswapriyo Nath 13 Feb '20

13 Feb '20

1 0

[PATCH] [include] update fields of SYSTEM_TIMEOFDAY_INFORMATION
by Vijay Kiran Kamuju 13 Feb '20

13 Feb '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

include: Add missing defines and fix QUOTA_LIMIT_EX struct
by Vijay Kiran Kamuju 13 Feb '20

13 Feb '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/6] d3d9: Retrieve textures from the primary stateblock.
by Zebediah Figura 13 Feb '20

13 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 21 ++++++++++++++++----- dlls/d3d9/stateblock.c | 6 ++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1ff178881c..cfa1d14cce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2516,6 +2516,7 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; + const struct wined3d_stateblock_state *state; struct d3d9_texture *texture_impl; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -2523,8 +2524,19 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st if (!texture) return D3DERR_INVALIDCALL; + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= ARRAY_SIZE(state->textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + state = wined3d_stateblock_get_state(device->state); + if ((wined3d_texture = state->textures[stage])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture9_iface; @@ -2815,16 +2827,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_texture *texture; - unsigned int i, stage, map; + unsigned int i, map; map = device->auto_mipmaps; while (map) { i = wined3d_bit_scan(&map); - - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((texture = state->textures[i])) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); } } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index dfb8d8d755..a65fa1cd8d 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -116,9 +116,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); struct wined3d_texture *wined3d_texture; - unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; + unsigned int i, offset, stride; enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; @@ -151,9 +151,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) { - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[i]) && (texture = wined3d_texture_get_parent(wined3d_texture)) && texture->usage & D3DUSAGE_AUTOGENMIPMAP) device->auto_mipmaps |= 1u << i; -- 2.25.0

3 19

[PATCH] d2d1: Trim rasterization area when drawing Bézier curves.
by Giovanni Mascellani 13 Feb '20

13 Feb '20

A Bézier stroke can lie outside its "defining triangle" for at most half of the stroke width, not an entire stroke width. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- dlls/d2d1/device.c | 112 ++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0d10ac3e13..0ab6e53f5f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2908,7 +2908,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, v_p = float2(-q_prev.y, q_prev.x); l = -dot(v_p, q_next) / (1.0f + dot(q_prev, q_next)); q_i = l * q_prev + v_p; - p += stroke_width * q_i; + p += 0.5f * stroke_width * q_i; v_p = mul(rt, p2); v_p = normalize(float2(-v_p.y, v_p.x)); @@ -2925,13 +2925,13 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, o.b.y = dot(v_p, p1); } - o.p = mul(float3(position, 1.0f), transform_geometry) + stroke_width * q_i; + o.p = mul(float3(position, 1.0f), transform_geometry) + 0.5f * stroke_width * q_i; position = mul(float2x3(transform_rtx.xyz, transform_rty.xyz), float3(o.p, 1.0f)) * float2(transform_rtx.w, transform_rty.w); o.position = float4(position + float2(-1.0f, 1.0f), 0.0f, 1.0f); } #endif - 0x43425844, 0x7ff88ce9, 0xd75cb064, 0x30396183, 0xca64489b, 0x00000001, 0x00000ae4, 0x00000003, + 0x43425844, 0x356a0c5f, 0x8e4ba153, 0xe52cf793, 0xa6b774ea, 0x00000001, 0x00000afc, 0x00000003, 0x0000002c, 0x000000e4, 0x000001a0, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x000000a1, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x000000a1, 0x00000001, 0x00000000, 0x00000003, 0x00000002, @@ -2944,7 +2944,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, 0x00000001, 0x00000000, 0x00000003, 0x00000003, 0x00000c03, 0x000000a7, 0x00000000, 0x00000001, 0x00000003, 0x00000004, 0x0000000f, 0x4c524f57, 0x4f505f44, 0x49544953, 0x42004e4f, 0x45495a45, 0x54530052, 0x454b4f52, 0x4152545f, 0x4f46534e, 0x53004d52, 0x4f505f56, 0x49544953, 0xab004e4f, - 0x52444853, 0x0000093c, 0x00010040, 0x0000024f, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, + 0x52444853, 0x00000954, 0x00010040, 0x00000255, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005f, 0x00101032, 0x00000000, 0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x00101032, 0x00000002, 0x0300005f, 0x00101032, 0x00000003, 0x0300005f, 0x00101032, 0x00000004, 0x0300005f, 0x00101032, 0x00000005, 0x03000065, 0x00102032, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, @@ -2967,58 +2967,58 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, 0x00000001, 0x00101046, 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, 0x00100012, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x08000010, 0x00100022, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000001, - 0x0a000032, 0x00100032, 0x00000001, 0x00208ff6, 0x00000000, 0x00000001, 0x00100046, 0x00000000, - 0x00100046, 0x00000002, 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000001, 0x0800000f, - 0x00100012, 0x00000002, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000000, 0x0800000f, - 0x00100022, 0x00000002, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000000, 0x0800000f, - 0x00100012, 0x00000003, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000001, 0x0800000f, - 0x00100022, 0x00000003, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000001, 0x08000000, - 0x001000c2, 0x00000000, 0x00100406, 0x00000002, 0x80100406, 0x00000041, 0x00000003, 0x0a000032, - 0x00100032, 0x00000000, 0x00208ff6, 0x00000000, 0x00000001, 0x00100046, 0x00000000, 0x00100ae6, - 0x00000000, 0x0800000f, 0x00100012, 0x00000002, 0x00208046, 0x00000000, 0x00000002, 0x00100046, - 0x00000000, 0x0800000f, 0x00100022, 0x00000002, 0x00208046, 0x00000000, 0x00000003, 0x00100046, - 0x00000000, 0x0800000f, 0x00100012, 0x00000004, 0x00208046, 0x00000000, 0x00000000, 0x00101046, - 0x00000003, 0x0800000f, 0x00100022, 0x00000004, 0x00208046, 0x00000000, 0x00000001, 0x00101046, - 0x00000003, 0x08000000, 0x001000c2, 0x00000002, 0x80100406, 0x00000041, 0x00000003, 0x00100406, - 0x00000004, 0x0800000f, 0x00100082, 0x00000000, 0x00208046, 0x00000000, 0x00000003, 0x00100ae6, - 0x00000002, 0x06000036, 0x00100042, 0x00000003, 0x8010003a, 0x00000041, 0x00000000, 0x0800000f, - 0x00100082, 0x00000003, 0x00208046, 0x00000000, 0x00000002, 0x00100ae6, 0x00000002, 0x0700000f, - 0x00100082, 0x00000000, 0x00100ae6, 0x00000003, 0x00100ae6, 0x00000003, 0x05000044, 0x00100082, - 0x00000000, 0x0010003a, 0x00000000, 0x07000038, 0x001000c2, 0x00000003, 0x00100ff6, 0x00000000, - 0x00100ea6, 0x00000003, 0x0700000f, 0x00100022, 0x00000004, 0x00100046, 0x00000002, 0x00100ae6, - 0x00000003, 0x06000036, 0x00100042, 0x00000000, 0x8010001a, 0x00000041, 0x00000000, 0x0800000f, - 0x00100012, 0x00000002, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000002, 0x0800000f, - 0x00100022, 0x00000002, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000002, 0x08000000, - 0x00100032, 0x00000005, 0x80100046, 0x00000041, 0x00000003, 0x00100046, 0x00000002, 0x06000036, - 0x00100042, 0x00000005, 0x8010001a, 0x00000041, 0x00000005, 0x0700000f, 0x00100022, 0x00000000, - 0x00100a26, 0x00000005, 0x00100ae6, 0x00000002, 0x0d000032, 0x00100032, 0x00000002, 0x80100ae6, - 0x00000041, 0x00000002, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00100046, - 0x00000005, 0x0800000e, 0x00100032, 0x00000000, 0x80100a26, 0x00000041, 0x00000000, 0x00100556, - 0x00000000, 0x0700000f, 0x00100012, 0x00000002, 0x00100046, 0x00000000, 0x00100046, 0x00000002, - 0x0700000f, 0x00100022, 0x00000002, 0x00100046, 0x00000000, 0x00100046, 0x00000005, 0x0800000f, - 0x00100012, 0x00000000, 0x00208046, 0x00000000, 0x00000002, 0x00100046, 0x00000005, 0x0800000f, - 0x00100022, 0x00000000, 0x00208046, 0x00000000, 0x00000003, 0x00100046, 0x00000005, 0x0700000f, - 0x00100012, 0x00000000, 0x00100046, 0x00000000, 0x00100ae6, 0x00000003, 0x07000031, 0x00100022, - 0x00000000, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, 0x07000031, 0x00100042, 0x00000000, - 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x08000031, 0x00100012, 0x00000000, 0x8010000a, - 0x00000081, 0x00000000, 0x00004001, 0x3f800000, 0x0800001e, 0x00100022, 0x00000000, 0x8010001a, - 0x00000041, 0x00000000, 0x0010002a, 0x00000000, 0x0500002b, 0x00100022, 0x00000000, 0x0010001a, - 0x00000000, 0x07000038, 0x001000c2, 0x00000002, 0x00100ea6, 0x00000003, 0x00100556, 0x00000000, - 0x08000036, 0x001000d2, 0x00000004, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x09000037, 0x001020f2, 0x00000001, 0x00100006, 0x00000000, 0x00100e46, 0x00000004, 0x00100e46, - 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000002, 0x06000036, - 0x001000c2, 0x00000000, 0x00208406, 0x00000000, 0x00000003, 0x08000038, 0x001000f2, 0x00000000, - 0x00100e46, 0x00000000, 0x00208ff6, 0x00000000, 0x00000001, 0x0a000038, 0x001000f2, 0x00000000, - 0x00100e46, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x05000036, - 0x00102032, 0x00000002, 0x00100086, 0x00000000, 0x05000036, 0x00102032, 0x00000003, 0x001005d6, - 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, 0x00100012, - 0x00000000, 0x00208246, 0x00000000, 0x00000002, 0x00100246, 0x00000001, 0x08000010, 0x00100022, - 0x00000000, 0x00208246, 0x00000000, 0x00000003, 0x00100246, 0x00000001, 0x08000038, 0x00100022, - 0x00000001, 0x0010001a, 0x00000000, 0x0020803a, 0x00000000, 0x00000003, 0x08000038, 0x00100012, - 0x00000001, 0x0010000a, 0x00000000, 0x0020803a, 0x00000000, 0x00000002, 0x0a000000, 0x00102032, - 0x00000004, 0x00100046, 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, - 0x08000036, 0x001020c2, 0x00000004, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, - 0x0100003e, + 0x08000038, 0x00100042, 0x00000000, 0x0020803a, 0x00000000, 0x00000001, 0x00004001, 0x3f000000, + 0x09000032, 0x00100032, 0x00000001, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, + 0x00000002, 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000001, 0x0800000f, 0x00100012, + 0x00000002, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000000, 0x0800000f, 0x00100022, + 0x00000002, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000000, 0x0800000f, 0x00100012, + 0x00000003, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000001, 0x0800000f, 0x00100022, + 0x00000003, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000001, 0x08000000, 0x00100032, + 0x00000002, 0x00100046, 0x00000002, 0x80100046, 0x00000041, 0x00000003, 0x09000032, 0x00100032, + 0x00000000, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, 0x00000002, 0x0800000f, + 0x00100012, 0x00000002, 0x00208046, 0x00000000, 0x00000002, 0x00100046, 0x00000000, 0x0800000f, + 0x00100022, 0x00000002, 0x00208046, 0x00000000, 0x00000003, 0x00100046, 0x00000000, 0x0800000f, + 0x00100012, 0x00000004, 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000003, 0x0800000f, + 0x00100022, 0x00000004, 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000003, 0x08000000, + 0x001000c2, 0x00000002, 0x80100406, 0x00000041, 0x00000003, 0x00100406, 0x00000004, 0x0800000f, + 0x00100082, 0x00000000, 0x00208046, 0x00000000, 0x00000003, 0x00100ae6, 0x00000002, 0x06000036, + 0x00100042, 0x00000003, 0x8010003a, 0x00000041, 0x00000000, 0x0800000f, 0x00100082, 0x00000003, + 0x00208046, 0x00000000, 0x00000002, 0x00100ae6, 0x00000002, 0x0700000f, 0x00100082, 0x00000000, + 0x00100ae6, 0x00000003, 0x00100ae6, 0x00000003, 0x05000044, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x07000038, 0x001000c2, 0x00000003, 0x00100ff6, 0x00000000, 0x00100ea6, 0x00000003, + 0x0700000f, 0x00100022, 0x00000004, 0x00100046, 0x00000002, 0x00100ae6, 0x00000003, 0x06000036, + 0x00100042, 0x00000000, 0x8010001a, 0x00000041, 0x00000000, 0x0800000f, 0x00100012, 0x00000002, + 0x00208046, 0x00000000, 0x00000000, 0x00101046, 0x00000002, 0x0800000f, 0x00100022, 0x00000002, + 0x00208046, 0x00000000, 0x00000001, 0x00101046, 0x00000002, 0x08000000, 0x00100032, 0x00000005, + 0x80100046, 0x00000041, 0x00000003, 0x00100046, 0x00000002, 0x06000036, 0x00100042, 0x00000005, + 0x8010001a, 0x00000041, 0x00000005, 0x0700000f, 0x00100022, 0x00000000, 0x00100a26, 0x00000005, + 0x00100ae6, 0x00000002, 0x0d000032, 0x00100032, 0x00000002, 0x80100ae6, 0x00000041, 0x00000002, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00100046, 0x00000005, 0x0800000e, + 0x00100032, 0x00000000, 0x80100a26, 0x00000041, 0x00000000, 0x00100556, 0x00000000, 0x0700000f, + 0x00100012, 0x00000002, 0x00100046, 0x00000000, 0x00100046, 0x00000002, 0x0700000f, 0x00100022, + 0x00000002, 0x00100046, 0x00000000, 0x00100046, 0x00000005, 0x0800000f, 0x00100012, 0x00000000, + 0x00208046, 0x00000000, 0x00000002, 0x00100046, 0x00000005, 0x0800000f, 0x00100022, 0x00000000, + 0x00208046, 0x00000000, 0x00000003, 0x00100046, 0x00000005, 0x0700000f, 0x00100012, 0x00000000, + 0x00100046, 0x00000000, 0x00100ae6, 0x00000003, 0x07000031, 0x00100022, 0x00000000, 0x00004001, + 0x00000000, 0x0010000a, 0x00000000, 0x07000031, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x00000000, 0x08000031, 0x00100012, 0x00000000, 0x8010000a, 0x00000081, 0x00000000, + 0x00004001, 0x3f800000, 0x0800001e, 0x00100022, 0x00000000, 0x8010001a, 0x00000041, 0x00000000, + 0x0010002a, 0x00000000, 0x0500002b, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x07000038, + 0x001000c2, 0x00000002, 0x00100ea6, 0x00000003, 0x00100556, 0x00000000, 0x08000036, 0x001000d2, + 0x00000004, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x09000037, 0x001020f2, + 0x00000001, 0x00100006, 0x00000000, 0x00100e46, 0x00000004, 0x00100e46, 0x00000002, 0x06000036, + 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000002, 0x06000036, 0x001000c2, 0x00000000, + 0x00208406, 0x00000000, 0x00000003, 0x08000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00208ff6, 0x00000000, 0x00000001, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x05000036, 0x00102032, 0x00000002, + 0x00100086, 0x00000000, 0x05000036, 0x00102032, 0x00000003, 0x001005d6, 0x00000000, 0x05000036, + 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, 0x00100012, 0x00000000, 0x00208246, + 0x00000000, 0x00000002, 0x00100246, 0x00000001, 0x08000010, 0x00100022, 0x00000000, 0x00208246, + 0x00000000, 0x00000003, 0x00100246, 0x00000001, 0x08000038, 0x00100022, 0x00000001, 0x0010001a, + 0x00000000, 0x0020803a, 0x00000000, 0x00000003, 0x08000038, 0x00100012, 0x00000001, 0x0010000a, + 0x00000000, 0x0020803a, 0x00000000, 0x00000002, 0x0a000000, 0x00102032, 0x00000004, 0x00100046, + 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, + 0x00000004, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; static const DWORD vs_code_triangle[] = { -- 2.25.0

4 4

[PATCH] corecrt_wstdio.h: Add new file and use it instead of duplicating declarations in stdio.h and wchar.h.
by Jacek Caban 13 Feb '20

13 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 123 ++++++++++++++++++++++++++++++++ include/msvcrt/stdio.h | 103 +------------------------- include/msvcrt/wchar.h | 99 +------------------------ 3 files changed, 125 insertions(+), 200 deletions(-) create mode 100644 include/msvcrt/corecrt_wstdio.h

1 0

[PATCH] user32: Fix messages sent on a window without WS_CHILD, but with an invisible parent, when it is shown.
by Gabriel Ivăncescu 13 Feb '20

13 Feb '20

Some applications depend on the fact that WM_WINDOWPOSCHANGING is sent after WM_SHOWWINDOW when SetParent is called, even if the window ends up not visible because its parent is not visible, and occurs when the window itself does not have the WS_CHILD style set. This also fixes a TODO message sequence, so that Wine matches Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40262 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/msg.c | 3 ++- dlls/user32/winpos.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 935e437..7c83d10 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16359,6 +16359,7 @@ static const struct message WmSetParentSeq_2[] = { { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, @@ -16429,7 +16430,7 @@ static void test_SetParent(void) SetParent(popup, child); flush_events(); - ok_sequence(WmSetParentSeq_2, "SetParent() visible WS_POPUP", TRUE); + ok_sequence(WmSetParentSeq_2, "SetParent() visible WS_POPUP", FALSE); ok(GetWindowLongA(popup, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); ok(!IsWindowVisible(popup), "IsWindowVisible() should return FALSE\n"); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b92a20d..0caff03 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1122,8 +1122,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); - parent = GetAncestor( hwnd, GA_PARENT ); - if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) + if ((style & WS_CHILD) && (parent = GetAncestor( hwnd, GA_PARENT )) && + !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) { /* if parent is not visible simply toggle WS_VISIBLE and return */ if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); @@ -1955,8 +1955,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par if (winpos->cy < 0) winpos->cy = 0; else if (winpos->cy > 32767) winpos->cy = 32767; - parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; + if (wndPtr->dwStyle & WS_CHILD) + { + parent = GetAncestor( winpos->hwnd, GA_PARENT ); + if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; + } if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW; else -- 2.21.0

2 1

[PATCH v2 1/3] ntdll/tests: Simplify test_file_name_information().
by Zebediah Figura 13 Feb '20

13 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 133 ++++++++++------------------------------ 1 file changed, 34 insertions(+), 99 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 539ce44e0a4..21889870499 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3146,131 +3146,66 @@ todo_wine static void test_file_name_information(void) { - WCHAR *file_name, *volume_prefix, *expected; - FILE_NAME_INFORMATION *info; + char buffer[300]; + FILE_NAME_INFORMATION *info = (FILE_NAME_INFORMATION *)buffer; ULONG old_redir = 1, tmp; - UINT file_name_size; IO_STATUS_BLOCK io; - UINT info_size; - HRESULT hr; + NTSTATUS status; HANDLE h; - UINT len; - - /* GetVolumePathName is not present before w2k */ - if (!pGetVolumePathNameW) { - win_skip("GetVolumePathNameW not found\n"); - return; - } - - file_name_size = GetSystemDirectoryW( NULL, 0 ); - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - - len = GetSystemDirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemDirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); - - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - /* A bit more than we actually need, but it keeps the calculation simple. */ - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( TRUE, &old_redir ); - h = CreateFileW( file_name, GENERIC_READ, + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( old_redir, &tmp ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); - ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", status); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); - ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", - hr, STATUS_BUFFER_OVERFLOW); - ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", - U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x.\n", status); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); + ok(!wcsnicmp( info->FileName, L"\\w", 2 ), "Got file name %s.\n", debugstr_wn( info->FileName, 2 )); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); - ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), - "info->FileName[1] is %p, expected %p.\n", - CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + ok(!U(io).Status, "Got io.Status %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + ok(!wcsicmp( info->FileName, L"\\windows\\system32" ), "Got file name %s.\n", debugstr_w( info->FileName )); ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, "io.Information is %lu, expected %u.\n", io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - if (old_redir || !pGetSystemWow64DirectoryW || !(file_name_size = pGetSystemWow64DirectoryW( NULL, 0 ))) + if (!old_redir && pGetSystemWow64DirectoryW && pGetSystemWow64DirectoryW( NULL, 0 )) { - skip("Not running on WoW64, skipping test.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - return; - } - - h = CreateFileW( file_name, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); - ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*expected) ); - - len = pGetSystemWow64DirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemWow64DirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); - - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!wcsicmp( info->FileName, L"\\windows\\syswow64" ), "Got file name %s.\n", debugstr_w( info->FileName )); - CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - HeapFree( GetProcessHeap(), 0, file_name ); + CloseHandle( h ); + } + else + skip("Not running on WoW64, skipping test.\n"); } static void test_file_all_name_information(void) -- 2.25.0

3 4

[v3 PATCH] ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage().
by Nikolay Sivov 13 Feb '20

13 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: using COINIT_MULTITHREADED now. v2: simplified decrementing function a bit, fixed leftover ERR() trace. .../api-ms-win-core-com-l1-1-0.spec | 4 +- .../api-ms-win-core-com-l1-1-1.spec | 4 +- dlls/combase/combase.spec | 4 +- dlls/ole32/compobj.c | 67 +++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/tests/compobj.c | 41 ++++++++++++ include/objbase.h | 4 ++ 8 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index bc85dda7fa..eb81d23855 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 9a8f1da3cc..6c3115d600 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 64394f461d..36005929da 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -116,7 +116,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index daa405356f..aeed3b85fa 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -637,6 +637,7 @@ static APARTMENT *apartment_construct(DWORD model) list_init(&apt->proxies); list_init(&apt->stubmgrs); list_init(&apt->loaded_dlls); + list_init(&apt->usage_cookies); apt->ipidc = 0; apt->refs = 1; apt->remunk_exported = FALSE; @@ -5268,6 +5269,72 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +struct mta_cookie +{ + struct list entry; +}; + +/*********************************************************************** + * CoIncrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + struct mta_cookie *mta_cookie; + + TRACE("%p\n", cookie); + + *cookie = NULL; + + if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie)))) + return E_OUTOFMEMORY; + + EnterCriticalSection(&csApartment); + + if (MTA) + apartment_addref(MTA); + else + MTA = apartment_construct(COINIT_MULTITHREADED); + list_add_head(&MTA->usage_cookies, &mta_cookie->entry); + + LeaveCriticalSection(&csApartment); + + *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie; + + return S_OK; +} + +/*********************************************************************** + * CoDecrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; + + TRACE("%p\n", cookie); + + EnterCriticalSection(&csApartment); + + if (MTA) + { + struct mta_cookie *cur; + + LIST_FOR_EACH_ENTRY(cur, &MTA->usage_cookies, struct mta_cookie, entry) + { + if (mta_cookie == cur) + { + list_remove(&cur->entry); + heap_free(cur); + apartment_release(MTA); + break; + } + } + } + + LeaveCriticalSection(&csApartment); + + return S_OK; +} + /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29f94421d1..e151241673 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -151,6 +151,8 @@ struct apartment HWND win; /* message window (LOCK) */ LPMESSAGEFILTER filter; /* message filter (CS cs) */ BOOL main; /* is this a main-threaded-apartment? (RO) */ + /* MTA-only */ + struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */ }; struct init_spy diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eaf0e6b7f4..dd10d65b78 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -47,6 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3404c806b8..7eb25af9e6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -76,6 +76,8 @@ static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNe static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); +static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -3818,6 +3820,8 @@ static void init_funcs(void) pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); + pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); + pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -3916,6 +3920,42 @@ static void test_CoGetCurrentProcess(void) ok(id2 && id2 != id, "Unexpected id from another thread.\n"); } +static void test_mta_usage(void) +{ + CO_MTA_USAGE_COOKIE cookie, cookie2; + HRESULT hr; + + if (!pCoIncrementMTAUsage) + { + win_skip("CoIncrementMTAUsage() is not available.\n"); + return; + } + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + cookie2 = 0; + hr = pCoIncrementMTAUsage(&cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie2 != NULL && cookie2 != cookie, "Unexpected cookie %p.\n", cookie2); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); +} + START_TEST(compobj) { init_funcs(); @@ -3967,6 +4007,7 @@ START_TEST(compobj) test_GlobalOptions(); test_implicit_mta(); test_CoGetCurrentProcess(); + test_mta_usage(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index 0eae397b43..a17cbeb870 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -287,12 +287,16 @@ typedef enum tagCOINIT COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */ } COINIT; +DECLARE_HANDLE(CO_MTA_USAGE_COOKIE); + HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie); +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); -- 2.25.0

3 2

[v2 PATCH] ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage().
by Nikolay Sivov 13 Feb '20

13 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: simplified decrementing function a bit, fixed leftover ERR() trace. .../api-ms-win-core-com-l1-1-0.spec | 4 +- .../api-ms-win-core-com-l1-1-1.spec | 4 +- dlls/combase/combase.spec | 4 +- dlls/ole32/compobj.c | 67 +++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/tests/compobj.c | 41 ++++++++++++ include/objbase.h | 4 ++ 8 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index bc85dda7fa..eb81d23855 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 9a8f1da3cc..6c3115d600 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 64394f461d..36005929da 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -116,7 +116,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index daa405356f..cdb4a8b9a0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -637,6 +637,7 @@ static APARTMENT *apartment_construct(DWORD model) list_init(&apt->proxies); list_init(&apt->stubmgrs); list_init(&apt->loaded_dlls); + list_init(&apt->usage_cookies); apt->ipidc = 0; apt->refs = 1; apt->remunk_exported = FALSE; @@ -5268,6 +5269,72 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +struct mta_cookie +{ + struct list entry; +}; + +/*********************************************************************** + * CoIncrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + struct mta_cookie *mta_cookie; + + TRACE("%p\n", cookie); + + *cookie = NULL; + + if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie)))) + return E_OUTOFMEMORY; + + EnterCriticalSection(&csApartment); + + if (MTA) + apartment_addref(MTA); + else + MTA = apartment_construct(0); + list_add_head(&MTA->usage_cookies, &mta_cookie->entry); + + LeaveCriticalSection(&csApartment); + + *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie; + + return S_OK; +} + +/*********************************************************************** + * CoDecrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; + + TRACE("%p\n", cookie); + + EnterCriticalSection(&csApartment); + + if (MTA) + { + struct mta_cookie *cur; + + LIST_FOR_EACH_ENTRY(cur, &MTA->usage_cookies, struct mta_cookie, entry) + { + if (mta_cookie == cur) + { + list_remove(&cur->entry); + heap_free(cur); + apartment_release(MTA); + break; + } + } + } + + LeaveCriticalSection(&csApartment); + + return S_OK; +} + /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29f94421d1..e151241673 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -151,6 +151,8 @@ struct apartment HWND win; /* message window (LOCK) */ LPMESSAGEFILTER filter; /* message filter (CS cs) */ BOOL main; /* is this a main-threaded-apartment? (RO) */ + /* MTA-only */ + struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */ }; struct init_spy diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eaf0e6b7f4..dd10d65b78 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -47,6 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3404c806b8..7eb25af9e6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -76,6 +76,8 @@ static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNe static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); +static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -3818,6 +3820,8 @@ static void init_funcs(void) pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); + pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); + pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -3916,6 +3920,42 @@ static void test_CoGetCurrentProcess(void) ok(id2 && id2 != id, "Unexpected id from another thread.\n"); } +static void test_mta_usage(void) +{ + CO_MTA_USAGE_COOKIE cookie, cookie2; + HRESULT hr; + + if (!pCoIncrementMTAUsage) + { + win_skip("CoIncrementMTAUsage() is not available.\n"); + return; + } + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + cookie2 = 0; + hr = pCoIncrementMTAUsage(&cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie2 != NULL && cookie2 != cookie, "Unexpected cookie %p.\n", cookie2); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); +} + START_TEST(compobj) { init_funcs(); @@ -3967,6 +4007,7 @@ START_TEST(compobj) test_GlobalOptions(); test_implicit_mta(); test_CoGetCurrentProcess(); + test_mta_usage(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index 0eae397b43..a17cbeb870 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -287,12 +287,16 @@ typedef enum tagCOINIT COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */ } COINIT; +DECLARE_HANDLE(CO_MTA_USAGE_COOKIE); + HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie); +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); -- 2.25.0

2 1

[PATCH v2] tchar.h: Fix some macros.
by Jacek Caban 13 Feb '20

13 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/tchar.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] ntdll: Fill NumberOfPhysicalPages field in user shared data area.
by Paul Gofman 13 Feb '20

13 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48387 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/virtual.c | 14 +++++++++++++- dlls/ntdll/thread.c | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 31eb66c143..683a5e7bdf 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winternl.h" #include "wine/test.h" +#include "ddk/wdm.h" static unsigned int page_size; @@ -33,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static const BOOL is_win64 = sizeof(void*) != sizeof(int); +static SYSTEM_BASIC_INFORMATION sbi; + static HANDLE create_target_process(const char *arg) { char **argv; @@ -513,9 +516,17 @@ static void test_NtMapViewOfSection(void) CloseHandle(process); } +static void test_user_shared_data(void) +{ + const KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + + ok(user_shared_data->NumberOfPhysicalPages == sbi.MmNumberOfPhysicalPages, + "Got number of physical pages %#x, expected %#x.\n", + user_shared_data->NumberOfPhysicalPages, sbi.MmNumberOfPhysicalPages); +} + START_TEST(virtual) { - SYSTEM_BASIC_INFORMATION sbi; HMODULE mod; int argc; @@ -546,4 +557,5 @@ START_TEST(virtual) test_NtAllocateVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); + test_user_shared_data(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f993dd314c..9c9e5f6055 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -222,6 +222,7 @@ static void set_process_name( int argc, char *argv[] ) */ TEB *thread_init(void) { + SYSTEM_BASIC_INFORMATION sbi; TEB *teb; void *addr; SIZE_T size; @@ -310,6 +311,9 @@ TEB *thread_init(void) user_shared_data->TickCountMultiplier = 1 << 24; fill_cpu_info(); + virtual_get_system_info( &sbi ); + user_shared_data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + return teb; } -- 2.24.1

2 3

[v2 PATCH] mfplat/tests: Add more comprehensive media source tests.
by Nikolay Sivov 13 Feb '20

13 Feb '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 135 +++++++++++++++++++++++++++++++++++-- 1 file changed, 130 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67123d0b69..66524f1b48 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -350,25 +350,62 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) +{ + MediaEventType event_type; + HRESULT hr, event_status; + IMFMediaEvent *event; + + hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); + ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + + hr = IMFMediaEvent_GetStatus(event, &event_status); + ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); + ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + + hr = IMFMediaEvent_GetType(event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + + if (event_type != expected_event_type) + { + IMFMediaEvent_Release(event); + return FALSE; + } + + if (value) + { + hr = IMFMediaEvent_GetValue(event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + IMFMediaEvent_Release(event); + + return TRUE; +} + static void test_source_resolver(void) { - static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; struct test_callback callback = { { &test_create_from_url_callback_vtbl } }; struct test_callback callback2 = { { &test_create_from_file_handler_callback_vtbl } }; IMFSourceResolver *resolver, *resolver2; + IMFPresentationDescriptor *descriptor; IMFSchemeHandler *scheme_handler; + IMFMediaStream *video_stream; IMFAttributes *attributes; IMFMediaSource *mediasource; - IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; + IMFMediaType *media_type; BOOL selected, do_uninit; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; WCHAR pathW[MAX_PATH]; - HRESULT hr; + int i, sample_count; WCHAR *filename; + PROPVARIANT var; + HRESULT hr; GUID guid; if (!pMFCreateSourceResolver) @@ -428,7 +465,7 @@ static void test_source_resolver(void) hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); @@ -447,13 +484,101 @@ static void test_source_resolver(void) hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; + + /* Check major/minor type for the test media. */ + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + IMFMediaType_Release(media_type); + + hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); + ok(hr == S_OK, "Failed to select video stream, hr %#x.\n", hr); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); + video_stream = (IMFMediaStream *)var.punkVal; + + get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + + /* Request samples, our file is 10 frames at 25fps */ + get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); + sample_count = 10; + + /* Request one beyond EOS, otherwise EndOfStream isn't queued. */ + for (i = 0; i <= sample_count; ++i) + { + hr = IMFMediaStream_RequestSample(video_stream, NULL); + if (i == sample_count) + break; + ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); + if (hr != S_OK) + break; + } + + for (i = 0; i < sample_count; ++i) + { + static const LONGLONG MILLI_TO_100_NANO = 10000; + LONGLONG duration, time; + DWORD buffer_count; + IMFSample *sample; + BOOL ret; + + ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var); + ok(ret, "Sample %u not received.\n", i + 1); + if (!ret) + break; + + ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", var.vt); + sample = (IMFSample *)var.punkVal; + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(duration == 40 * MILLI_TO_100_NANO, "Unexpected duration %s.\n", wine_dbgstr_longlong(duration)); + + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == i * 40 * MILLI_TO_100_NANO, "Unexpected time %s.\n", wine_dbgstr_longlong(time)); + + IMFSample_Release(sample); + } + + if (i == sample_count) + get_event((IMFMediaEventGenerator *)video_stream, MEEndOfStream, NULL); + + hr = IMFMediaStream_RequestSample(video_stream, NULL); + ok(hr == MF_E_END_OF_STREAM, "Unexpected hr %#x.\n", hr); + IMFMediaStream_Release(video_stream); + + get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); - IMFStreamDescriptor_Release(sd); + + hr = IMFMediaSource_Shutdown(mediasource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + +skip_source_tests: IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); -- 2.25.0

2 1

[tools] testbot/LogUtils: Return the errors in the Parse*() $LogInfo structure.
by Francois Gouget 13 Feb '20

13 Feb '20

This avoids parsing the logs twice: once for the consistency checks and a second time to extract the errors. This also simplifies CreateLogErrorsCache() and allows removing _GetLogErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 284 ++++++++++++---------------- 1 file changed, 118 insertions(+), 166 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2104ffa0e0..383d0b7dfc 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -146,6 +146,40 @@ sub GetLogLineCategory($) } +sub _AddLogGroup($$;$) +{ + my ($LogInfo, $GroupName, $LineNo) = @_; + + # In theory the error group names are all unique. But, just in case, make + # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. + if (!$LogInfo->{ErrGroups}->{$GroupName}) + { + push @{$LogInfo->{ErrGroupNames}}, $GroupName; + $LogInfo->{ErrGroups}->{$GroupName} = { + LineNo => $LineNo || 0, + LineNos => [], + Errors => [] + }; + } + return $LogInfo->{ErrGroups}->{$GroupName}; +} + +sub _AddLogError($$$;$$) +{ + my ($LogInfo, $ErrGroup, $Line, $LineNo, $IsNew) = @_; + + push @{$ErrGroup->{Errors}}, $Line; + push @{$ErrGroup->{LineNos}}, $LineNo || 0; + $LogInfo->{ErrCount}++; + if ($IsNew) + { + my $ErrIndex = @{$ErrGroup->{Errors}} - 1; + $ErrGroup->{IsNew}->[$ErrIndex] = 1; + $ErrGroup->{NewCount}++; + $LogInfo->{NewCount}++; + } +} + =pod =over 12 @@ -167,6 +201,29 @@ have been updated. =item BadLog Contains an error message if the task log could not be read. +=item ErrCount +The number of errors if any. + +=item ErrGroupNames +An array containing the names of all the error groups. + += ErrGroups +A hashtable indexed by the error group name. Each entry contains: + +=over + +=item LineNo +The line number of the start of this error group. Note that this is normally +different from the line of the first error in that group. + +=item Errors +An array containing the error messages. + +=item LineNos +An array containing the line number of the error in the log file. + +=back + =back =back =cut @@ -179,6 +236,9 @@ sub ParseTaskLog($) my $LogInfo = { LogName => $LogName, LogPath => $LogPath, + + ErrGroupNames => [], + ErrGroups => {}, }; my $LogFile; @@ -188,10 +248,20 @@ sub ParseTaskLog($) return $LogInfo; } + my $CurGroup; + my $LineNo = 0; $LogInfo->{Type} = "build"; foreach my $Line (<$LogFile>) { - chomp $Line; + $LineNo++; + $Line =~ s/\s*$//; # chomp \r, \n and more + + if (GetLogLineCategory($Line) eq "error") + { + $CurGroup = _AddLogGroup($LogInfo, "", $LineNo) if (!$CurGroup); + _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + } + if ($Line eq "Task: tests") { $LogInfo->{Type} = "tests"; @@ -410,11 +480,8 @@ The number of test units that timed out. =item Failures The number of failed tests. -=item Extra -An array containing the extra errors detected during the inconsistency check. - -=item BadLog -Contains an error message if the report could not be read. +=item ErrCount, ErrGroupNames, ErrGroups, BadLog +See ParseTaskLog() for details. =back =back @@ -434,6 +501,10 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, Failures => undef, + + ErrGroupNames => [], + ErrGroups => {}, + Extra => [], }; @@ -444,10 +515,32 @@ sub ParseWineTestReport($$$) return $LogInfo; } + my $LineNo = 0; + my $CurGroupName = ""; + my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { + $LineNo++; $Cur->{UnitSize} += length($Line); + $Line =~ s/\s*$//; # chomp \r, \n and more + + if (GetReportLineCategory($Line) eq "error") + { + # Make the timeout messages more user-friendly + if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$CurGroup) + { + $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); + } + _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + } + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -459,6 +552,11 @@ sub ParseWineTestReport($$$) # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); + + # The next error will be in a new error group + $CurGroupName = $Dll; + $CurGroupLineNo = $LineNo; + $CurGroup = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) { @@ -602,6 +700,17 @@ sub ParseWineTestReport($$$) _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); + # Move the extra errors into their own error group + my $ExtraCount = @{$LogInfo->{Extra}}; + if ($ExtraCount) + { + my $CurGroup = _AddLogGroup($LogInfo, "Report validation errors"); + $CurGroup->{Errors} = $LogInfo->{Extra}; + my @LineNos = (0) x $ExtraCount; + $CurGroup->{LineNos} = \@LineNos; + $LogInfo->{ErrCount} += $ExtraCount; + } + return $LogInfo; } @@ -696,149 +805,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } -sub _AddLogGroup($$;$) -{ - my ($LogInfo, $GroupName, $LineNo) = @_; - - # In theory the error group names are all unique. But, just in case, make - # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. - if (!$LogInfo->{ErrGroups}->{$GroupName}) - { - push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { - LineNo => $LineNo || 0, - LineNos => [], - Errors => [] - }; - } - return $LogInfo->{ErrGroups}->{$GroupName}; -} - -sub _AddLogError($$$;$$) -{ - my ($LogInfo, $ErrGroup, $Line, $LineNo, $IsNew) = @_; - - push @{$ErrGroup->{Errors}}, $Line; - push @{$ErrGroup->{LineNos}}, $LineNo || 0; - $LogInfo->{ErrCount}++; - if ($IsNew) - { - my $ErrIndex = @{$ErrGroup->{Errors}} - 1; - $ErrGroup->{IsNew}->[$ErrIndex] = 1; - $ErrGroup->{NewCount}++; - $LogInfo->{NewCount}++; - } -} - -=pod -=over 12 - -=item C<GetLogErrors()> - -Extracts the errors from the specified log file, split by module (for Wine -reports that's per dll / program being tested). - -Returns a hashtable containing: -=over - -=item BadLog -Contains an error message if the log could not be read. - -=item ErrCount -The number of errors. This is undefined if no log file was found. - -=item ErrGroupNames -An array containing the names of all the error groups. - -=item ErrGroups -A hashtable indexed by the error group name. Each entry contains: - -=over - -=item LineNo -The line number of the start of this error group. Note that this is normally -different from the line of the first error in that group. - -=item Errors -An array containing the error messages. - -=item LineNos -An array containing the line number of the error in the log file. - -=back - -=back -=back -=cut - -sub GetLogErrors($) -{ - my ($LogPath) = @_; - - my ($IsReport, $GetCategory); - if ($LogPath =~ /\.report$/) - { - $IsReport = 1; - $GetCategory = \&GetReportLineCategory; - } - else - { - $GetCategory = \&GetLogLineCategory; - } - - my $LogName = basename($LogPath); - my $LogInfo = { - LogName => $LogName, - LogPath => $LogPath, - - ErrCount => undef, # until we open a log - ErrGroupNames => [], - ErrGroups => {}, - }; - if (open(my $LogFile, "<", $LogPath)) - { - $LogInfo->{ErrCount} ||= 0; - my $CurrentModule = ""; - my ($CurrentGroup, $GroupLineNo); - my $LineNo = 0; - foreach my $Line (<$LogFile>) - { - $LineNo++; - $Line =~ s/\s*$//; - if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) - { - $CurrentModule = $1; - $GroupLineNo = $LineNo; - $CurrentGroup = undef; - next; - } - - next if ($GetCategory->($Line) !~ /error/); - - if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - if (!$CurrentGroup) - { - $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule, $GroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); - } - close($LogFile); - } - elsif (-f $LogPath) - { - $LogInfo->{BadLog} = "Could not open '$LogName' for reading: $!"; - my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); - } - - return $LogInfo; -} - - # # Log errors caching [Part 1] # @@ -1079,9 +1045,8 @@ sub _GetLineKey($) # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; - # Note: Only the 'done (258)' lines are reported as errors and they are - # modified by GetLogErrors() so that they no longer contain the pid. - # So there is no need to remove the pid from the done lines. + # Note: The 'done (258)' lines are modified by ParseWineTestReport() and + # no longer contain the pid. So they need no further change here. return $Line; } @@ -1194,20 +1159,7 @@ sub TagNewErrors($$) sub CreateLogErrorsCache($;$) { - my ($ParsedInfo, $Task) = @_; - - my $LogInfo = GetLogErrors($ParsedInfo->{LogPath}); - - # Store ParseWineTestReport()'s extra errors into their own group - my $ExtraCount = $ParsedInfo->{Extra} ? @{$ParsedInfo->{Extra}} : 0; - if ($ExtraCount) - { - my $Group = _AddLogGroup($LogInfo, "Report validation errors"); - $Group->{Errors} = $ParsedInfo->{Extra}; - my @LineNos = (0) x $ExtraCount; - $Group->{LineNos} = \@LineNos; - $LogInfo->{ErrCount} += $ExtraCount; - } + my ($LogInfo, $Task) = @_; return $LogInfo->{BadLog} if (defined $LogInfo->{BadLog}); -- 2.20.1

1 0

[tools] testbot: Show the right filename in LoadLogErrors()'s BadLog message.
by Francois Gouget 13 Feb '20

13 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 383d0b7dfc..9f0f31307e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -840,7 +840,7 @@ sub LoadLogErrors($) my $ErrorsFile; if (!open($ErrorsFile, "<", $LogPath)) { - $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + $LogInfo->{BadLog} = "Unable to open '$LogName.errors' for reading: $!"; return $LogInfo; } -- 2.20.1

1 0

[PATCH] wtypes.idl: Support OLESTR macro with non-native wchar_t.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wtypes.idl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH] tchar.h: Fix some macros.
by Jacek Caban 13 Feb '20

13 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/tchar.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH] tchar.h: Allow using header without msvcrt.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> It's useful for _T macro and TCHAR typedef. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/tchar.h | 4 ---- 1 file changed, 4 deletions(-)

1 0

[PATCH] basetyps.h: Don't typedef wchar_t for C++.
by Jacek Caban 13 Feb '20

13 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> This matches corecrt.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/basetyps.h | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH] include/iads.idl: Remove duplicate interface definition.
by Dmitry Timoshkov 13 Feb '20

13 Feb '20

Otherwise widl fails to create a typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/iads.idl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/iads.idl b/include/iads.idl index add52571c7..8553a03d8c 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -855,8 +855,7 @@ interface IADsADSystemInfo : IDispatch ] coclass ADSystemInfo { - [default] interface IADsADSystemInfo; - interface IDispatch; + interface IADsADSystemInfo; } } /* library */ -- 2.20.1

1 0

[PATCH] po: Update LIthuanian translation
by Aurimas Fišeras 13 Feb '20

13 Feb '20

1 0

[PATCH 3/3] adsldp/tests: Add some tests for LDAPNamespace.
by Dmitry Timoshkov 13 Feb '20

13 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/Makefile.in | 1 + dlls/adsldp/tests/ldap.c | 81 +++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/sysinfo.c | 2 + 3 files changed, 84 insertions(+) create mode 100644 dlls/adsldp/tests/ldap.c diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 777d2aa9de..52141139d5 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = adsldp.dll IMPORTS = ole32 oleaut32 secur32 advapi32 uuid C_SRCS = \ + ldap.c \ sysinfo.c diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c new file mode 100644 index 0000000000..e2ce9ee1a2 --- /dev/null +++ b/dlls/adsldp/tests/ldap.c @@ -0,0 +1,81 @@ +/* + * LDAPNamespace Tests + * + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +static void test_LDAP(void) +{ + HRESULT hr; + IUnknown *unk; + IADs *ads; + IADsOpenDSObject *ads_open; + IDispatch *disp; + BSTR path; + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); + ok(hr == S_OK, "got %#x\n", hr); + IADs_Release(ads); + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(disp); + + hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); + ok(hr == S_OK, "got %#x\n", hr); + IADsOpenDSObject_Release(ads_open); + + path = SysAllocString(L"LDAP:"); + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + SysFreeString(path); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + IDispatch_Release(disp); + + IUnknown_Release(unk); +} + +START_TEST(ldap) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_LDAP(); + + CoUninitialize(); +} diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index f2fc92a1b2..c7495dcb88 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -210,4 +210,6 @@ START_TEST(sysinfo) test_ComputerName(); test_UserName(); test_sysinfo(); + + CoUninitialize(); } -- 2.20.1

2 1

[PATCH] tzres: Add Haiti Time Zone.
by Daniel Lehman 13 Feb '20

13 Feb '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> using time zone name from: https://github.com/unicode-org/cldr/blob/master/common/supplemental/windows… using time zone information from: https://github.com/eggert/tz/blob/master/northamerica the IDs come from a formula from Akihiro Sagawa. The last 3 digits of the sha1sum of the Standard name is shifted and converted to decimal. Condensed here to: $ sha=$(echo -n "Haiti Standard Time" | sha1sum) && echo $(("0x${sha:37:3}" << 4)) 2896 Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index afb33bc9b8..cc9ce064b7 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -112,6 +112,8 @@ STRINGTABLE 47169 "Greenwich Daylight Time" 24192 "GTB Standard Time" 24193 "GTB Daylight Time" + 2896 "Haiti Standard Time" + 2897 "Haiti Daylight Time" 53376 "Hawaiian Standard Time" 53377 "Hawaiian Daylight Time" 22400 "India Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 69e6e7f81e..360064d30a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3141,6 +3141,28 @@ HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Dlt",,"@tzres.dll,-241 HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Std",,"@tzres.dll,-24192" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Std",,"GTB Standard Time" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Display",,"America/Port-au-Prince" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Dlt",,"Haiti Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Dlt",,"@tzres.dll,-2897" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Std",,"@tzres.dll,-2896" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Std",,"Haiti Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2014",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2017",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Display",,"Pacific/Honolulu" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Dlt",,"Hawaiian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Dlt",,"@tzres.dll,-53377" -- 2.17.1

1 0

[PATCH] setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT.
by Alistair Leslie-Hughes 13 Feb '20

13 Feb '20

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36059 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/setupapi/queue.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index aa59adf967..eebfe97154 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1117,7 +1117,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, } } if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE | - SP_COPY_IN_USE_NEEDS_REBOOT | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) + SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) { ERR("Unsupported style(s) 0x%x\n",style); } @@ -1125,6 +1125,22 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (docopy) { rc = CopyFileW(source,target,FALSE); + if (!rc && GetLastError() == ERROR_SHARING_VIOLATION && + (style & SP_COPY_IN_USE_NEEDS_REBOOT)) + { + WCHAR temp_file[MAX_PATH]; + WCHAR temp[MAX_PATH]; + + if (GetTempPathW(MAX_PATH, temp) && + GetTempFileNameW(temp, L"SET", 0, temp_file)) + { + rc = CopyFileW(source, temp_file, FALSE); + if (rc) + rc = MoveFileExW(temp_file, target, MOVEFILE_DELAY_UNTIL_REBOOT); + else + DeleteFileW(temp_file); + } + } if (!rc) WARN( "failed to copy, err %u\n", GetLastError() ); } else -- 2.17.1

1 0

[PATCH 2/3] adsldp: Add IADsOpenDSObject stubs.
by Dmitry Timoshkov 13 Feb '20

13 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7686da9a3c..7281375e91 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -258,6 +258,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) typedef struct { IADs IADs_iface; + IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; } LDAP_namespace; @@ -268,6 +269,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface) static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IADs(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -281,6 +284,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IADsOpenDSObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IADsOpenDSObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -434,6 +444,97 @@ static const IADsVtbl IADs_vtbl = ldapns_GetInfoEx }; +static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface); +} + +static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsOpenDSObject) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsOpenDSObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, + LONG reserved, IDispatch **obj) +{ + FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), + reserved, obj); + return E_NOTIMPL; +} + +static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = +{ + openobj_QueryInterface, + openobj_AddRef, + openobj_Release, + openobj_GetTypeInfoCount, + openobj_GetTypeInfo, + openobj_GetIDsOfNames, + openobj_Invoke, + openobj_OpenDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -443,6 +544,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) if (!ldap) return E_OUTOFMEMORY; ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); -- 2.20.1

1 0

[PATCH v2 1/3] adsldp: Add LDAPNamespace stubs.
by Dmitry Timoshkov 13 Feb '20

13 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 2 + dlls/adsldp/adsldp.c | 294 ++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 8 ++ dlls/adsldp/adsldp.rgs | 16 +++ dlls/adsldp/rsrc.rc | 20 +++ 5 files changed, 315 insertions(+), 25 deletions(-) create mode 100644 dlls/adsldp/adsldp.rgs create mode 100644 dlls/adsldp/rsrc.rc diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 4dce14fd0d..6d760c8682 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ IDL_SRCS = \ adsldp.idl + +RC_SRCS = rsrc.rc diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4fc0de41eb..7686da9a3c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -31,10 +31,13 @@ #define SECURITY_WIN32 #include "security.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + static HMODULE adsldp_hinst; typedef struct @@ -81,7 +84,7 @@ static ULONG WINAPI sysinfo_Release(IADsADSystemInfo *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, sysinfo); + heap_free(sysinfo); } return ref; @@ -235,31 +238,239 @@ static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl = sysinfo_GetTrees }; -static HRESULT ADSystemInfo_create(void **obj) +static HRESULT ADSystemInfo_create(REFIID riid, void **obj) { AD_sysinfo *sysinfo; + HRESULT hr; - sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo)); + sysinfo = heap_alloc(sizeof(*sysinfo)); if (!sysinfo) return E_OUTOFMEMORY; sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl; sysinfo->ref = 1; - *obj = &sysinfo->IADsADSystemInfo_iface; - TRACE("created %p\n", *obj); + hr = IADsADSystemInfo_QueryInterface(&sysinfo->IADsADSystemInfo_iface, riid, obj); + IADsADSystemInfo_Release(&sysinfo->IADsADSystemInfo_iface); - return S_OK; + return hr; +} + +typedef struct +{ + IADs IADs_iface; + LONG ref; +} LDAP_namespace; + +static inline LDAP_namespace *impl_from_IADs(IADs *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface); +} + +static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IADs)) + { + IADs_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ldapns_AddRef(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI ldapns_Release(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(ldap); + } + + return ref; +} + +static HRESULT WINAPI ldapns_GetTypeInfoCount(IADs *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetTypeInfo(IADs *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetIDsOfNames(IADs *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Invoke(IADs *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Name(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Class(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_GUID(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_ADsPath(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; } +static HRESULT WINAPI ldapns_get_Parent(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_SetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop) +{ + FIXME("%p,%s,%s: stub\n", iface, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetEx(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT prop) +{ + FIXME("%p,%d,%s,%s: stub\n", iface, code, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) +{ + FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); + return E_NOTIMPL; +} + +static const IADsVtbl IADs_vtbl = +{ + ldapns_QueryInterface, + ldapns_AddRef, + ldapns_Release, + ldapns_GetTypeInfoCount, + ldapns_GetTypeInfo, + ldapns_GetIDsOfNames, + ldapns_Invoke, + ldapns_get_Name, + ldapns_get_Class, + ldapns_get_GUID, + ldapns_get_ADsPath, + ldapns_get_Parent, + ldapns_get_Schema, + ldapns_GetInfo, + ldapns_SetInfo, + ldapns_Get, + ldapns_Put, + ldapns_GetEx, + ldapns_PutEx, + ldapns_GetInfoEx +}; + +static HRESULT LDAPNamespace_create(REFIID riid, void **obj) +{ + LDAP_namespace *ldap; + HRESULT hr; + + ldap = heap_alloc(sizeof(*ldap)); + if (!ldap) return E_OUTOFMEMORY; + + ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->ref = 1; + + hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); + IADs_Release(&ldap->IADs_iface); + + return hr; +} + +static const struct class_info +{ + const CLSID *clsid; + HRESULT (*constructor)(REFIID, void **); +} class_info[] = +{ + { &CLSID_ADSystemInfo, ADSystemInfo_create }, + { &CLSID_LDAPNamespace, LDAPNamespace_create }, +}; + typedef struct { IClassFactory IClassFactory_iface; - HRESULT (*constructor)(void **); -} ADSystemInfo_factory; + LONG ref; + const struct class_info *info; +} class_factory; -static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface) +static inline class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface); + return CONTAINING_RECORD(iface, class_factory, IClassFactory_iface); } static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) @@ -283,19 +494,30 @@ static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, static ULONG WINAPI factory_AddRef(IClassFactory *iface) { - return 2; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + return ref; } static ULONG WINAPI factory_Release(IClassFactory *iface) { - return 1; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + if (!ref) + heap_free(factory); + + return ref; } static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - ADSystemInfo_factory *factory = impl_from_IClassFactory(iface); - IUnknown *unknown; - HRESULT hr; + class_factory *factory = impl_from_IClassFactory(iface); TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); @@ -304,13 +526,7 @@ static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *out *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->constructor((void **)&unknown); - if (hr == S_OK) - { - hr = IUnknown_QueryInterface(unknown, riid, obj); - IUnknown_Release(unknown); - } - return hr; + return factory->info->constructor(riid, obj); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) @@ -328,18 +544,46 @@ static const struct IClassFactoryVtbl factory_vtbl = factory_LockServer }; -static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create }; +static HRESULT factory_constructor(const struct class_info *info, REFIID riid, void **obj) +{ + class_factory *factory; + HRESULT hr; + + factory = heap_alloc(sizeof(*factory)); + if (!factory) return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &factory_vtbl; + factory->ref = 1; + factory->info = info; + + hr = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, obj); + IClassFactory_Release(&factory->IClassFactory_iface); + + return hr; +} HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { + const struct class_info *info = NULL; + int i; + TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); if (!clsid || !iid || !obj) return E_INVALIDARG; *obj = NULL; - if (IsEqualGUID(clsid, &CLSID_ADSystemInfo)) - return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj); + for (i = 0; i < ARRAY_SIZE(class_info); i++) + { + if (IsEqualCLSID(class_info[i].clsid, clsid)) + { + info = &class_info[i]; + break; + } + } + + if (info) + return factory_constructor(info, iid, obj); FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl index c2f7504d0c..b9549419e2 100644 --- a/dlls/adsldp/adsldp.idl +++ b/dlls/adsldp/adsldp.idl @@ -20,6 +20,14 @@ #pragma makedep register +[ + helpstring("LDAP Namespace Object"), + progid("LDAPNamespace"), + uuid(228d9a82-c302-11cf-9aa4-00aa004a5691), + threading(both) +] +coclass ADs { } + [ helpstring("AD System Info Object"), uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), diff --git a/dlls/adsldp/adsldp.rgs b/dlls/adsldp/adsldp.rgs new file mode 100644 index 0000000000..0da0946832 --- /dev/null +++ b/dlls/adsldp/adsldp.rgs @@ -0,0 +1,16 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove ADs + { + NoRemove Providers + { + ForceRemove 'LDAP' = s 'LDAPNamespace' + } + } + } + } +} diff --git a/dlls/adsldp/rsrc.rc b/dlls/adsldp/rsrc.rc new file mode 100644 index 0000000000..914fe0b2f3 --- /dev/null +++ b/dlls/adsldp/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: adsldp.rgs */ +1 WINE_REGISTRY adsldp.rgs -- 2.20.1

1 0

[PATCH 3/5] adsldp: Add LDAPNamespace stubs.
by Dmitry Timoshkov 12 Feb '20

12 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 5 +- dlls/adsldp/adsldp.c | 295 ++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 9 ++ dlls/adsldp/adsldp.rgs | 16 +++ dlls/adsldp/rsrc.rc | 20 +++ 5 files changed, 319 insertions(+), 26 deletions(-) create mode 100644 dlls/adsldp/adsldp.rgs create mode 100644 dlls/adsldp/rsrc.rc diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 4dce14fd0d..7bf07fce2c 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,10 +1,13 @@ MODULE = adsldp.dll -IMPORTS = oleaut32 secur32 +IMPORTS = oleaut32 secur32 rpcrt4 EXTRADLLFLAGS = -mno-cygwin +dlldata_EXTRADEFS = -DENTRY_PREFIX=ADSLDP_ C_SRCS = \ adsldp.c IDL_SRCS = \ adsldp.idl + +RC_SRCS = rsrc.rc diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4fc0de41eb..ef62aad279 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -31,10 +31,15 @@ #define SECURITY_WIN32 #include "security.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +extern HRESULT WINAPI ADSLDP_DllGetClassObject(REFCLSID,REFIID,void **) DECLSPEC_HIDDEN; + static HMODULE adsldp_hinst; typedef struct @@ -235,31 +240,239 @@ static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl = sysinfo_GetTrees }; -static HRESULT ADSystemInfo_create(void **obj) +static HRESULT ADSystemInfo_create(REFIID riid, void **obj) { AD_sysinfo *sysinfo; + HRESULT hr; sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo)); if (!sysinfo) return E_OUTOFMEMORY; sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl; sysinfo->ref = 1; - *obj = &sysinfo->IADsADSystemInfo_iface; - TRACE("created %p\n", *obj); + hr = IADsADSystemInfo_QueryInterface(&sysinfo->IADsADSystemInfo_iface, riid, obj); + IADsADSystemInfo_Release(&sysinfo->IADsADSystemInfo_iface); - return S_OK; + return hr; } +typedef struct +{ + IADs IADs_iface; + LONG ref; +} LDAP_namespace; + +static inline LDAP_namespace *impl_from_IADs(IADs *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface); +} + +static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IADs)) + { + IADs_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ldapns_AddRef(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI ldapns_Release(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI ldapns_GetTypeInfoCount(IADs *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetTypeInfo(IADs *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetIDsOfNames(IADs *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Invoke(IADs *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Name(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Class(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_GUID(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_ADsPath(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Parent(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_SetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop) +{ + FIXME("%p,%s,%s: stub\n", iface, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetEx(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT prop) +{ + FIXME("%p,%d,%s,%s: stub\n", iface, code, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) +{ + FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); + return E_NOTIMPL; +} + +static const IADsVtbl IADs_vtbl = +{ + ldapns_QueryInterface, + ldapns_AddRef, + ldapns_Release, + ldapns_GetTypeInfoCount, + ldapns_GetTypeInfo, + ldapns_GetIDsOfNames, + ldapns_Invoke, + ldapns_get_Name, + ldapns_get_Class, + ldapns_get_GUID, + ldapns_get_ADsPath, + ldapns_get_Parent, + ldapns_get_Schema, + ldapns_GetInfo, + ldapns_SetInfo, + ldapns_Get, + ldapns_Put, + ldapns_GetEx, + ldapns_PutEx, + ldapns_GetInfoEx +}; + +static HRESULT LDAPNamespace_create(REFIID riid, void **obj) +{ + LDAP_namespace *ldap; + HRESULT hr; + + ldap = heap_alloc(sizeof(*ldap)); + if (!ldap) return E_OUTOFMEMORY; + + ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->ref = 1; + + hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); + IADs_Release(&ldap->IADs_iface); + + return hr; +} + +static const struct class_info +{ + const CLSID *clsid; + HRESULT (*constructor)(REFIID, void **); +} class_info[] = +{ + { &CLSID_ADSystemInfo, ADSystemInfo_create }, + { &CLSID_LDAPNamespace, LDAPNamespace_create }, +}; + typedef struct { IClassFactory IClassFactory_iface; - HRESULT (*constructor)(void **); -} ADSystemInfo_factory; + LONG ref; + const struct class_info *info; +} class_factory; -static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface) +static inline class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface); + return CONTAINING_RECORD(iface, class_factory, IClassFactory_iface); } static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) @@ -283,19 +496,30 @@ static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, static ULONG WINAPI factory_AddRef(IClassFactory *iface) { - return 2; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + return ref; } static ULONG WINAPI factory_Release(IClassFactory *iface) { - return 1; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + if (!ref) + heap_free(factory); + + return ref; } static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - ADSystemInfo_factory *factory = impl_from_IClassFactory(iface); - IUnknown *unknown; - HRESULT hr; + class_factory *factory = impl_from_IClassFactory(iface); TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); @@ -304,13 +528,7 @@ static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *out *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->constructor((void **)&unknown); - if (hr == S_OK) - { - hr = IUnknown_QueryInterface(unknown, riid, obj); - IUnknown_Release(unknown); - } - return hr; + return factory->info->constructor(riid, obj); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) @@ -328,21 +546,48 @@ static const struct IClassFactoryVtbl factory_vtbl = factory_LockServer }; -static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create }; +static HRESULT factory_constructor(const struct class_info *info, REFIID riid, void **obj) +{ + class_factory *factory; + HRESULT hr; + + factory = heap_alloc(sizeof(*factory)); + if (!factory) return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &factory_vtbl; + factory->ref = 1; + factory->info = info; + + hr = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, obj); + IClassFactory_Release(&factory->IClassFactory_iface); + + return hr; +} HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { + const struct class_info *info = NULL; + int i; + TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); if (!clsid || !iid || !obj) return E_INVALIDARG; *obj = NULL; - if (IsEqualGUID(clsid, &CLSID_ADSystemInfo)) - return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj); + for (i = 0; i < ARRAY_SIZE(class_info); i++) + { + if (IsEqualCLSID(class_info[i].clsid, clsid)) + { + info = &class_info[i]; + break; + } + } + + if (info) + return factory_constructor(info, iid, obj); - FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); - return CLASS_E_CLASSNOTAVAILABLE; + return ADSLDP_DllGetClassObject(clsid, iid, obj); } HRESULT WINAPI DllCanUnloadNow(void) diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl index c2f7504d0c..634aa36327 100644 --- a/dlls/adsldp/adsldp.idl +++ b/dlls/adsldp/adsldp.idl @@ -18,8 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register +[ + helpstring("LDAP Namespace Object"), + progid("LDAPNamespace"), + uuid(228d9a82-c302-11cf-9aa4-00aa004a5691), + threading(both) +] +coclass ADs { } + [ helpstring("AD System Info Object"), uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), diff --git a/dlls/adsldp/adsldp.rgs b/dlls/adsldp/adsldp.rgs new file mode 100644 index 0000000000..0da0946832 --- /dev/null +++ b/dlls/adsldp/adsldp.rgs @@ -0,0 +1,16 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove ADs + { + NoRemove Providers + { + ForceRemove 'LDAP' = s 'LDAPNamespace' + } + } + } + } +} diff --git a/dlls/adsldp/rsrc.rc b/dlls/adsldp/rsrc.rc new file mode 100644 index 0000000000..914fe0b2f3 --- /dev/null +++ b/dlls/adsldp/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: adsldp.rgs */ +1 WINE_REGISTRY adsldp.rgs -- 2.20.1

3 2

[PATCH] Make LocalFirst() and LocalNext() return correct handles, addresses, flags and lock values for moveable blocks. Previous implementation just returned the arena block pointer and flags for fixed blocks. Needed for applications that use toolhelp to find their own memory blocks.
by Dirk Niggemann 12 Feb '20

12 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48523 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/toolhelp.dll16/toolhelp.c | 86 ++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index f2b520b6a1..42d8474719 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -90,6 +90,30 @@ typedef struct #define LOCAL_ARENA_HEADER( handle) ((handle) - LOCAL_ARENA_HEADER_SIZE) #define LOCAL_ARENA_PTR(ptr,arena) ((LOCALARENA *)((char *)(ptr)+(arena))) +#ifdef ALLOW_UNALIGNED_ACCESS +# define MOVEABLE_PREFIX sizeof(HLOCAL16) +#else +# define MOVEABLE_PREFIX sizeof(int) +#endif + +/* Layout of a handle entry table + * + * WORD count of entries + * LOCALHANDLEENTRY[count] entries + * WORD near ptr to next table + */ +typedef struct +{ + WORD addr; /* Address of the MOVEABLE block */ + BYTE flags; /* Flags for this block */ + BYTE lock; /* Lock count */ +} LOCALHANDLEENTRY; + + +#define HANDLE_FIXED(handle) (((handle) & 3) == 0) +#define HANDLE_MOVEABLE(handle) (((handle) & 3) == 2) + + typedef struct { WORD null; /* Always 0 */ @@ -326,12 +350,33 @@ BOOL16 WINAPI LocalFirst16( LOCALENTRY *pLocalEntry, HGLOBAL16 handle ) WORD ds = GlobalHandleToSel16( handle ); char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALHEAPINFO *pInfo = get_local_heap( ds ); - if (!pInfo) return FALSE; + WORD table, lhandle; - pLocalEntry->hHandle = pInfo->first + LOCAL_ARENA_HEADER_SIZE; - pLocalEntry->wAddress = pLocalEntry->hHandle; - pLocalEntry->wFlags = LF_FIXED; - pLocalEntry->wcLock = 0; + if (!pInfo) return FALSE; + table = pInfo->htable; + pLocalEntry->wAddress = pInfo->first + LOCAL_ARENA_HEADER_SIZE; + lhandle = pLocalEntry->wAddress; + pLocalEntry->wFlags = LF_FIXED; + pLocalEntry->wcLock = 0; + /* Find the address in the moveable entry tables */ + while (table) + { + WORD count = *(WORD *)(ptr + table); + LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY*)(ptr+table+sizeof(WORD)); + for (; count > 0; count--, pEntry++) + if (pEntry->addr == lhandle + MOVEABLE_PREFIX) + { + lhandle = (HLOCAL16)((char *)pEntry - ptr); + table = 0; + pLocalEntry->wAddress = pEntry->addr; + pLocalEntry->wFlags = pEntry->flags; + pLocalEntry->wcLock = pEntry->lock; + TRACE("moveable handle %04x\n", lhandle); + break; + } + if ( table ) table = *(WORD *)pEntry; + } + pLocalEntry->hHandle = lhandle; pLocalEntry->wType = LT_NORMAL; pLocalEntry->hHeap = handle; pLocalEntry->wHeapType = NORMAL_HEAP; @@ -349,15 +394,36 @@ BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry ) WORD ds = GlobalHandleToSel16( pLocalEntry->hHeap ); char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALARENA *pArena; + WORD table, lhandle; + LOCALHEAPINFO *pInfo = get_local_heap( ds ); - if (!get_local_heap( ds )) return FALSE; - if (!pLocalEntry->wNext) return FALSE; + if ( !pInfo ) return FALSE; + if ( !pLocalEntry->wNext ) return FALSE; + table = pInfo->htable; pArena = LOCAL_ARENA_PTR( ptr, pLocalEntry->wNext ); - - pLocalEntry->hHandle = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; - pLocalEntry->wAddress = pLocalEntry->hHandle; + pLocalEntry->wAddress = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; + lhandle = pLocalEntry->wAddress; pLocalEntry->wFlags = (pArena->prev & 3) + 1; pLocalEntry->wcLock = 0; + /* Find the address in the entry tables */ + while (table) + { + WORD count = *(WORD *)(ptr + table); + LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY*)(ptr+table+sizeof(WORD)); + for (; count > 0; count--, pEntry++) + if (pEntry->addr == lhandle + MOVEABLE_PREFIX) + { + lhandle = (HLOCAL16)((char *)pEntry - ptr); + table = 0; + pLocalEntry->wAddress = pEntry->addr; + pLocalEntry->wFlags = pEntry->flags; + pLocalEntry->wcLock = pEntry->lock; + TRACE("moveable handle %04x\n", lhandle); + break; + } + if ( table ) table = *(WORD *)pEntry; + } + pLocalEntry->hHandle = lhandle; pLocalEntry->wType = LT_NORMAL; if (pArena->next != pLocalEntry->wNext) /* last one? */ pLocalEntry->wNext = pArena->next; -- 2.17.2 (Apple Git-113)

2 1

[PATCH 1/2] kernel32/tests: Add tests for LCMapStringW
by Fabian Maurer 12 Feb '20

12 Feb '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/locale.c | 182 +++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9ed8fb82e2..7deb82c92b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2708,6 +2708,187 @@ static INT LCMapStringEx_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR ds return pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, flags, src, srclen, dst, dstlen, NULL, NULL, 0); } +BYTE sortkey_results_win7_default[] = { 14, 2, 14, 9, 14, 10, 170, 133, 2, 14, 2, 1, 2, 2, 2, 14, 1, 2, 2, 2, 2, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_type1[] = { 1, 214, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_symbols1[] = { 14, 2, 14, 9, 7, 47, 8, 28, 9, 56, 10, 130, 11, 57, 12, 165, 14, 167, 14, 169, 1, 2, 2, 2, 21, 102, 2, 21, 1, 2, 2, 3, 1, 1, 0 }; +BYTE sortkey_results_win7_symbols2[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_punctuation1[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 255, 253, 131, 20, 255, 253, 132, 170, 0 }; +BYTE sortkey_results_win7_punctuation2[] = { 14, 2, 14, 9, 6, 131, 6, 132, 14, 167, 14, 169, 1, 2, 2, 2, 21, 1, 2, 2, 4, 1, 1, 0 }; +BYTE sortkey_results_win7_punctuation3[] = { 14, 2, 14, 9, 14, 167, 14, 169, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_type5[] = { 253, 255, 168, 110, 16, 201, 14, 2, 1, 2, 68, 1, 2, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_jamo[] = { 220, 63, 16, 201, 14, 2, 1, 2, 68, 1, 4, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese1[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese2[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese3[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 228, 228, 196, 255, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese4[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 2, 2, 2, 2, 2, 2, 238, 2, 68, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 196, 196, 198, 198, 196, 255, 2, 196, 196, 196, 196, 196, 196, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese5[] = { 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 34, 62, 14, 2, 16, 201, 14, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 18, 18, 18, 1, 255, 2, 196, 196, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special1[] = { 255, 255, 255, 255, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special2[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special3[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special4[] = { 34, 2, 14, 2, 14, 2, 1, 1, 1, 196, 255, 2, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special5[] = { 255, 255, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special6[] = { 34, 2, 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special7[] = { 34, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 5, 5, 2, 196, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special8[] = { 34, 2, 14, 2, 14, 2, 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special9[] = { 34, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 5, 2, 196, 196, 196, 255, 196, 197, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special10[] = { 34, 2, 14, 2, 34, 2, 34, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special11[] = { 34, 2, 14, 2, 34, 2, 34, 2, 14, 2, 14, 2, 1, 1, 1, 196, 196, 196, 255, 3, 3, 5, 2, 196, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special12[] = { 34, 13, 34, 5, 1, 1, 1, 255, 3, 5, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special13[] = { 34, 74, 34, 74, 1, 1, 1, 255, 2, 196, 196, 255, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special14[] = { 34, 58, 34, 58, 1, 1, 1, 196, 196, 255, 3, 4, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special15[] = { 14, 2, 14, 2, 14, 2, 34, 2, 34, 2, 34, 2, 14, 2, 13, 3, 13, 25, 13, 29, 14, 2, 13, 3, 13, 25, 13, 29, 13, 29, 13, 29, 14, 2, 34, 2, 34, 2, 1, 2, 2, 2, 2, 2, 7, 1, 1, 196, 196, 196, 196, 196, 255, 3, 3, 4, 3, 5, 2, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special16[] = { 34, 44, 14, 53, 14, 53, 34, 74, 34, 52, 34, 52, 34, 52, 14, 9, 34, 78, 34, 50, 14, 138, 14, 138, 14, 145, 34, 78, 34, 6, 34, 6, 14, 112, 34, 6, 34, 38, 14, 159, 1, 238, 2, 7, 2, 2, 3, 2, 2, 3, 2, 2, 2, 2, 2, 2, 5, 2, 2, 238, 1, 1, 198, 198, 196, 196, 196, 255, 3, 3, 3, 4, 4, 3, 3, 3, 3, 4, 2, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 197, 196, 197, 197, 197, 197, 196, 197, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special17[] = { 34, 44, 14, 53, 14, 53, 34, 74, 34, 52, 34, 52, 34, 52, 14, 9, 34, 78, 34, 50, 14, 138, 14, 138, 14, 145, 34, 78, 34, 6, 34, 6, 14, 112, 34, 6, 34, 38, 14, 159, 1, 1, 1, 255, 2, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_missing_characters[] = { 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_expansion1[] = { 14, 2, 14, 33, 1, 1, 18, 18, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility1[] = { 1, 12, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_expansion2[] = { 14, 2, 7, 83, 1, 0, 41, 110, 41, 167, 41, 212, 1, 14, 2, 12, 1, 2, 2, 0, 2, 2, 5, 1, 1, 0 }; +BYTE sortkey_results_win7_null_character[] = { 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_missing_characters1[] = { 253, 255, 128, 119, 5, 128, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_expansion1[] = { 253, 255, 128, 119, 41, 32, 41, 65, 255, 255, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_unsortable[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_missing_characters2[] = { 34, 2, 34, 2, 1, 1, 1, 196, 196, 255, 3, 5, 2, 196, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_with_expansion2[] = { 34, 2, 14, 2, 14, 33, 255, 255, 1, 1, 2, 18, 18, 1, 196, 255, 2, 196, 255, 196, 255, 1, 0 }; +BYTE sortkey_results_win7_punctuation_with_cjk[] = { 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 171, 122, 132, 1, 1, 1, 1, 255, 236, 25, 18, 0 }; +BYTE sortkey_results_win7_compatibility_to_expansion[] = { 7, 83, 1, 0, 1, 2, 12, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility2[] = { 41, 68, 253, 255, 77, 101, 181, 251, 1, 2, 2, 63, 1, 2, 2, 63, 1, 1, 0 }; +BYTE sortkey_results_win7_compatibility3[] = { 253, 255, 63, 216, 5, 63, 8, 227, 1, 1, 1, 1, 0 }; +BYTE sortkey_results_win7_japanese_special_type1[] = { 34, 60, 34, 60, 1, 42, 5, 1, 1, 255, 3, 4, 2, 196, 196, 255, 255, 1, 0 }; +BYTE sortkey_results_win7_language_jap1[] = { 176, 55, 253, 255, 85, 45, 208, 223, 1, 63, 1, 63, 1, 1, 0 }; + +#define run_sortkey_test(locale, str, result, flags) \ + _run_sortkey_test(locale, str, ARRAY_SIZE(str), result, ARRAY_SIZE(result), flags, __FILE__, __LINE__) + +static void _run_sortkey_test(unsigned int locale, const WCHAR* str, int str_len, BYTE* result, int result_len, int flags, const char* file, int line) +{ + int i; + BYTE buffer[1000]; + int test_len = LCMapStringW(locale, 0x00000400 | flags /* LCMAP_SORTKEY */, str, -1, (void *)buffer, sizeof(buffer)); + int difference = -1; + for (i = 0; i < result_len && i < test_len; i++) + { + if (buffer[i] != result[i]) + { + difference = i; + break; + } + } + ok_(file, line)(difference == -1, "Difference at %d\n", difference); +} + +static void test_LCMapString_sortkey(void) +{ + OSVERSIONINFOA osversion; + + osversion.dwOSVersionInfoSize = sizeof(osversion); + GetVersionExA(&osversion); + + if (broken(osversion.dwMajorVersion != 6 || osversion.dwMinorVersion != 1)) + { + skip("Unicode sorting table tests only implemented for win7. Current version is %d.%d\n", osversion.dwMajorVersion, osversion.dwMinorVersion); + return; + } + + /* Tests against the Win7 sorting tables */ + + /* en-US */ + todo_wine + run_sortkey_test(0x0409, L"abc\ue604\u00c1", sortkey_results_win7_default, 0); /* Default case */ + todo_wine + run_sortkey_test(0x0409, L"\u02f4\u02f4\u02f4", sortkey_results_win7_type1, 0); /* Type 1 */ + todo_wine + run_sortkey_test(0x0409, L"ab\uff0c\u2a74\u2364\u265f\u29d8\u2ff3yz", sortkey_results_win7_symbols1, 0); /* Symbols */ + todo_wine + run_sortkey_test(0x0409, L"ab\uff0c\u2a74\u2364\u265f\u29d8\u2ff3yz", sortkey_results_win7_symbols2, NORM_IGNORESYMBOLS); /* Symbols */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation1, 0); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation2, SORT_STRINGSORT); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"ab\u208b\u058ayz", sortkey_results_win7_punctuation3, NORM_IGNORESYMBOLS); /* Punctuation */ + todo_wine + run_sortkey_test(0x0409, L"\u4d3a\u0476A", sortkey_results_win7_type5, 0); /* Type 5 */ + todo_wine + run_sortkey_test(0x0409, L"\u11ee\u0476A", sortkey_results_win7_jamo, 0); /* Jamo */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese1, 0); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese2, NORM_IGNORECASE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese3, NORM_IGNOREWIDTH); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese4, NORM_IGNOREKANATYPE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\uff6e\u30e7\uff96\u30e8\u3087\u3088\u32f5A\u0476A", sortkey_results_win7_japanese5, NORM_IGNORENONSPACE | NORM_IGNOREWIDTH | NORM_IGNOREKANATYPE); /* Japanese */ + todo_wine + run_sortkey_test(0x0409, L"\u30fc\u30fc", sortkey_results_win7_japanese_special1, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc", sortkey_results_win7_japanese_special2, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc", sortkey_results_win7_japanese_special3, NORM_IGNOREWIDTH); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fc", sortkey_results_win7_japanese_special4, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special5, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special6, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc\u30fc", sortkey_results_win7_japanese_special7, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\u30fca\u30fca\uff67\u30fc", sortkey_results_win7_japanese_special8, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u30fc\uff67", sortkey_results_win7_japanese_special9, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\uff67\u30fc", sortkey_results_win7_japanese_special10, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67a\uff67\u30fca\u30fc", sortkey_results_win7_japanese_special11, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u30B1\u30FC", sortkey_results_win7_japanese_special12, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uFF9C\u3034", sortkey_results_win7_japanese_special13, NORM_IGNORENONSPACE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u3083\u309D", sortkey_results_win7_japanese_special14, NORM_IGNOREKANATYPE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"aaa\uff67\uff67\ua015a015a015\uff70\uff70a\uff67\u30fc", sortkey_results_win7_japanese_special15, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u32EBj\uA015\uFF9C\u31FA\u3034\u30FDb\u30FA\uFF8Frrs\u30F2\uFF75\u3005n\uFF75\u32E8u", sortkey_results_win7_japanese_special16, 0); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u32EBj\uA015\uFF9C\u31FA\u3034\u30FDb\u30FA\uFF8Frrs\u30F2\uFF75\u3005n\uFF75\u32E8u", sortkey_results_win7_japanese_special17, NORM_IGNORENONSPACE | NORM_IGNOREWIDTH | NORM_IGNOREKANATYPE); /* Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u037f\u052a", sortkey_results_win7_missing_characters, 0); /* Characters not in table */ + todo_wine + run_sortkey_test(0x0409, L"\u00c6", sortkey_results_win7_expansion1, 0); /* Expansion */ + todo_wine + run_sortkey_test(0x0409, L"\u0374", sortkey_results_win7_compatibility1, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"a\u0301\u0385\u06d6", sortkey_results_win7_expansion2, 0); /* Expansion */ + run_sortkey_test(0x0409, L"\0a", sortkey_results_win7_null_character, 0); /* null character */ + todo_wine + run_sortkey_test(0x0409, L"\u9185\xD994\uFF70", sortkey_results_win7_japanese_special_with_missing_characters1, 0); /* Characters not in table & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\u9185\uFCA2\uFF70", sortkey_results_win7_japanese_special_with_expansion1, 0); /* Expansion & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u200f\u30fc", sortkey_results_win7_japanese_special_with_unsortable, 0); /* Unsortable characters & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u037f\u30fc", sortkey_results_win7_japanese_special_with_missing_characters2, 0); /* Character not in table & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uff67\u00c6\u30fc", sortkey_results_win7_japanese_special_with_expansion2, 0); /* Expansion & Japanese special */ + todo_wine + run_sortkey_test(0x0409, L"\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\uE9D2\x001C", sortkey_results_win7_punctuation_with_cjk, 0); /* Punctuation with CJK */ + todo_wine + run_sortkey_test(0x0409, L"\u1fee", sortkey_results_win7_compatibility_to_expansion, 0); /* Compatibility to expansion */ + todo_wine + run_sortkey_test(0x0409, L"\uFEA6\uFA83\xDD01", sortkey_results_win7_compatibility2, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"\uFA72\u30FC\u22DC", sortkey_results_win7_compatibility3, 0); /* Compatibility */ + todo_wine + run_sortkey_test(0x0409, L"\u30E6\u05B6\u3005", sortkey_results_win7_japanese_special_type1, 0); /* Type 1 and Japanese special */ + + /* ja-JP */ + todo_wine + run_sortkey_test(0x0411, L"\xd835\ufa43\u4edf", sortkey_results_win7_language_jap1, 0); +} + static void test_LCMapStringEx(void) { int ret; @@ -6281,6 +6462,7 @@ START_TEST(locale) test_LCMapStringW(); test_LCMapStringEx(); test_LocaleNameToLCID(); + test_LCMapString_sortkey(); test_FoldStringA(); test_FoldStringW(); test_ConvertDefaultLocale(); -- 2.25.0

2 3

[PATCH 3/3 v2] winealsa.drv: send MIDI events to port subscribers
by Andrew Eikum 12 Feb '20

12 Feb '20

From: Jacek Konieczny <jajcus(a)jajcus.net> This way changes to the port connections made by other applications will be honoured. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix authorship. dlls/winealsa.drv/midi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 879d48d824b..f2fe6307bb2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -871,7 +871,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { case MIDI_CMD_NOTE_OFF: @@ -1040,8 +1040,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event); -- 2.25.0

1 0

[PATCH 2/3 v2] winealsa.drv: allow external MIDI port connection changes
by Andrew Eikum 12 Feb '20

12 Feb '20

From: Jacek Konieczny <jajcus(a)jajcus.net> That is generally the expected behaviour of any ALSA sequencer client. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix authorship. dlls/winealsa.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7be7bc58f31..879d48d824b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -248,16 +248,16 @@ static int midiOpenSeq(BOOL create_client) snd_seq_set_client_name(midiSeq, "WINE midi driver"); port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else -- 2.25.0

1 0

[PATCH 1/3 v2] winealsa.drv: Clean up midiOpenSeq
by Andrew Eikum 12 Feb '20

12 Feb '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix authorship. dlls/winealsa.drv/midi.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 58b10bf666b..7be7bc58f31 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -243,33 +243,26 @@ static int midiOpenSeq(BOOL create_client) return -1; } - if (create_client) { - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + if (create_client) { + /* Setting the client name is the only init to do */ + snd_seq_set_client_name(midiSeq, "WINE midi driver"); -#if 0 /* FIXME: Is it possible to use a port for READ & WRITE ops */ - port_in = port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input/Output", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", + SND_SEQ_PORT_CAP_READ, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) - TRACE("Unable to create output port\n"); + TRACE("Unable to create output port\n"); else - TRACE("Outport port %d created successfully\n", port_out); -#else - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port %d created successfully\n", port_in); -#endif - } + TRACE("Input port %d created successfully\n", port_in); + } } numOpenMidiSeq++; LeaveCriticalSection(&midiSeqLock); -- 2.25.0

1 0

Unicode Sorting Weight Tables
by Fabian Maurer 12 Feb '20

12 Feb '20

Hello wine-devel, Looking at https://bugs.winehq.org/show_bug.cgi?id=35009, the problem is that windows uses completely different sorting weight tables from the official unicode version. However, MS disclosed them under their "Open Specifications" program: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/ (The tables are as download available, under the same license, according to MS support) If we could use that, we should be able to produce the exact same sorting windows has. And to properly solve those unicode bugs, that's what we need. However, two questions arise: 1) If we could, would we even want to use those tables? 2) Is the license of that content compatible with Wine? Your thoughts on this? Question 1) is probably the easiest. The copyright notice can be found inside the PDF FWIW, but I don't really understand laywer- speak. Regards, Fabian Maurer

3 5

[PATCH 3/3] winealsa.drv: send MIDI events to port subscribers
by Andrew Eikum 12 Feb '20

12 Feb '20

From: Jacek Konieczny <jajcus(a)jajcus.net> This way changes to the port connections made by other applications will be honoured. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 879d48d824b..f2fe6307bb2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -871,7 +871,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { case MIDI_CMD_NOTE_OFF: @@ -1040,8 +1040,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event); -- 2.25.0

1 0

[PATCH 2/3] winealsa.drv: allow external MIDI port connection changes
by Jacek Konieczny 12 Feb '20

12 Feb '20

That is generally the expected behaviour of any ALSA sequencer client. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7be7bc58f31..879d48d824b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -248,16 +248,16 @@ static int midiOpenSeq(BOOL create_client) snd_seq_set_client_name(midiSeq, "WINE midi driver"); port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else -- 2.25.0

1 0

[PATCH 1/3] winealsa.drv: Clean up midiOpenSeq
by Andrew Eikum 12 Feb '20

12 Feb '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 58b10bf666b..7be7bc58f31 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -243,33 +243,26 @@ static int midiOpenSeq(BOOL create_client) return -1; } - if (create_client) { - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + if (create_client) { + /* Setting the client name is the only init to do */ + snd_seq_set_client_name(midiSeq, "WINE midi driver"); -#if 0 /* FIXME: Is it possible to use a port for READ & WRITE ops */ - port_in = port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input/Output", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", + SND_SEQ_PORT_CAP_READ, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) - TRACE("Unable to create output port\n"); + TRACE("Unable to create output port\n"); else - TRACE("Outport port %d created successfully\n", port_out); -#else - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port %d created successfully\n", port_in); -#endif - } + TRACE("Input port %d created successfully\n", port_in); + } } numOpenMidiSeq++; LeaveCriticalSection(&midiSeqLock); -- 2.25.0

1 0

[PATCH v2 1/6] quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
by Zebediah Figura 12 Feb '20

12 Feb '20

Spotted by Henri Verbeet. Fixes: 9b1ba3414953fe09cf8b95e781e5d9c0119cacfc Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: actually remove the memcpy... dlls/quartz/vmr9.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 928e98f6056..bc2a905650c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -627,7 +627,10 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; + unsigned int row_size; BITMAPINFOHEADER bih; + LONG i, size_left; + char *dst; HRESULT hr; TRACE("filter %p, size %d, image %p.\n", filter, *size, image); @@ -661,10 +664,19 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L if (FAILED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_READONLY))) goto out; - memcpy(image, &bih, min(*size, sizeof(BITMAPINFOHEADER))); - if (*size > sizeof(BITMAPINFOHEADER)) - memcpy((char *)image + sizeof(BITMAPINFOHEADER), locked_rect.pBits, - min(*size - sizeof(BITMAPINFOHEADER), bih.biSizeImage)); + size_left = *size; + memcpy(image, &bih, min(size_left, sizeof(BITMAPINFOHEADER))); + size_left -= sizeof(BITMAPINFOHEADER); + + dst = (char *)image + sizeof(BITMAPINFOHEADER); + row_size = bih.biWidth * bih.biBitCount / 8; + + for (i = 0; i < bih.biHeight && size_left > 0; ++i) + { + memcpy(dst, (char *)locked_rect.pBits + (i * locked_rect.Pitch), min(row_size, size_left)); + dst += row_size; + size_left -= row_size; + } IDirect3DSurface9_UnlockRect(surface); -- 2.25.0

2 6

[PATCH v2 1/4] hid/tests: Call CancelIo before closing device.
by Rémi Bernon 12 Feb '20

12 Feb '20

This was causing some leak to be reported on wineserver shutdown when no data can be read from a device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index bb819cc83f2..19f450045f1 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -316,6 +316,7 @@ static void test_read_device(void) CloseHandle(overlapped.hEvent); rc = HidD_FreePreparsedData(ppd); ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CancelIo(device); CloseHandle(device); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, report); -- 2.25.0

4 12

[PATCH 1/6] d3d9: Retrieve textures from the primary stateblock.
by Zebediah Figura 12 Feb '20

12 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 24 +++++++++++++++++------- dlls/d3d9/stateblock.c | 6 ++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1ff178881c..3d2dd38d9c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2512,19 +2512,30 @@ static HRESULT WINAPI d3d9_device_GetClipStatus(IDirect3DDevice9Ex *iface, D3DCL return hr; } -static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD stage, IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, + DWORD sampler_idx, IDirect3DBaseTexture9 **texture) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; struct d3d9_texture *texture_impl; - TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + TRACE("iface %p, sampler_idx %u, texture %p.\n", iface, sampler_idx, texture); if (!texture) return D3DERR_INVALIDCALL; + if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) + sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (sampler_idx >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Invalid sampler %u.\n", sampler_idx); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[sampler_idx])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture9_iface; @@ -2815,16 +2826,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_texture *texture; - unsigned int i, stage, map; + unsigned int i, map; map = device->auto_mipmaps; while (map) { i = wined3d_bit_scan(&map); - - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((texture = state->textures[i])) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); } } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index dfb8d8d755..a65fa1cd8d 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -116,9 +116,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); struct wined3d_texture *wined3d_texture; - unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; + unsigned int i, offset, stride; enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; @@ -151,9 +151,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) { - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[i]) && (texture = wined3d_texture_get_parent(wined3d_texture)) && texture->usage & D3DUSAGE_AUTOGENMIPMAP) device->auto_mipmaps |= 1u << i; -- 2.25.0

3 14

[tools] testbot: Identify testbot.log information and error messages.
by Francois Gouget 12 Feb '20

12 Feb '20

The testbot.log error messages have no common prefix such as 'error:' which makes them hard to identify. Expand GetLogLineCategory() to identify the most important ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Error handling in the WineRun* scripts is all wrong :-( I'll submit a patch to sort it out 'soon' but that won't help with the existing testbot.log files. So this patch is here to take care of those. As is it will only have an effect on the new jobs though. To have the TestBot website show the correct testbot.log error summaries for past jobs, the matching .errors files need to be rebuilt using UpdateTaskLogs. For instance: cd testbot/var ../bin/UpdateTaskLogs --debug --rebuild 2>&1 | tee UpdateTaskLogs.log testbot/lib/WineTestBot/LogUtils.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9bde76c6c6..2128c97986 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -86,7 +86,11 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + $Line =~ /^Task: (?:ok|tests|Updated)/ or + # testbot.log information messages + $Line =~ /^----- Run / or + $Line =~ /^The test VM has crashed/ or # Context for an error message + $Line =~ /^The previous \d+ run$s$ terminated abnormally/) { return "info"; } @@ -101,7 +105,12 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors - _IsPerlError($Line)) + _IsPerlError($Line) or + # The main testbot.log errors + $Line =~ /^An error occurred while / or + $Line =~ /^Could not create / or + $Line =~ /^Giving up after \d+ run$s$$/ or + $Line =~ /^The (?:build|task) timed out$/) { return "error"; } -- 2.20.1

1 0

[tools] testbot/JobDetails: Improve the error reporting.
by Francois Gouget 12 Feb '20

12 Feb '20

Clearly indicate when the log or its errors cache could not be read. Also show a note when new errors could not be detected, either because there is no reference WineTest results (which would typically happen shortly after a new test configuration has been added), or because there was an issue reading one or more of the reference reports. And don't claim there are no errors when the task has not run yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 59 ++++++++++++++++++++++++++++++++----- testbot/web/WineTestBot.css | 1 + 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccf3410f5b..5a484da362 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,6 +351,22 @@ sub GenerateFullLog($$$$) my ($self, $Dir, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); + if (defined $LogInfo->{BadLog}) + { + print "<pre class='log-note'>Could not highlight new errors: ", ($LogInfo->{BadRef} || $LogInfo->{BadLog}), "</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } my %NewLineNos; if ($LogInfo->{ErrCount}) @@ -397,6 +413,11 @@ sub GenerateFullLog($$$$) } close($LogFile); } + else + { + print "<pre class='log-error'><code>Unable to open '$LogName' for reading: $!</code></pre>\n"; + $IsEmpty = 0; + } # And append the extra errors foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -535,16 +556,18 @@ EOF { next if ($LogName =~ /^old_/); my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); - next if (!$LogInfo->{ErrCount}); - $LogInfos->{$LogName} = $LogInfo; + if ($LogInfo->{ErrCount} or defined $LogInfo->{BadLog}) + { + $LogInfos->{$LogName} = $LogInfo; + } } my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogInfos) > 1); - my $LogIsEmpty = 1; + my $NoErrors = 1; foreach my $LogName (@{$MoreInfo->{Logs}}) { next if (!$LogInfos->{$LogName}); - $LogIsEmpty = 0; + $NoErrors = 0; if ($ShowLogName) { @@ -554,6 +577,24 @@ EOF } my $LogInfo = $LogInfos->{$LogName}; + if (defined $LogInfo->{BadLog}) + { + my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); @@ -576,9 +617,9 @@ EOF print "</code></pre>\n"; } } - - if ($LogIsEmpty) + if (!@{$MoreInfo->{Logs}}) { + # There is no log file or they are all empty if ($StepTask->Status eq "canceled") { print "No log, task was canceled\n"; @@ -589,9 +630,13 @@ EOF } else { - print "No errors\n"; + print "<pre class='log-note'>No result yet...</pre>\n"; } } + elsif ($NoErrors) + { + print "No errors\n"; + } } } print "</div>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 9a23f5fa82..3fccbd2652 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -395,6 +395,7 @@ pre .userdisabled { color: red; } .userdeleted { color: red; } +.log-note { font-style: italic; color: blue; } .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } -- 2.20.1

1 0

[tools] testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors().
by Francois Gouget 12 Feb '20

12 Feb '20

_SaveLogErrors() provides more details about the errors than the old _DumpErrors() code did. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 90 +++++++++++++---------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2128c97986..2104ffa0e0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -696,24 +696,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } - -sub _DumpErrors($$) -{ - my ($Label, $LogInfo) = @_; - - print STDERR "$Label: ", join(" ", keys %$LogInfo), "\n"; - my $GroupNames = $LogInfo->{ErrGroupNames}; - print STDERR " Groups=", scalar(@$GroupNames), " [", join(",", @$GroupNames), "]\n"; - my @ErrorKeys = sort keys %{$LogInfo->{Groups}}; - print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; - foreach my $GroupName (@$GroupNames) - { - print STDERR " [$GroupName]\n"; - my $Group = $LogInfo->{Groups}->{$GroupName}; - print STDERR " [$_]\n" for (@{$Group->{Errors}}); - } -} - sub _AddLogGroup($$;$) { my ($LogInfo, $GroupName, $LineNo) = @_; @@ -868,21 +850,7 @@ sub GetLogErrors($) Loads the specified log errors file. -The file contains two types of lines: -* GroupName lines - <GroupName> - Where <GroupName> is a unique string which would typically be the name of a - WineTest dll or program, but may also be empty or be used to specify an - extra group errors. It must not start with a space. - -* Error lines - <Space> <New> <SrcLineNo> <Error> - Where: - - <Space> is a space, as well as the spaces in the line above. - - <New> is either 'n' for new errors, or 'o' for old ones. - - <SrcLineNo> is the 1-base line number of the error in the source log file. - If there is no source line then this should be 0. - - <Error> is the error message. +See _WriteLogErrors() for the format of the errors file. Returns the errors in the same format as TagNewErrors(). @@ -958,11 +926,11 @@ sub LoadLogErrors($) =pod =over 12 -=item C<_SaveLogErrors()> +=item C<_WriteLogErrors()> -Saves the LogInfo structure to <LogName>.errors. +Writes the LogInfo structure in text form to the specified file descriptor. -The file contains lines of the form: +All lines follow are of the following form: <type> <value1> <value2> The values depend on the <type> of the line. <type> and <value1> must not @@ -993,6 +961,27 @@ different type. =back =cut +sub _WriteLogErrors($$) +{ + my ($Fh, $LogInfo) = @_; + + foreach my $Name ("BadRef", "NoRef") + { + next if (!defined $LogInfo->{$Name}); + print $Fh "p $Name $LogInfo->{$Name}\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + print $Fh "g $Group->{LineNo} $GroupName\n"; + foreach my $Index (0..@{$Group->{Errors}} - 1) + { + my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; + print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; + } + } +} + sub _SaveLogErrors($) { my ($LogInfo) = @_; @@ -1000,21 +989,7 @@ sub _SaveLogErrors($) my $ErrorsPath = "$LogInfo->{LogPath}.errors"; if (open(my $ErrorsFile, ">", $ErrorsPath)) { - foreach my $Name ("BadRef", "NoRef") - { - next if (!defined $LogInfo->{$Name}); - print $ErrorsFile "p $Name $LogInfo->{$Name}\n"; - } - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) - { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $ErrorsFile "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) - { - my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; - print $ErrorsFile "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; - } - } + _WriteLogErrors($ErrorsFile, $LogInfo); close($ErrorsFile); # Set the mtime so Janitor reaps both at the same time @@ -1024,6 +999,19 @@ sub _SaveLogErrors($) return "Could not open '$LogInfo->{LogName}.errors' for writing: $!"; } +sub _DumpErrors($$) +{ + my ($Label, $LogInfo) = @_; + + print STDERR "$Label:\n"; + foreach my $Key (sort keys %{$LogInfo}) + { + next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } + _WriteLogErrors(*STDERR, $LogInfo); +} + # # New error detection -- 2.20.1

1 0

[tools] testbot/Janitor: Avoid false positives when cleaning up staging.
by Francois Gouget 12 Feb '20

12 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0635b37880..8d50349c3d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -273,10 +273,23 @@ if (opendir(my $dh, "$DataDir/staging")) if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) { - # These files always expire after one day + # We get these files whenever a developer abandons a job submission. + # So just delete them silently after a day. $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry =~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + { + # Janitor can only see these files if it ran during the brief interval + # between their creation and them being moved out of staging, or if + # something prevented the latter (power loss, bug, etc). So only complain + # after a day to avoid false positives. + if ($TTL >= 1) + { + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found an old transient file$Deletion: staging/$Entry\n" + } + } + else { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; -- 2.20.1

1 0

[PATCH] makedep: Use msvcrt headers for objects inside importlibs.
by Jacek Caban 12 Feb '20

12 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those are the last cases where we still use mingw-w64 provided headers. dlls/msvcrt/crt_main.c | 2 +- dlls/msvcrt/crt_wmain.c | 2 +- dlls/msvcrt/iob.c | 6 +++--- dlls/msvcrt/mathf.c | 14 +++++++++++++- dlls/msvcrt/onexit.c | 1 + dlls/ucrtbase/printf.c | 1 + tools/makedep.c | 1 + 7 files changed, 21 insertions(+), 6 deletions(-)

1 0

[PATCH v3 1/4] wined3d: Support AMD alpha to coverage state.
by Paul Gofman 12 Feb '20

12 Feb '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - manage the state in state block. dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 28 ++++++++++++++++++++++++++-- dlls/wined3d/stateblock.c | 32 ++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 7 ++++++- include/wine/wined3d.h | 1 + 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 859f3e5f1f..b4991d4e5e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27100,7 +27100,7 @@ static void test_alpha_to_coverage(void) colour = get_readback_color(&rb, 64, 64); /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b443cf6cd0..9b6c9dc2df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -529,6 +529,8 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); + wined3d_blend_state_decref(device->blend_state_atoc_enabled); + wined3d_cs_destroy(device->cs); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) @@ -3845,6 +3847,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; unsigned int i, j, count, vs_uniform_count; + BOOL blend_state_set = FALSE; + struct wined3d_color color; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3958,15 +3962,24 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { if (i == WINED3D_RS_BLENDFACTOR) { - struct wined3d_color color; + struct wined3d_blend_state *blend_state = stateblock->changed.blend_state + ? state->blend_state : wined3d_device_get_blend_state(device, &color); + wined3d_color_from_d3dcolor(&color, state->rs[i]); - wined3d_device_set_blend_state(device, NULL, &color); + wined3d_device_set_blend_state(device, blend_state, &color); + blend_state_set = TRUE; } else wined3d_device_set_render_state(device, i, state->rs[i]); } } + if (stateblock->changed.blend_state && !blend_state_set) + { + wined3d_device_get_blend_state(device, &color); + wined3d_device_set_blend_state(device, state->blend_state, &color); + } + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) { for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) @@ -5795,12 +5808,23 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; + struct wined3d_blend_state_desc blend_state_desc; unsigned int i; HRESULT hr; if (!wined3d_select_feature_level(adapter, levels, level_count, &device->feature_level)) return E_FAIL; + memset(&blend_state_desc, 0, sizeof(blend_state_desc)); + blend_state_desc.alpha_to_coverage = TRUE; + + if (FAILED(hr = wined3d_blend_state_create(device, &blend_state_desc, + NULL, &wined3d_null_parent_ops, &device->blend_state_atoc_enabled))) + { + ERR("Could not create blend state object.\n"); + return hr; + } + TRACE("Device feature level %s.\n", wined3d_debug_feature_level(device->feature_level)); device->ref = 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6547827d6f..32dc504693 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; + states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -263,6 +264,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; + states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -1017,6 +1019,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.blend_state) + stateblock->stateblock_state.blend_state = state->blend_state; + TRACE("Capture done.\n"); } @@ -1025,6 +1030,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_device *device = stateblock->device; + BOOL blend_state_set = FALSE; + struct wined3d_color color; unsigned int i; DWORD map; @@ -1121,14 +1128,24 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->rs[rs] = stateblock->stateblock_state.rs[rs]; if (rs == WINED3D_RS_BLENDFACTOR) { - struct wined3d_color color; + struct wined3d_blend_state *blend_state = stateblock->changed.blend_state + ? stateblock->stateblock_state.blend_state + : wined3d_device_get_blend_state(device, &color); + wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); - wined3d_device_set_blend_state(device, NULL, &color); + wined3d_device_set_blend_state(device, blend_state, &color); + blend_state_set = TRUE; } else wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } + if (stateblock->changed.blend_state && !blend_state_set) + { + wined3d_device_get_blend_state(device, &color); + wined3d_device_set_blend_state(device, stateblock->stateblock_state.blend_state, &color); + } + /* Texture states. */ for (i = 0; i < stateblock->num_contained_tss_states; ++i) { @@ -1433,6 +1450,17 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->stateblock_state.rs[state] = value; stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); + + if (state == WINED3D_RS_POINTSIZE + && (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE || value == WINED3D_ALPHA_TO_COVERAGE_DISABLE)) + { + stateblock->changed.blend_state = 1; + + if (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE) + stateblock->stateblock_state.blend_state = stateblock->device->blend_state_atoc_enabled; + else + stateblock->stateblock_state.blend_state = NULL; + } } void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b9b342441..b5a17cd6d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -3323,6 +3326,7 @@ struct wined3d_device /* Context management */ struct wined3d_context **contexts; UINT context_count; + struct wined3d_blend_state *blend_state_atoc_enabled; }; void wined3d_device_cleanup(struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -3943,7 +3947,8 @@ struct wined3d_saved_states DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD store_stream_offset : 1; - DWORD padding : 4; + DWORD blend_state : 1; + DWORD padding : 3; }; struct StageState { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b08e7f37a..28162275db 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2170,6 +2170,7 @@ struct wined3d_stateblock_state RECT scissor_rect; struct wined3d_light_state *light_state; + struct wined3d_blend_state *blend_state; }; struct wined3d_parent_ops -- 2.24.1

2 7

[PATCH] msscript.ocx/tests: Get rid of a2bstr()
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 90 +++++++++++++----------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index d95c43d9b4..22db28e366 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1550,18 +1550,6 @@ static void test_State(void) IScriptControl_Release(sc); } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len - 1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__) static void _check_error(IScriptControl *sc, LONG exp_num, int line) { @@ -1597,7 +1585,7 @@ static void test_IScriptControl_Eval(void) hr = IScriptControl_Eval(sc, NULL, NULL); ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); - script_str = a2bstr("1 + 1"); + script_str = SysAllocString(L"1 + 1"); hr = IScriptControl_Eval(sc, script_str, NULL); ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); SysFreeString(script_str); @@ -1610,7 +1598,7 @@ static void test_IScriptControl_Eval(void) V_VT(&var), V_I4(&var)); todo_wine CHECK_ERROR(sc, 0); - script_str = a2bstr("1 + 1"); + script_str = SysAllocString(L"1 + 1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1619,14 +1607,14 @@ static void test_IScriptControl_Eval(void) V_VT(&var), V_I4(&var)); SysFreeString(script_str); - language = a2bstr("jscript"); + language = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, language); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); hr = IScriptControl_get_State(sc, &state); ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); ok(state == Initialized, "got wrong state: %d\n", state); SysFreeString(language); - script_str = a2bstr("var1 = 1 + 1"); + script_str = SysAllocString(L"var1 = 1 + 1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1638,7 +1626,7 @@ static void test_IScriptControl_Eval(void) ok(state == Initialized, "got wrong state: %d\n", state); SysFreeString(script_str); - script_str = a2bstr("var2 = 10 + var1"); + script_str = SysAllocString(L"var2 = 10 + var1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1647,7 +1635,7 @@ static void test_IScriptControl_Eval(void) V_VT(&var), V_I4(&var)); SysFreeString(script_str); - script_str = a2bstr("invalid syntax"); + script_str = SysAllocString(L"invalid syntax"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1658,7 +1646,7 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); todo_wine CHECK_ERROR(sc, 1004); - script_str = a2bstr("var2 = var1 + var2"); + script_str = SysAllocString(L"var2 = var1 + var2"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1667,12 +1655,12 @@ static void test_IScriptControl_Eval(void) V_VT(&var), V_I4(&var)); SysFreeString(script_str); - script_str = a2bstr("\"Hello\""); + script_str = SysAllocString(L"\"Hello\""); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - expected_string = a2bstr("Hello"); + expected_string = SysAllocString(L"Hello"); ok((V_VT(&var) == VT_BSTR) && (!lstrcmpW(V_BSTR(&var), expected_string)), "V_VT(var) = %d, V_BSTR(var) = %s.\n", V_VT(&var), wine_dbgstr_w(V_BSTR(&var))); SysFreeString(expected_string); @@ -1692,7 +1680,7 @@ static void test_IScriptControl_Eval(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - language= a2bstr("testscript"); + language= SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(language); @@ -1706,7 +1694,7 @@ static void test_IScriptControl_Eval(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); parse_flags = SCRIPTTEXT_ISEXPRESSION; - script_str = a2bstr("var1 = 1 + 1"); + script_str = SysAllocString(L"var1 = 1 + 1"); V_VT(&var) = VT_NULL; hr = IScriptControl_Eval(sc, script_str, &var); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); @@ -1716,7 +1704,7 @@ static void test_IScriptControl_Eval(void) CHECK_CALLED(ParseScriptText); SET_EXPECT(ParseScriptText); - script_str = a2bstr("var2 = 10 + var1"); + script_str = SysAllocString(L"var2 = 10 + var1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1733,7 +1721,7 @@ static void test_IScriptControl_Eval(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); - script_str = a2bstr("var2 = 10 + var1"); + script_str = SysAllocString(L"var2 = 10 + var1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); @@ -1765,7 +1753,7 @@ static void test_IScriptControl_AddCode(void) &IID_IScriptControl, (void **)&sc); ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); - code_str = a2bstr("1 + 1"); + code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); SysFreeString(code_str); @@ -1773,18 +1761,18 @@ static void test_IScriptControl_AddCode(void) hr = IScriptControl_AddCode(sc, NULL); ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); - language = a2bstr("jscript"); + language = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, language); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(language); - code_str = a2bstr("1 + 1"); + code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(code_str); todo_wine CHECK_ERROR(sc, 0); - code_str = a2bstr("invalid syntax"); + code_str = SysAllocString(L"invalid syntax"); hr = IScriptControl_AddCode(sc, code_str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); SysFreeString(code_str); @@ -1805,7 +1793,7 @@ static void test_IScriptControl_AddCode(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - language = a2bstr("testscript"); + language = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(language); @@ -1819,7 +1807,7 @@ static void test_IScriptControl_AddCode(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); parse_flags = SCRIPTTEXT_ISVISIBLE; - code_str = a2bstr("1 + 1"); + code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(code_str); @@ -1827,7 +1815,7 @@ static void test_IScriptControl_AddCode(void) CHECK_CALLED(ParseScriptText); SET_EXPECT(ParseScriptText); - code_str = a2bstr("0x100"); + code_str = SysAllocString(L"0x100"); hr = IScriptControl_AddCode(sc, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(code_str); @@ -1836,7 +1824,7 @@ static void test_IScriptControl_AddCode(void) /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ SET_EXPECT(ParseScriptText); parse_flags = SCRIPTTEXT_ISEXPRESSION; - code_str = a2bstr("var2 = 10 + var1"); + code_str = SysAllocString(L"var2 = 10 + var1"); V_VT(&var) = VT_NULL; hr = IScriptControl_Eval(sc, code_str, &var); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); @@ -1864,7 +1852,7 @@ static void test_IScriptControl_ExecuteStatement(void) &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); - str = a2bstr("1 + 1"); + str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); SysFreeString(str); @@ -1872,18 +1860,18 @@ static void test_IScriptControl_ExecuteStatement(void) hr = IScriptControl_ExecuteStatement(sc, NULL); ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); - str = a2bstr("jscript"); + str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(str); - str = a2bstr("1 + 1"); + str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); SysFreeString(str); todo_wine CHECK_ERROR(sc, 0); - str = a2bstr("invalid syntax"); + str = SysAllocString(L"invalid syntax"); hr = IScriptControl_ExecuteStatement(sc, str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); SysFreeString(str); @@ -1904,7 +1892,7 @@ static void test_IScriptControl_ExecuteStatement(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = a2bstr("testscript"); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(str); @@ -1918,7 +1906,7 @@ static void test_IScriptControl_ExecuteStatement(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); parse_flags = 0; - str = a2bstr("1 + 1"); + str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); SysFreeString(str); @@ -1926,7 +1914,7 @@ static void test_IScriptControl_ExecuteStatement(void) CHECK_CALLED(ParseScriptText); SET_EXPECT(ParseScriptText); - str = a2bstr("0x100"); + str = SysAllocString(L"0x100"); hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); SysFreeString(str); @@ -1958,7 +1946,7 @@ static void test_IScriptControl_Run(void) ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); params = NULL; - str = a2bstr("identifier"); + str = SysAllocString(L"identifier"); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08x.\n", hr); @@ -1984,29 +1972,29 @@ static void test_IScriptControl_Run(void) hr = IScriptControl_Run(sc, NULL, &params, &var); ok(hr == E_FAIL, "IScriptControl_Run returned: 0x%08x.\n", hr); - str = a2bstr("jscript"); + str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(str); - str = a2bstr("foobar"); + str = SysAllocString(L"foobar"); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); todo_wine CHECK_ERROR(sc, 0); SysFreeString(str); - str = a2bstr("function subtract(a, b) { return a - b; }\n"); + str = SysAllocString(L"function subtract(a, b) { return a - b; }\n"); hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); todo_wine CHECK_ERROR(sc, 0); SysFreeString(str); - str = a2bstr("Subtract"); + str = SysAllocString(L"Subtract"); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); SysFreeString(str); - str = a2bstr("subtract"); + str = SysAllocString(L"subtract"); hr = IScriptControl_Run(sc, str, &params, NULL); ok(hr == E_POINTER, "IScriptControl_Run failed: 0x%08x.\n", hr); todo_wine CHECK_ERROR(sc, 0); @@ -2056,7 +2044,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(SetScriptSite); SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = a2bstr("testscript"); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(str); @@ -2071,7 +2059,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(QI_IDispatchEx); SET_EXPECT(GetIDsOfNames); SET_EXPECT(Invoke); - Dispatch_expected_name = a2bstr("function"); + Dispatch_expected_name = SysAllocString(L"function"); hr = IScriptControl_Run(sc, Dispatch_expected_name, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); ok((V_VT(&var) == VT_R8) && (V_R8(&var) == 4.2), "V_VT(var) = %d, V_R8(var) = %lf.\n", V_VT(&var), V_R8(&var)); @@ -2087,7 +2075,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(QI_IDispatchEx); SET_EXPECT(GetIDsOfNames); SET_EXPECT(Invoke); - Dispatch_expected_name = a2bstr("BarFoo"); + Dispatch_expected_name = SysAllocString(L"BarFoo"); hr = IScriptControl_Run(sc, Dispatch_expected_name, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); SysFreeString(Dispatch_expected_name); @@ -2102,7 +2090,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(QI_IDispatchEx); SET_EXPECT(GetIDsOfNames); SET_EXPECT(InvokeEx); - Dispatch_expected_name = a2bstr("FooBar"); + Dispatch_expected_name = SysAllocString(L"FooBar"); hr = IScriptControl_Run(sc, Dispatch_expected_name, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); ok((V_VT(&var) == VT_I2) && (V_I2(&var) == 42), "V_VT(var) = %d, V_I2(var) = %d.\n", V_VT(&var), V_I2(&var)); @@ -2117,7 +2105,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(QI_IDispatchEx); SET_EXPECT(GetIDsOfNames); SET_EXPECT(InvokeEx); - Dispatch_expected_name = a2bstr("1"); + Dispatch_expected_name = SysAllocString(L"1"); hr = IScriptControl_Run(sc, Dispatch_expected_name, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); SysFreeString(Dispatch_expected_name); -- 2.24.1

3 2

[PATCH 2/2] mshtml/tests: Get rid of a2bstr() in xmlhttprequest.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 77 +++++++++++++----------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 63df66ebe0..9280246b3c 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -28,18 +28,6 @@ #include "objsafe.h" #include "wine/test.h" -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -374,7 +362,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { - const char *key; + const WCHAR *key; const WCHAR *value; }; @@ -428,16 +416,17 @@ static void test_header(const struct HEADER_TYPE expect[], int num) for(i = 0; i < num; ++i) { text = NULL; - key = a2bstr(expect[i].key); + key = SysAllocString(expect[i].key); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); ok(text != NULL, "text == NULL\n"); ok(!lstrcmpW(text, expect[i].value), - "Expect %s: %s, got %s\n", expect[i].key, wine_dbgstr_w(expect[i].value), wine_dbgstr_w(text)); + "Expect %s: %s, got %s\n", wine_dbgstr_w(expect[i].key), wine_dbgstr_w(expect[i].value), + wine_dbgstr_w(text)); SysFreeString(key); SysFreeString(text); - wsprintfW(buf, L"%S: %s", expect[i].key, expect[i].value); + wsprintfW(buf, L"%s: %s", expect[i].key, expect[i].value); ok(wcsstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", wine_dbgstr_w(all), wine_dbgstr_w(buf)); } @@ -485,9 +474,9 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) } #define set_request_header(a,b,c) _set_request_header(__LINE__,a,b,c) -static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const char *header_a, const char *value_a) +static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const WCHAR *header_w, const WCHAR *value_w) { - BSTR header = a2bstr(header_a), value = a2bstr(value_a); + BSTR header = SysAllocString(header_w), value = SysAllocString(value_w); HRESULT hres; hres = IHTMLXMLHttpRequest_setRequestHeader(xhr, header, value); @@ -534,10 +523,10 @@ static void test_responseXML(const WCHAR *expect_text) } #define xhr_open(a,b) _xhr_open(__LINE__,a,b) -static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) +static HRESULT _xhr_open(unsigned line, const WCHAR *url_w, const WCHAR *method_w) { - BSTR method = a2bstr(method_a); - BSTR url = a2bstr(url_a); + BSTR method = SysAllocString(method_w); + BSTR url = SysAllocString(url_w); VARIANT async, empty; HRESULT hres; @@ -574,7 +563,7 @@ static void _test_response_text(unsigned line, const WCHAR *expect_text) SysFreeString(text); } -static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) +static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR *expect_text) { VARIANT vbool, vempty, var; BSTR method, url; @@ -582,8 +571,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", L"51"}, - {"Content-Type", L"application/xml"} + {L"Content-Length", L"51"}, + {L"Content-Type", L"application/xml"} }; trace("test_sync_xhr\n"); @@ -641,8 +630,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); - method = a2bstr("GET"); - url = a2bstr(xml_url); + method = SysAllocString(L"GET"); + url = SysAllocString(xml_url); V_VT(&vbool) = VT_BOOL; V_BOOL(&vbool) = VARIANT_FALSE; V_VT(&vempty) = VT_EMPTY; @@ -685,7 +674,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); - set_request_header(xhr, "x-wine-test", "sync-test"); + set_request_header(xhr, L"x-wine-test", L"sync-test"); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -733,15 +722,15 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR xhr = NULL; } -static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) +static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR *expect_text) { VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", L"51"}, - {"Content-Type", L"application/xml"} + {L"Content-Length", L"51"}, + {L"Content-Type", L"application/xml"} }; create_xmlhttprequest(doc); @@ -798,7 +787,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(val == 0, "Expect UNSENT, got %d\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = xhr_open(xml_url, "GET"); + hres = xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); if(FAILED(hres)) { @@ -831,7 +820,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); - set_request_header(xhr, "x-wine-test", "async-test"); + set_request_header(xhr, L"x-wine-test", L"async-test"); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -891,7 +880,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR xhr = NULL; } -static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) +static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) { VARIANT vempty, var; LONG val; @@ -909,7 +898,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, "GET"); + xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); @@ -933,7 +922,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, "GET"); + xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); loading_cnt = 0; @@ -980,13 +969,13 @@ static void test_xhr_post(IHTMLDocument2 *doc) ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open("http://test.winehq.org/tests/post.php", "POST"); + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); - set_request_header(xhr, "Content-Type", "application/x-www-form-urlencoded"); + set_request_header(xhr, L"Content-Type", L"application/x-www-form-urlencoded"); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("X=Testing"); + V_BSTR(&v) = SysAllocString(L"X=Testing"); loading_cnt = 0; SET_EXPECT(xmlhttprequest_onreadystatechange_opened); @@ -1013,7 +1002,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } -static IHTMLDocument2 *create_doc_from_url(const char *start_url) +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; IBindCtx *bc; @@ -1025,7 +1014,7 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) hres = CreateBindCtx(0, &bc); ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); - url = a2bstr(start_url); + url = SysAllocString(start_url); hres = CreateURLMoniker(NULL, url, &url_mon); ok(hres == S_OK, "CreateURLMoniker failed: 0x%08x\n", hres); @@ -1058,14 +1047,14 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) START_TEST(xmlhttprequest) { IHTMLDocument2 *doc; - static const char start_url[] = "http://test.winehq.org/tests/hello.html"; - static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; - static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; + static const WCHAR start_url[] = L"http://test.winehq.org/tests/hello.html"; + static const WCHAR xml_url[] = L"http://test.winehq.org/tests/xmltest.xml"; + static const WCHAR large_page_url[] = L"http://test.winehq.org/tests/data.php"; static const WCHAR expect_response_text[] = L"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL); - content_type = a2bstr("Content-Type"); + content_type = SysAllocString(L"Content-Type"); doc = create_doc_from_url(start_url); if(doc) { test_sync_xhr(doc, xml_url, expect_response_text); -- 2.24.1

2 1

[PATCH 1/2] mshtml/tests: Get rid of strcmp_wa() in xmlhttprequest.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 67 +++++++++++++----------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 099f1a2f38..63df66ebe0 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -40,13 +40,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -318,7 +311,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D hres = IHTMLDocument2_get_readyState(notif_doc, &state); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - if(!strcmp_wa(state, "complete")) + if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; SysFreeString(state); @@ -382,7 +375,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; - const char *value; + const WCHAR *value; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -424,17 +417,14 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) static void test_header(const struct HEADER_TYPE expect[], int num) { int i; - BSTR key, text, all_header; + BSTR key, text, all; HRESULT hres; - char all[4096], buf[512]; + WCHAR buf[512]; - all_header = NULL; - hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all_header); + all = NULL; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all); ok(hres == S_OK, "getAllResponseHeader failed: %08x\n", hres); - ok(all_header != NULL, "all_header == NULL\n"); - - WideCharToMultiByte(CP_UTF8, 0, all_header, -1, all, sizeof(all), NULL, NULL); - SysFreeString(all_header); + ok(all != NULL, "all == NULL\n"); for(i = 0; i < num; ++i) { text = NULL; @@ -442,16 +432,17 @@ static void test_header(const struct HEADER_TYPE expect[], int num) hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, expect[i].value), - "Expect %s: %s, got %s\n", expect[i].key, expect[i].value, wine_dbgstr_w(text)); + ok(!lstrcmpW(text, expect[i].value), + "Expect %s: %s, got %s\n", expect[i].key, wine_dbgstr_w(expect[i].value), wine_dbgstr_w(text)); SysFreeString(key); SysFreeString(text); - strcpy(buf, expect[i].key); - strcat(buf, ": "); - strcat(buf, expect[i].value); - ok(strstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", all, buf); + wsprintfW(buf, L"%S: %s", expect[i].key, expect[i].value); + ok(wcsstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", + wine_dbgstr_w(all), wine_dbgstr_w(buf)); } + + SysFreeString(all); } static void test_illegal_xml(IXMLDOMDocument *xmldom) @@ -476,7 +467,7 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) VariantClear(&variant); hres = IXMLDOMDocument_get_text(xmldom, &bstr); - ok(!strcmp_wa(bstr, ""), "text = %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpW(bstr, L""), "text = %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hres = IXMLDOMDocument_get_firstChild(xmldom, NULL); @@ -506,7 +497,7 @@ static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const c SysFreeString(value); } -static void test_responseXML(const char *expect_text) +static void test_responseXML(const WCHAR *expect_text) { IDispatch *disp; IXMLDOMDocument *xmldom; @@ -563,7 +554,7 @@ static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) } #define test_response_text(a) _test_response_text(__LINE__,a) -static void _test_response_text(unsigned line, const char *expect_text) +static void _test_response_text(unsigned line, const WCHAR *expect_text) { BSTR text = NULL; HRESULT hres; @@ -577,13 +568,13 @@ static void _test_response_text(unsigned line, const char *expect_text) len = SysStringLen(text); if(text[len-1] == '\n') text[len-1] = 0; - ok_(__FILE__,line)(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); + ok_(__FILE__,line)(!lstrcmpW(text, expect_text), "expect %s, got %s\n", + wine_dbgstr_w(expect_text), wine_dbgstr_w(text)); } SysFreeString(text); } -static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) +static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) { VARIANT vbool, vempty, var; BSTR method, url; @@ -591,8 +582,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Length", L"51"}, + {"Content-Type", L"application/xml"} }; trace("test_sync_xhr\n"); @@ -726,7 +717,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); ok(hres == S_OK, "get_statusText failed: %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, "OK"), + ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); @@ -742,15 +733,15 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * xhr = NULL; } -static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) +static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) { VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Length", L"51"}, + {"Content-Type", L"application/xml"} }; create_xmlhttprequest(doc); @@ -885,7 +876,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); ok(hres == S_OK, "get_statusText failed: %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, "OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); + ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); val = 0xdeadbeef; @@ -1016,7 +1007,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) SysFreeString(V_BSTR(&v)); - test_response_text("X => Testing"); + test_response_text(L"X => Testing"); IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; @@ -1070,7 +1061,7 @@ START_TEST(xmlhttprequest) static const char start_url[] = "http://test.winehq.org/tests/hello.html"; static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; - static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; + static const WCHAR expect_response_text[] = L"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL); -- 2.24.1

2 1

[PATCH 2/2] mshtml/tests: Get rid of strcmp_wa() in events.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/events.c | 86 ++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7ae9fa70b7..8bbdb39205 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -135,13 +135,6 @@ static const char input_doc_str[] = static const char iframe_doc_str[] = "<html><body><iframe id=\"ifr\">Testing</iframe></body></html>"; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -298,7 +291,7 @@ static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const WCHA } #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) -static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) +static void _test_elem_tag(unsigned line, IUnknown *unk, const WCHAR *extag) { IHTMLElement *elem = _get_elem_iface(line, unk); BSTR tag; @@ -307,7 +300,7 @@ static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); - ok_(__FILE__, line) (!strcmp_wa(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), extag); + ok_(__FILE__, line) (!lstrcmpW(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), wine_dbgstr_w(extag)); SysFreeString(tag); } @@ -452,7 +445,7 @@ static IHTMLElement *_get_event_src(unsigned line) } #define test_event_src(t) _test_event_src(__LINE__,t) -static void _test_event_src(unsigned line, const char *src_tag) +static void _test_event_src(unsigned line, const WCHAR *src_tag) { IHTMLElement *src_elem = _get_event_src(line); @@ -506,7 +499,7 @@ static void _test_event_cancelbubble(unsigned line, IHTMLEventObj *event, VARIAN ok_(__FILE__,line)(b == exval, "cancelBubble = %x, expected %x\n", b, exval); } -static void _test_event_fromelem(unsigned line, IHTMLEventObj *event, const char *from_tag) +static void _test_event_fromelem(unsigned line, IHTMLEventObj *event, const WCHAR *from_tag) { IHTMLElement *elem; HRESULT hres; @@ -521,7 +514,7 @@ static void _test_event_fromelem(unsigned line, IHTMLEventObj *event, const char IHTMLElement_Release(elem); } -static void _test_event_toelem(unsigned line, IHTMLEventObj *event, const char *to_tag) +static void _test_event_toelem(unsigned line, IHTMLEventObj *event, const WCHAR *to_tag) { IHTMLElement *elem; HRESULT hres; @@ -654,17 +647,17 @@ static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) ok_(__FILE__,line)(l == exl, "screenY = %d, expected %d\n", l, exl); } -static void _test_event_type(unsigned line, IHTMLEventObj *event, const char *exstr) +static void _test_event_type(unsigned line, IHTMLEventObj *event, const WCHAR *exstr) { BSTR str; HRESULT hres; hres = IHTMLEventObj_get_type(event, &str); ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(str, exstr), "type = %s, expected %s\n", wine_dbgstr_w(str), exstr); + ok_(__FILE__,line)(!lstrcmpW(str, exstr), "type = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exstr)); } -static void _test_event_qualifier(unsigned line, IHTMLEventObj *event, const char *exstr) +static void _test_event_qualifier(unsigned line, IHTMLEventObj *event, const WCHAR *exstr) { BSTR str; HRESULT hres; @@ -672,7 +665,8 @@ static void _test_event_qualifier(unsigned line, IHTMLEventObj *event, const cha hres = IHTMLEventObj_get_qualifier(event, &str); ok_(__FILE__,line)(hres == S_OK, "get_qualifier failed: %08x\n", hres); if(exstr) - ok_(__FILE__,line)(!strcmp_wa(str, exstr), "qualifier = %s, expected %s\n", wine_dbgstr_w(str), exstr); + ok_(__FILE__,line)(!lstrcmpW(str, exstr), "qualifier = %s, expected %s\n", wine_dbgstr_w(str), + wine_dbgstr_w(exstr)); else ok_(__FILE__,line)(!str, "qualifier != NULL\n"); } @@ -688,7 +682,7 @@ static void _test_event_srcfilter(unsigned line, IHTMLEventObj *event) } #define test_event_obj(t,x) _test_event_obj(__LINE__,t,x) -static void _test_event_obj(unsigned line, const char *type, const xy_test_t *xy) +static void _test_event_obj(unsigned line, const WCHAR *type, const xy_test_t *xy) { IHTMLEventObj *event = _get_event_obj(line); IDOMEvent *dom_event; @@ -970,8 +964,8 @@ static HRESULT WINAPI document_onclick(IDispatchEx *iface, DISPID id, LCID lcid, test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); doc3 = get_doc3_iface((IUnknown*)V_DISPATCH(pdp->rgvarg)); IHTMLDocument3_Release(doc3); - test_event_src("DIV"); - test_event_obj("click", &no_xy); + test_event_src(L"DIV"); + test_event_obj(L"click", &no_xy); return S_OK; } @@ -982,8 +976,8 @@ static HRESULT WINAPI div_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WORD { CHECK_EXPECT(div_onclick); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("DIV"); - test_event_obj("click", &no_xy); + test_event_src(L"DIV"); + test_event_obj(L"click", &no_xy); return S_OK; } @@ -995,7 +989,7 @@ static HRESULT WINAPI div_onclick_attached(IDispatchEx *iface, DISPID id, LCID l CHECK_EXPECT(div_onclick_attached); test_attached_event_args(id, wFlags, pdp, pvarRes, pei); - test_event_src("DIV"); + test_event_src(L"DIV"); return S_OK; } @@ -1007,7 +1001,7 @@ static HRESULT WINAPI doc_onclick_attached(IDispatchEx *iface, DISPID id, LCID l CHECK_EXPECT(doc_onclick_attached); test_attached_event_args(id, wFlags, pdp, pvarRes, pei); - test_event_src("DIV"); + test_event_src(L"DIV"); return S_OK; } @@ -1019,7 +1013,7 @@ static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WOR CHECK_EXPECT(body_onclick); /* Native IE returns undocumented DIID in IE9+ mode */ test_event_args(document_mode < 9 ? &DIID_DispHTMLBody : NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("DIV"); + test_event_src(L"DIV"); return S_OK; } @@ -1031,7 +1025,7 @@ static HRESULT WINAPI div_onclick_capture(IDispatchEx *iface, DISPID id, LCID lc CHECK_EXPECT(div_onclick_capture); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("DIV"); + test_event_src(L"DIV"); return S_OK; } @@ -1043,7 +1037,7 @@ static HRESULT WINAPI div_onclick_bubble(IDispatchEx *iface, DISPID id, LCID lci CHECK_EXPECT(div_onclick_bubble); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("DIV"); + test_event_src(L"DIV"); return S_OK; } @@ -1054,7 +1048,7 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD { CHECK_EXPECT(img_onload); test_event_args(&DIID_DispHTMLImg, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("IMG"); + test_event_src(L"IMG"); return S_OK; } @@ -1065,7 +1059,7 @@ static HRESULT WINAPI link_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD { CHECK_EXPECT(link_onload); test_event_args(&DIID_DispHTMLLinkElement, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("LINK"); + test_event_src(L"LINK"); return S_OK; } @@ -1094,7 +1088,7 @@ static HRESULT WINAPI img_onerror(IDispatchEx *iface, DISPID id, LCID lcid, WORD { CHECK_EXPECT(img_onerror); test_event_args(&DIID_DispHTMLImg, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("IMG"); + test_event_src(L"IMG"); return S_OK; } @@ -1105,7 +1099,7 @@ static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WO { CHECK_EXPECT(input_onfocus); test_event_args(&DIID_DispHTMLInputElement, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); return S_OK; } @@ -1116,7 +1110,7 @@ static HRESULT WINAPI div_onfocusin(IDispatchEx *iface, DISPID id, LCID lcid, WO { CHECK_EXPECT(div_onfocusin); test_event_args(NULL /* FIXME: &DIID_DispHTMLDivElement */, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); return S_OK; } @@ -1127,7 +1121,7 @@ static HRESULT WINAPI div_onfocusout(IDispatchEx *iface, DISPID id, LCID lcid, W { CHECK_EXPECT(div_onfocusout); test_event_args(NULL /* FIXME: &DIID_DispHTMLDivElement */, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); return S_OK; } @@ -1138,7 +1132,7 @@ static HRESULT WINAPI input_onblur(IDispatchEx *iface, DISPID id, LCID lcid, WOR { CHECK_EXPECT(input_onblur); test_event_args(&DIID_DispHTMLInputElement, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); return S_OK; } @@ -1149,7 +1143,7 @@ static HRESULT WINAPI form_onsubmit(IDispatchEx *iface, DISPID id, LCID lcid, WO { CHECK_EXPECT(form_onsubmit); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("FORM"); + test_event_src(L"FORM"); V_VT(pvarRes) = VT_BOOL; V_BOOL(pvarRes) = VARIANT_FALSE; @@ -1174,7 +1168,7 @@ static HRESULT WINAPI submit_onclick(IDispatchEx *iface, DISPID id, LCID lcid, W { CHECK_EXPECT(submit_onclick); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); V_VT(pvarRes) = VT_BOOL; V_BOOL(pvarRes) = VARIANT_FALSE; @@ -1188,7 +1182,7 @@ static HRESULT WINAPI iframe_onload(IDispatchEx *iface, DISPID id, LCID lcid, WO { CHECK_EXPECT(iframe_onload); test_event_args(&DIID_DispHTMLIFrame, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("IFRAME"); + test_event_src(L"IFRAME"); return S_OK; } @@ -1199,7 +1193,7 @@ static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCI { CHECK_EXPECT(submit_onclick_attached); test_attached_event_args(id, wFlags, pdp, pvarRes, pei); - test_event_src("INPUT"); + test_event_src(L"INPUT"); V_VT(pvarRes) = VT_BOOL; V_BOOL(pvarRes) = VARIANT_FALSE; @@ -1216,7 +1210,7 @@ static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, D CHECK_EXPECT(submit_onclick_attached_check_cancel); test_attached_event_args(id, wFlags, pdp, pvarRes, pei); - test_event_src("INPUT"); + test_event_src(L"INPUT"); event = NULL; hres = IHTMLWindow2_get_event(window, &event); @@ -1240,7 +1234,7 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID CHECK_EXPECT(submit_onclick_setret); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); event = NULL; hres = IHTMLWindow2_get_event(window, &event); @@ -1280,7 +1274,7 @@ static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID CHECK_EXPECT(submit_onclick_cancel); test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("INPUT"); + test_event_src(L"INPUT"); event = NULL; hres = IHTMLWindow2_get_event(window, &event); @@ -1331,7 +1325,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L HRESULT hres; test_event_args(document_mode < 9 ? &DIID_DispHTMLIFrame : NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); - test_event_src("IFRAME"); + test_event_src(L"IFRAME"); elem = get_event_src(); elem2 = get_elem2_iface((IUnknown*)elem); @@ -1365,16 +1359,16 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L ok(!lstrcmpW(str, str2), "unexpected document readyState %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); - if(!strcmp_wa(str, "loading")) { + if(!lstrcmpW(str, L"loading")) { CHECK_EXPECT(iframe_onreadystatechange_loading); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&iframedoc_onreadystatechange_obj; hres = IHTMLDocument2_put_onreadystatechange(iframe_doc, v); ok(hres == S_OK, "put_onreadystatechange: %08x\n", hres); - }else if(!strcmp_wa(str, "interactive")) + }else if(!lstrcmpW(str, L"interactive")) CHECK_EXPECT(iframe_onreadystatechange_interactive); - else if(!strcmp_wa(str, "complete")) + else if(!lstrcmpW(str, L"complete")) CHECK_EXPECT(iframe_onreadystatechange_complete); else ok(0, "unexpected state %s\n", wine_dbgstr_w(str)); @@ -1854,7 +1848,7 @@ static void test_onclick(IHTMLDocument2 *doc) ok(hres == S_OK, "get_onclick failed: %08x\n", hres); if(document_mode < 9) { ok(V_VT(&v) == VT_BSTR, "V_VT(onclick) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "function();"), "V_BSTR(onclick) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"function();"), "V_BSTR(onclick) = %s\n", wine_dbgstr_w(V_BSTR(&v))); }else { todo_wine ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); @@ -3216,7 +3210,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D hres = IHTMLDocument2_get_readyState(notif_doc, &state); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - if(!strcmp_wa(state, "complete")) + if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; SysFreeString(state); -- 2.24.1

3 2

[PATCH 1/2] mshtml/tests: Get rid of a2bstr() in events.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/events.c | 136 +++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4ef58df514..7ae9fa70b7 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -142,18 +142,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -292,14 +280,14 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) } #define get_elem_id(d,i) _get_elem_id(__LINE__,d,i) -static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const char *id) +static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const WCHAR *id) { IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); IHTMLElement *elem; BSTR str; HRESULT hres; - str = a2bstr(id); + str = SysAllocString(id); hres = IHTMLDocument3_getElementById(doc3, str, &elem); SysFreeString(str); IHTMLDocument3_Release(doc3); @@ -341,19 +329,19 @@ static IHTMLEventObj *_get_event_obj(unsigned line) } #define set_elem_innerhtml(e,t) _set_elem_innerhtml(__LINE__,e,t) -static void _set_elem_innerhtml(unsigned line, IHTMLElement *elem, const char *inner_html) +static void _set_elem_innerhtml(unsigned line, IHTMLElement *elem, const WCHAR *inner_html) { BSTR html; HRESULT hres; - html = a2bstr(inner_html); + html = SysAllocString(inner_html); hres = IHTMLElement_put_innerHTML(elem, html); ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); SysFreeString(html); } #define elem_fire_event(a,b,c) _elem_fire_event(__LINE__,a,b,c) -static void _elem_fire_event(unsigned line, IUnknown *unk, const char *event, VARIANT *evobj) +static void _elem_fire_event(unsigned line, IUnknown *unk, const WCHAR *event, VARIANT *evobj) { IHTMLElement3 *elem3 = _get_elem3_iface(line, unk); VARIANT_BOOL b; @@ -361,7 +349,7 @@ static void _elem_fire_event(unsigned line, IUnknown *unk, const char *event, VA HRESULT hres; b = 100; - str = a2bstr(event); + str = SysAllocString(event); in_fire_event++; hres = IHTMLElement3_fireEvent(elem3, str, evobj, &b); in_fire_event--; @@ -744,14 +732,14 @@ static void _test_event_obj(unsigned line, const char *type, const xy_test_t *xy } #define elem_attach_event(a,b,c) _elem_attach_event(__LINE__,a,b,c) -static void _elem_attach_event(unsigned line, IUnknown *unk, const char *namea, IDispatch *disp) +static void _elem_attach_event(unsigned line, IUnknown *unk, const WCHAR *namew, IDispatch *disp) { IHTMLElement2 *elem = _get_elem2_iface(line, unk); VARIANT_BOOL res; BSTR name; HRESULT hres; - name = a2bstr(namea); + name = SysAllocString(namew); hres = IHTMLElement2_attachEvent(elem, name, disp, &res); IHTMLElement2_Release(elem); SysFreeString(name); @@ -760,7 +748,7 @@ static void _elem_attach_event(unsigned line, IUnknown *unk, const char *namea, } #define add_event_listener(a,b,c,d) _add_event_listener(__LINE__,a,b,c,d) -static void _add_event_listener(unsigned line, IUnknown *unk, const char *type, IDispatch *listener, VARIANT_BOOL use_capture) +static void _add_event_listener(unsigned line, IUnknown *unk, const WCHAR *type, IDispatch *listener, VARIANT_BOOL use_capture) { IEventTarget *event_target; BSTR str; @@ -769,7 +757,7 @@ static void _add_event_listener(unsigned line, IUnknown *unk, const char *type, hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); - str = a2bstr(type); + str = SysAllocString(type); hres = IEventTarget_addEventListener(event_target, str, listener, use_capture); SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "addEventListener failed: %08x\n", hres); @@ -778,7 +766,7 @@ static void _add_event_listener(unsigned line, IUnknown *unk, const char *type, } #define remove_event_listener(a,b,c,d) _remove_event_listener(__LINE__,a,b,c,d) -static void _remove_event_listener(unsigned line, IUnknown *unk, const char *type, IDispatch *listener, VARIANT_BOOL use_capture) +static void _remove_event_listener(unsigned line, IUnknown *unk, const WCHAR *type, IDispatch *listener, VARIANT_BOOL use_capture) { IEventTarget *event_target; BSTR str; @@ -787,7 +775,7 @@ static void _remove_event_listener(unsigned line, IUnknown *unk, const char *typ hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); - str = a2bstr(type); + str = SysAllocString(type); hres = IEventTarget_removeEventListener(event_target, str, listener, use_capture); SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "removeEventListener failed: %08x\n", hres); @@ -796,13 +784,13 @@ static void _remove_event_listener(unsigned line, IUnknown *unk, const char *typ } #define elem_detach_event(a,b,c) _elem_detach_event(__LINE__,a,b,c) -static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, IDispatch *disp) +static void _elem_detach_event(unsigned line, IUnknown *unk, const WCHAR *namew, IDispatch *disp) { IHTMLElement2 *elem = _get_elem2_iface(line, unk); BSTR name; HRESULT hres; - name = a2bstr(namea); + name = SysAllocString(namew); hres = IHTMLElement2_detachEvent(elem, name, disp); IHTMLElement2_Release(elem); SysFreeString(name); @@ -810,14 +798,14 @@ static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, } #define doc_attach_event(a,b,c) _doc_attach_event(__LINE__,a,b,c) -static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const WCHAR *namew, IDispatch *disp) { IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); VARIANT_BOOL res; BSTR name; HRESULT hres; - name = a2bstr(namea); + name = SysAllocString(namew); hres = IHTMLDocument3_attachEvent(doc3, name, disp, &res); IHTMLDocument3_Release(doc3); SysFreeString(name); @@ -826,13 +814,13 @@ static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const char *na } #define doc_detach_event(a,b,c) _doc_detach_event(__LINE__,a,b,c) -static void _doc_detach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +static void _doc_detach_event(unsigned line, IHTMLDocument2 *doc, const WCHAR *namew, IDispatch *disp) { IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); BSTR name; HRESULT hres; - name = a2bstr(namea); + name = SysAllocString(namew); hres = IHTMLDocument3_detachEvent(doc3, name, disp); IHTMLDocument3_Release(doc3); SysFreeString(name); @@ -1813,7 +1801,7 @@ static const IDispatchVtbl EventDispatchVtbl = { static IDispatch EventDispatch = { &EventDispatchVtbl }; -static void set_body_html(IHTMLDocument2 *doc, const char *html) +static void set_body_html(IHTMLDocument2 *doc, const WCHAR *html) { IHTMLElement *body = doc_get_body(doc); set_elem_innerhtml(body, html); @@ -1829,17 +1817,17 @@ static void test_onclick(IHTMLDocument2 *doc) trace("onclick tests in document mode %d\n", document_mode); - set_body_html(doc, "<div id=\"clickdiv\"" + set_body_html(doc, L"<div id=\"clickdiv\"" " style=\"text-align: center; background: red; font-size: 32\">" "click here" "</div>"); register_cp((IUnknown*)doc, &IID_IDispatch, (IUnknown*)&EventDispatch); - div = get_elem_id(doc, "clickdiv"); + div = get_elem_id(doc, L"clickdiv"); - elem_attach_event((IUnknown*)div, "abcde", (IDispatch*)&nocall_obj); - elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_attached_obj); + elem_attach_event((IUnknown*)div, L"abcde", (IDispatch*)&nocall_obj); + elem_attach_event((IUnknown*)div, L"onclick", (IDispatch*)&div_onclick_attached_obj); V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); @@ -1856,7 +1844,7 @@ static void test_onclick(IHTMLDocument2 *doc) ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("function();"); + V_BSTR(&v) = SysAllocString(L"function();"); hres = IHTMLElement_put_onclick(div, v); ok(hres == S_OK, "put_onclick failed: %08x\n", hres); SysFreeString(V_BSTR(&v)); @@ -1907,8 +1895,8 @@ static void test_onclick(IHTMLDocument2 *doc) VariantClear(&v); if(document_mode >= 9) { - add_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); - add_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); + add_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); + add_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); } body = doc_get_body(doc); @@ -1962,7 +1950,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(invoke_onclick); V_VT(&v) = VT_EMPTY; - elem_fire_event((IUnknown*)div, "onclick", &v); + elem_fire_event((IUnknown*)div, L"onclick", &v); CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_attached); @@ -1972,8 +1960,8 @@ static void test_onclick(IHTMLDocument2 *doc) events_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); events2_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, (IUnknown*)&doccp2_obj); - elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); - doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); + elem_attach_event((IUnknown*)div, L"onclick", (IDispatch*)&div_onclick_disp); + doc_attach_event(doc, L"onclick", (IDispatch*)&doc_onclick_attached_obj); SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_disp); @@ -2055,14 +2043,14 @@ static void test_onclick(IHTMLDocument2 *doc) ok(hres == S_OK, "get_onclick failed: %08x\n", hres); ok(V_VT(&v) == VT_NULL, "get_onclick returned vt %d\n", V_VT(&v)); - elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); - elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); - elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); - doc_detach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); + elem_detach_event((IUnknown*)div, L"onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, L"onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, L"test", (IDispatch*)&div_onclick_disp); + doc_detach_event(doc, L"onclick", (IDispatch*)&doc_onclick_attached_obj); if(document_mode >= 9) { - remove_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); - remove_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); + remove_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); + remove_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); } SET_EXPECT(div_onclick_attached); @@ -2091,7 +2079,7 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) BSTR str; HRESULT hres; - elem = get_elem_id(doc, "iframe"); + elem = get_elem_id(doc, L"iframe"); elem2 = get_elem2_iface((IUnknown*)elem); IHTMLElement_Release(elem); @@ -2115,7 +2103,7 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) IHTMLElement2_Release(elem2); ok(hres == S_OK, "Could not get IHTMLFrameBase iface: %08x\n", hres); - hres = IHTMLFrameBase_put_src(iframe, (str = a2bstr("about:blank"))); + hres = IHTMLFrameBase_put_src(iframe, (str = SysAllocString(L"about:blank"))); SysFreeString(str); ok(hres == S_OK, "put_src failed: %08x\n", hres); @@ -2140,7 +2128,7 @@ static void test_imgload(IHTMLDocument2 *doc) BSTR str; HRESULT hres; - elem = get_elem_id(doc, "imgid"); + elem = get_elem_id(doc, L"imgid"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLImgElement, (void**)&img); IHTMLElement_Release(elem); ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08x\n", hres); @@ -2174,7 +2162,7 @@ static void test_imgload(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&img_onerror_obj, "V_DISPATCH(onerror) != onerrorFunc\n"); VariantClear(&v); - str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); + str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str); @@ -2185,7 +2173,7 @@ static void test_imgload(IHTMLDocument2 *doc) SET_EXPECT(img_onerror); - str = a2bstr("about:blank"); + str = SysAllocString(L"about:blank"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str); @@ -2197,7 +2185,7 @@ static void test_imgload(IHTMLDocument2 *doc) IHTMLImgElement_Release(img); /* test onload on unattached image */ - hres = IHTMLDocument2_createElement(doc, (str = a2bstr("img")), &elem); + hres = IHTMLDocument2_createElement(doc, (str = SysAllocString(L"img")), &elem); SysFreeString(str); ok(hres == S_OK, "createElement(img) failed: %08x\n", hres); @@ -2222,7 +2210,7 @@ static void test_imgload(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&unattached_img_onload_obj, "incorrect V_DISPATCH(onload)\n"); VariantClear(&v); - str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); + str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str); @@ -2242,7 +2230,7 @@ static void test_link_load(IHTMLDocument2 *doc) BSTR str; HRESULT hres; - elem = get_elem_id(doc, "linkid"); + elem = get_elem_id(doc, L"linkid"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLLinkElement, (void**)&link); IHTMLElement_Release(elem); ok(hres == S_OK, "Could not get IHTMLLinkElement iface: %08x\n", hres); @@ -2264,7 +2252,7 @@ static void test_link_load(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&link_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); VariantClear(&v); - str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/styles.css"); + str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/styles.css"); hres = IHTMLLinkElement_put_href(link, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str); @@ -2284,11 +2272,11 @@ static void test_focus(IHTMLDocument2 *doc) VARIANT v; HRESULT hres; - elem = get_elem_id(doc, "inputid"); + elem = get_elem_id(doc, L"inputid"); elem2 = get_elem2_iface((IUnknown*)elem); IHTMLElement_Release(elem); - elem = get_elem_id(doc, "divid"); + elem = get_elem_id(doc, L"divid"); div = get_elem4_iface((IUnknown*)elem); IHTMLElement_Release(elem); @@ -2350,7 +2338,7 @@ static void test_focus(IHTMLDocument2 *doc) SET_EXPECT(div_onfocusin); V_VT(&v) = VT_EMPTY; - elem_fire_event((IUnknown*)elem2, "onfocusin", &v); + elem_fire_event((IUnknown*)elem2, L"onfocusin", &v); CHECK_CALLED(div_onfocusin); V_VT(&v) = VT_DISPATCH; @@ -2387,12 +2375,12 @@ static void test_submit(IHTMLDocument2 *doc) HRESULT hres; set_body_html(doc, - "<form id=\"formid\" method=\"post\" action=\"about:blank\">" + L"<form id=\"formid\" method=\"post\" action=\"about:blank\">" "<input type=\"text\" value=\"test\" name=\"i\"/>" "<input type=\"submit\" id=\"submitid\" />" "</form>"); - elem = get_elem_id(doc, "formid"); + elem = get_elem_id(doc, L"formid"); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&form_onclick_obj; @@ -2410,7 +2398,7 @@ static void test_submit(IHTMLDocument2 *doc) IHTMLFormElement_Release(form); - submit = get_elem_id(doc, "submitid"); + submit = get_elem_id(doc, L"submitid"); SET_EXPECT(form_onclick); SET_EXPECT(form_onsubmit); @@ -2431,7 +2419,7 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(form_onclick); CHECK_CALLED(submit_onclick); - elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + elem_attach_event((IUnknown*)submit, L"onclick", (IDispatch*)&submit_onclick_attached_obj); SET_EXPECT(form_onclick); SET_EXPECT(submit_onclick); @@ -2453,7 +2441,7 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(form_onclick); CHECK_CALLED(submit_onclick_attached); - elem_detach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + elem_detach_event((IUnknown*)submit, L"onclick", (IDispatch*)&submit_onclick_attached_obj); cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_onclick_cancel_obj); @@ -2517,8 +2505,8 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); - elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); - elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_check_cancel_obj); + elem_attach_event((IUnknown*)submit, L"onclick", (IDispatch*)&submit_onclick_attached_obj); + elem_attach_event((IUnknown*)submit, L"onclick", (IDispatch*)&submit_onclick_attached_check_cancel_obj); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&submit_onclick_cancel_obj; @@ -2650,7 +2638,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) trace("iframe tests...\n"); - element = get_elem_id(doc, "ifr"); + element = get_elem_id(doc, L"ifr"); iframe = get_iframe_iface((IUnknown*)element); IHTMLElement_Release(element); @@ -2680,7 +2668,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IHTMLFrameBase2_Release(frame_base2); - str = a2bstr("about:blank"); + str = SysAllocString(L"about:blank"); hres = IHTMLDocument2_put_URL(iframes_doc, str); ok(hres == S_OK, "put_URL failed: %08x\n", hres); SysFreeString(str); @@ -2689,7 +2677,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) pump_msgs(&called_iframe_onload); CHECK_CALLED(iframe_onload); - str = a2bstr("about:test"); + str = SysAllocString(L"about:test"); hres = IHTMLDocument2_put_URL(iframes_doc, str); ok(hres == S_OK, "put_URL failed: %08x\n", hres); SysFreeString(str); @@ -2724,7 +2712,7 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentEvent, (void**)&doc_event); ok(hres == S_OK, "Could not get IDocumentEvent iface: %08x\n", hres); - str = a2bstr("Event"); + str = SysAllocString(L"Event"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); @@ -2771,7 +2759,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); - str = a2bstr("MouseEvent"); + str = SysAllocString(L"MouseEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); @@ -2785,7 +2773,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); - str = a2bstr("UIEvent"); + str = SysAllocString(L"UIEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); @@ -2798,7 +2786,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); - str = a2bstr("KeyboardEvent"); + str = SysAllocString(L"KeyboardEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); @@ -2812,7 +2800,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); - str = a2bstr("CustomEvent"); + str = SysAllocString(L"CustomEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); -- 2.24.1

3 2

[PATCH 2/2] mshtml/tests: Get rid of a2bstr() in dom.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/dom.c | 485 +++++++++++++++++++--------------------- 1 file changed, 235 insertions(+), 250 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 64c20e11e6..024ea21324 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -563,21 +563,6 @@ static const elem_type_info_t elem_type_infos[] = { {L"tspan", tspan_iids, NULL} }; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -801,7 +786,7 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const CLSI } #define set_dispex_value(a,b,c) _set_dispex_value(__LINE__,a,b,c) -static void _set_dispex_value(unsigned line, IUnknown *unk, const char *name, VARIANT *val) +static void _set_dispex_value(unsigned line, IUnknown *unk, const WCHAR *name, VARIANT *val) { IDispatchEx *dispex = _get_dispex_iface(line, unk); DISPPARAMS dp = {val, NULL, 1, 0}; @@ -810,7 +795,7 @@ static void _set_dispex_value(unsigned line, IUnknown *unk, const char *name, VA BSTR str; HRESULT hres; - str = a2bstr(name); + str = SysAllocString(name); hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure|fdexNameCaseInsensitive, &id); SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -1268,7 +1253,7 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * } #define test_elem_attr(e,n,v) _test_elem_attr(__LINE__,e,n,v) -static void _test_elem_attr(unsigned line, IHTMLElement *elem, const char *name, const WCHAR *exval) +static void _test_elem_attr(unsigned line, IHTMLElement *elem, const WCHAR *name, const WCHAR *exval) { VARIANT value; BSTR tmp; @@ -1276,7 +1261,7 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, const char *name, VariantInit(&value); - tmp = a2bstr(name); + tmp = SysAllocString(name); hres = IHTMLElement_getAttribute(elem, tmp, 0, &value); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "getAttribute failed: %08x\n", hres); @@ -1391,12 +1376,12 @@ static void _test_window_status(unsigned line, IHTMLWindow2 *window) } #define set_window_status(w,n) _set_window_status(__LINE__,w,n) -static void _set_window_status(unsigned line, IHTMLWindow2 *window, const char *status) +static void _set_window_status(unsigned line, IHTMLWindow2 *window, const WCHAR *status) { BSTR str; HRESULT hres; - str = a2bstr(status); + str = SysAllocString(status); hres = IHTMLWindow2_put_status(window, str); SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "put_status failed: %08x\n", hres); @@ -1580,13 +1565,13 @@ static void _test_anchor_rel(unsigned line, IUnknown *unk, const WCHAR *exrel) } #define test_anchor_put_rel(a,h) _test_anchor_put_rel(__LINE__,a,h) -static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const char *exrel) +static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const WCHAR *exrel) { IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); BSTR str; HRESULT hres; - str = a2bstr(exrel); + str = SysAllocString(exrel); hres = IHTMLAnchorElement_put_rel(anchor, str); ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); SysFreeString(str); @@ -1609,13 +1594,13 @@ static void _test_anchor_get_target(unsigned line, IUnknown *unk, const WCHAR *t } #define test_anchor_put_target(a,h) _test_anchor_put_target(__LINE__,a,h) -static void _test_anchor_put_target(unsigned line, IUnknown *unk, const char *target) +static void _test_anchor_put_target(unsigned line, IUnknown *unk, const WCHAR *target) { IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); BSTR str; HRESULT hres; - str = target ? a2bstr(target) : NULL; + str = target ? SysAllocString(target) : NULL; hres = IHTMLAnchorElement_put_target(anchor, str); ok_(__FILE__,line)(hres == S_OK, "put_target failed: %08x\n", hres); SysFreeString(str); @@ -1687,13 +1672,13 @@ static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *sear } #define test_anchor_put_search(a,h) _test_anchor_put_search(__LINE__,a,h) -static void _test_anchor_put_search(unsigned line, IUnknown *unk, const char *search) +static void _test_anchor_put_search(unsigned line, IUnknown *unk, const WCHAR *search) { IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); BSTR str; HRESULT hres; - str = search ? a2bstr(search) : NULL; + str = search ? SysAllocString(search) : NULL; hres = IHTMLAnchorElement_put_search(anchor, str); ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); SysFreeString(str); @@ -2333,12 +2318,12 @@ static void _test_select_value(unsigned line, IHTMLSelectElement *select, const } #define test_select_set_value(s,v) _test_select_set_value(__LINE__,s,v) -static void _test_select_set_value(unsigned line, IHTMLSelectElement *select, const char *val) +static void _test_select_set_value(unsigned line, IHTMLSelectElement *select, const WCHAR *val) { BSTR bstr; HRESULT hres; - bstr = a2bstr(val); + bstr = SysAllocString(val); hres = IHTMLSelectElement_put_value(select, bstr); SysFreeString(bstr); ok_(__FILE__,line) (hres == S_OK, "put_value failed: %08x\n", hres); @@ -2421,12 +2406,12 @@ static void _test_select_name(unsigned line, IHTMLSelectElement *select, const W } #define test_select_set_name(s,v) _test_select_set_name(__LINE__,s,v) -static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, const char *text) +static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, const WCHAR *text) { HRESULT hres; BSTR bstr; - bstr = a2bstr(text); + bstr = SysAllocString(text); hres = IHTMLSelectElement_put_name(select, bstr); ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08x\n", wine_dbgstr_w(bstr), hres); @@ -2512,10 +2497,10 @@ static void _test_range_moveend(unsigned line, IHTMLTxtRange *range, LPWSTR unit } #define test_range_put_text(r,t) _test_range_put_text(__LINE__,r,t) -static void _test_range_put_text(unsigned line, IHTMLTxtRange *range, const char *text) +static void _test_range_put_text(unsigned line, IHTMLTxtRange *range, const WCHAR *text) { HRESULT hres; - BSTR bstr = a2bstr(text); + BSTR bstr = SysAllocString(text); hres = IHTMLTxtRange_put_text(range, bstr); ok_(__FILE__,line) (hres == S_OK, "put_text failed: %08x\n", hres); @@ -2558,9 +2543,9 @@ static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa } #define test_range_paste_html(a,b) _test_range_paste_html(__LINE__,a,b) -static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const char *html) +static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const WCHAR *html) { - BSTR str = a2bstr(html); + BSTR str = SysAllocString(html); HRESULT hres; hres = IHTMLTxtRange_pasteHTML(range, str); @@ -2928,9 +2913,9 @@ static void _test_elem_outertext(unsigned line, IHTMLElement *elem, const WCHAR } #define test_elem_set_outertext(e,t) _test_elem_set_outertext(__LINE__,e,t) -static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const char *text) +static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const WCHAR *text) { - BSTR str = a2bstr(text); + BSTR str = SysAllocString(text); HRESULT hres; hres = IHTMLElement_put_outerText(elem, str); @@ -2968,13 +2953,13 @@ static void _test_elem_innerhtml(unsigned line, IUnknown *unk, const WCHAR *inne } #define test_elem_set_innerhtml(e,t) _test_elem_set_innerhtml(__LINE__,e,t) -static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const char *inner_html) +static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const WCHAR *inner_html) { IHTMLElement *elem = _get_elem_iface(line, unk); BSTR html; HRESULT hres; - html = a2bstr(inner_html); + html = SysAllocString(inner_html); hres = IHTMLElement_put_innerHTML(elem, html); ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); @@ -2983,13 +2968,13 @@ static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const char *i } #define test_elem_set_outerhtml(e,t) _test_elem_set_outerhtml(__LINE__,e,t) -static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) +static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const WCHAR *outer_html) { IHTMLElement *elem = _get_elem_iface(line, unk); BSTR html; HRESULT hres; - html = a2bstr(outer_html); + html = SysAllocString(outer_html); hres = IHTMLElement_put_outerHTML(elem, html); ok_(__FILE__,line)(hres == S_OK, "put_outerHTML failed: %08x\n", hres); @@ -3211,10 +3196,10 @@ static void _test_text_data(unsigned line, IUnknown *unk, const WCHAR *exdata) } #define set_text_data(a,b) _set_text_data(__LINE__,a,b) -static void _set_text_data(unsigned line, IUnknown *unk, const char *data) +static void _set_text_data(unsigned line, IUnknown *unk, const WCHAR *data) { IHTMLDOMTextNode *text = _get_text_iface(line, unk); - BSTR str = a2bstr(data); + BSTR str = SysAllocString(data); HRESULT hres; hres = IHTMLDOMTextNode_put_data(text, str); @@ -3224,10 +3209,10 @@ static void _set_text_data(unsigned line, IUnknown *unk, const char *data) } #define text_append_data(a,b) _text_append_data(__LINE__,a,b) -static void _text_append_data(unsigned line, IUnknown *unk, const char *data) +static void _text_append_data(unsigned line, IUnknown *unk, const WCHAR *data) { IHTMLDOMTextNode2 *text = _get_text2_iface(line, unk); - BSTR str = a2bstr(data); + BSTR str = SysAllocString(data); HRESULT hres; hres = IHTMLDOMTextNode2_appendData(text, str); @@ -3389,13 +3374,13 @@ static void _test_img_src(unsigned line, IUnknown *unk, const WCHAR *exsrc, cons } #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) -static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) +static void _test_img_set_src(unsigned line, IUnknown *unk, const WCHAR *src) { IHTMLImgElement *img = _get_img_iface(line, unk); BSTR tmp; HRESULT hres; - tmp = a2bstr(src); + tmp = SysAllocString(src); hres = IHTMLImgElement_put_src(img, tmp); IHTMLImgElement_Release(img); SysFreeString(tmp); @@ -4348,13 +4333,13 @@ static void _test_elem_title(unsigned line, IUnknown *unk, const WCHAR *extitle) } #define test_elem_set_title(u,t) _test_elem_set_title(__LINE__,u,t) -static void _test_elem_set_title(unsigned line, IUnknown *unk, const char *title) +static void _test_elem_set_title(unsigned line, IUnknown *unk, const WCHAR *title) { IHTMLElement *elem = _get_elem_iface(line, unk); BSTR tmp; HRESULT hres; - tmp = a2bstr(title); + tmp = SysAllocString(title); hres = IHTMLElement_put_title(elem, tmp); ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); @@ -4384,14 +4369,14 @@ static void _test_node_get_value_str(unsigned line, IUnknown *unk, const WCHAR * } #define test_node_put_value_str(u,v) _test_node_put_value_str(__LINE__,u,v) -static void _test_node_put_value_str(unsigned line, IUnknown *unk, const char *val) +static void _test_node_put_value_str(unsigned line, IUnknown *unk, const WCHAR *val) { IHTMLDOMNode *node = _get_node_iface(line, unk); VARIANT var; HRESULT hres; V_VT(&var) = VT_BSTR; - V_BSTR(&var) = a2bstr(val); + V_BSTR(&var) = SysAllocString(val); hres = IHTMLDOMNode_put_nodeValue(node, var); ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); @@ -4952,10 +4937,10 @@ static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) } #define get_elem_attr_node(a,b,c) _get_elem_attr_node(__LINE__,a,b,c) -static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, const char *attr_name, BOOL expect_success) +static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, const WCHAR *attr_name, BOOL expect_success) { IHTMLElement4 *elem = _get_elem4_iface(line, unk); - BSTR str = a2bstr(attr_name); + BSTR str = SysAllocString(attr_name); IHTMLDOMAttribute *attr; HRESULT hres; @@ -4993,10 +4978,10 @@ static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT } #define put_attr_value(a,b) _put_attr_value(__LINE__,a,b) -static void _put_attr_value(unsigned line, IHTMLDOMAttribute *attr, const char *value) +static void _put_attr_value(unsigned line, IHTMLDOMAttribute *attr, const WCHAR *value) { IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); - BSTR str = a2bstr(value); + BSTR str = SysAllocString(value); HRESULT hres; hres = IHTMLDOMAttribute2_put_value(attr2, str); @@ -5033,7 +5018,7 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) return elem; } -static void set_body_html(IHTMLDocument2 *doc, const char *html) +static void set_body_html(IHTMLDocument2 *doc, const WCHAR *html) { IHTMLElement *body; body = doc_get_body(doc); @@ -5042,13 +5027,13 @@ static void set_body_html(IHTMLDocument2 *doc, const char *html) } #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) -static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) +static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const WCHAR *tag) { IHTMLElement *elem = NULL; BSTR tmp; HRESULT hres; - tmp = a2bstr(tag); + tmp = SysAllocString(tag); hres = IHTMLDocument2_createElement(doc, tmp, &elem); ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); @@ -5058,7 +5043,7 @@ static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const } #define test_create_text(d,t) _test_create_text(__LINE__,d,t) -static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const char *text) +static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const WCHAR *text) { IHTMLDocument3 *doc3; IHTMLDOMNode *node = NULL; @@ -5068,7 +5053,7 @@ static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3: %08x\n", hres); - tmp = a2bstr(text); + tmp = SysAllocString(text); hres = IHTMLDocument3_createTextNode(doc3, tmp, &node); IHTMLDocument3_Release(doc3); SysFreeString(tmp); @@ -5204,7 +5189,7 @@ static void test_elem_bounding_client_rect(IUnknown *unk) IHTMLElement2_Release(elem2); } -static void test_elem_col_item(IHTMLElementCollection *col, const char *n, +static void test_elem_col_item(IHTMLElementCollection *col, const WCHAR *n, const elem_type_t *elem_types, LONG len) { IDispatch *disp; @@ -5214,7 +5199,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, V_VT(&index) = VT_EMPTY; V_VT(&name) = VT_BSTR; - V_BSTR(&name) = a2bstr(n); + V_BSTR(&name) = SysAllocString(n); hres = IHTMLElementCollection_item(col, name, index, &disp); ok(hres == S_OK, "item failed: %08x\n", hres); @@ -5253,7 +5238,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, SysFreeString(V_BSTR(&name)); } -static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id, BOOL expect_success) +static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id, BOOL expect_success) { IHTMLElementCollection *col; IHTMLElement *elem; @@ -5269,7 +5254,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id, BOOL ex V_VT(&index) = VT_EMPTY; V_VT(&name) = VT_BSTR; - V_BSTR(&name) = a2bstr(id); + V_BSTR(&name) = SysAllocString(id); hres = IHTMLElementCollection_item(col, name, index, &disp); IHTMLElementCollection_Release(col); @@ -5290,7 +5275,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id, BOOL ex return elem; } -static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const char *id) +static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) { IHTMLDocument3 *doc3; IHTMLElement *elem; @@ -5300,10 +5285,10 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const char *id) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - tmp = a2bstr(id); + tmp = SysAllocString(id); hres = IHTMLDocument3_getElementById(doc3, tmp, &elem); SysFreeString(tmp); - ok(hres == S_OK, "getElementById(%s) failed: %08x\n", id, hres); + ok(hres == S_OK, "getElementById(%s) failed: %08x\n", wine_dbgstr_w(id), hres); IHTMLDocument3_Release(doc3); @@ -5321,7 +5306,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_selidx(select, 0); test_select_put_selidx(select, 1); - test_select_set_value(select, "val1"); + test_select_set_value(select, L"val1"); test_select_value(select, L"val1"); test_select_size(select, 0); @@ -5334,7 +5319,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_size(select, 3); test_select_name(select, NULL); - test_select_set_name(select, "select-name"); + test_select_set_name(select, L"select-name"); test_select_name(select, L"select-name"); test_select_form_notfound(select); @@ -5522,11 +5507,11 @@ static void _test_doc_selection_type(unsigned line, IHTMLDocument2 *doc, const W } #define insert_adjacent_elem(a,b,c) _insert_adjacent_elem(__LINE__,a,b,c) -static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const char *where, IHTMLElement *elem) +static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const WCHAR *where, IHTMLElement *elem) { IHTMLElement2 *elem2 = _get_elem2_iface(line, (IUnknown*)parent); IHTMLElement *ret_elem = NULL; - BSTR str = a2bstr(where); + BSTR str = SysAllocString(where); HRESULT hres; hres = IHTMLElement2_insertAdjacentElement(elem2, str, elem, &ret_elem); @@ -5544,21 +5529,21 @@ static void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent static const elem_type_t br_br[] = {ET_BR, ET_BR}; static const elem_type_t br_div_br[] = {ET_BR, ET_DIV, ET_BR}; - elem = test_create_elem(doc, "BR"); + elem = test_create_elem(doc, L"BR"); elem2 = test_elem_get_parent((IUnknown*)elem); ok(!elem2, "get_parentElement returned %p\n", elem2); - insert_adjacent_elem(parent, "BeforeEnd", elem); + insert_adjacent_elem(parent, L"BeforeEnd", elem); IHTMLElement_Release(elem); test_elem_all((IUnknown*)parent, br_br, 1); - elem = test_create_elem(doc, "BR"); - insert_adjacent_elem(parent, "beforeend", elem); + elem = test_create_elem(doc, L"BR"); + insert_adjacent_elem(parent, L"beforeend", elem); test_elem_all((IUnknown*)parent, br_br, 2); - elem2 = test_create_elem(doc, "DIV"); - insert_adjacent_elem(elem, "beforebegin", elem2); + elem2 = test_create_elem(doc, L"DIV"); + insert_adjacent_elem(elem, L"beforebegin", elem2); IHTMLElement_Release(elem2); IHTMLElement_Release(elem); @@ -5597,10 +5582,10 @@ static IHTMLTxtRange *_range_duplicate(unsigned line, IHTMLTxtRange *range) } #define test_range_set_end_point(a,b,c,d) _test_range_set_end_point(__LINE__,a,b,c,d) -static void _test_range_set_end_point(unsigned line, IHTMLTxtRange *range, const char *how, +static void _test_range_set_end_point(unsigned line, IHTMLTxtRange *range, const WCHAR *how, IHTMLTxtRange *ref_range, HRESULT exhres) { - BSTR str = a2bstr(how); + BSTR str = SysAllocString(how); HRESULT hres; hres = IHTMLTxtRange_setEndPoint(range, str, ref_range); @@ -5616,7 +5601,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLElement *body; HRESULT hres; - set_body_html(doc, "test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br />"); + set_body_html(doc, L"test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br />"); body_range = test_create_body_range(doc); @@ -5738,7 +5723,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_collapse(range, TRUE); test_range_expand(range, wordW, VARIANT_TRUE, L"test "); - test_range_put_text(range, "word"); + test_range_put_text(range, L"word"); test_range_text(body_range, L"wordabc 123\r\nit's text"); test_range_text(range, NULL); test_range_moveend(range, characterW, 3, 3); @@ -5781,7 +5766,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_move(range, characterW, 3, 3); test_range_expand(range, wordW, VARIANT_TRUE, L"wordabc "); test_range_moveend(range, characterW, -4, -4); - test_range_put_text(range, "abc def "); + test_range_put_text(range, L"abc def "); test_range_expand(range, texteditW, VARIANT_TRUE, L"abc def abc 123\r\nit's text"); test_range_move(range, wordW, 1, 1); test_range_movestart(range, characterW, -1, -1); @@ -5789,7 +5774,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_move(range, wordW, 1, 1); test_range_moveend(range, characterW, 3, 3); test_range_text(range, L"def"); - test_range_put_text(range, "xyz"); + test_range_put_text(range, L"xyz"); test_range_moveend(range, characterW, 1, 1); test_range_move(range, wordW, 1, 1); test_range_moveend(range, characterW, 2, 2); @@ -5808,7 +5793,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, L"xyz abc 123"); test_range_collapse(range, VARIANT_TRUE); - test_range_paste_html(range, "<br>paste<br>"); + test_range_paste_html(range, L"<br>paste<br>"); test_range_text(range, NULL); test_range_moveend(range, characterW, 3, 3); @@ -5826,26 +5811,26 @@ static void test_txtrange(IHTMLDocument2 *doc) range2 = range_duplicate(range); - test_range_set_end_point(range, "starttostart", body_range, S_OK); + test_range_set_end_point(range, L"starttostart", body_range, S_OK); test_range_text(range, L"abc \r\npaste"); - test_range_set_end_point(range, "endtoend", body_range, S_OK); + test_range_set_end_point(range, L"endtoend", body_range, S_OK); test_range_text(range, L"abc \r\npaste\r\nxyz abc 123\r\nit's text"); - test_range_set_end_point(range, "starttoend", range2, S_OK); + test_range_set_end_point(range, L"starttoend", range2, S_OK); test_range_text(range, L"\r\nxyz abc 123\r\nit's text"); - test_range_set_end_point(range, "starttostart", body_range, S_OK); - test_range_set_end_point(range, "endtostart", range2, S_OK); + test_range_set_end_point(range, L"starttostart", body_range, S_OK); + test_range_set_end_point(range, L"endtostart", range2, S_OK); test_range_text(range, L"abc "); - test_range_set_end_point(range, "starttoend", body_range, S_OK); + test_range_set_end_point(range, L"starttoend", body_range, S_OK); test_range_text(range, L"paste\r\nxyz abc 123\r\nit's text"); - test_range_set_end_point(range, "EndToStart", body_range, S_OK); + test_range_set_end_point(range, L"EndToStart", body_range, S_OK); test_range_text(range, L"abc "); - test_range_set_end_point(range, "xxx", body_range, E_INVALIDARG); + test_range_set_end_point(range, L"xxx", body_range, E_INVALIDARG); hres = IHTMLTxtRange_select(range); ok(hres == S_OK, "select failed: %08x\n", hres); @@ -5857,7 +5842,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(body_range); IHTMLElement_Release(body); - set_body_html(doc, "<html><body>abc<hr />123<br /><hr />def</body></html>"); + set_body_html(doc, L"<html><body>abc<hr />123<br /><hr />def</body></html>"); range = test_create_body_range(doc); @@ -6113,13 +6098,13 @@ static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebas } #define set_framebase_marginheight(a,b) _set_framebase_marginheight(__LINE__,a,b) -static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *val) +static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const WCHAR *val) { VARIANT v; HRESULT hres; V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr(val); + V_BSTR(&v) = SysAllocString(val); hres = IHTMLFrameBase_put_marginHeight(framebase, v); ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); VariantClear(&v); @@ -6142,13 +6127,13 @@ static void _test_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase } #define set_framebase_marginwidth(a,b) _set_framebase_marginwidth(__LINE__,a,b) -static void _set_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const char *val) +static void _set_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const WCHAR *val) { VARIANT v; HRESULT hres; V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr(val); + V_BSTR(&v) = SysAllocString(val); hres = IHTMLFrameBase_put_marginWidth(framebase, v); ok_(__FILE__,line)(hres == S_OK, "put_marginWidth failed: %08x\n", hres); VariantClear(&v); @@ -6205,11 +6190,11 @@ static void test_framebase(IUnknown *unk) SysFreeString(str); test_framebase_marginheight(fbase, NULL); - set_framebase_marginheight(fbase, "1px"); + set_framebase_marginheight(fbase, L"1px"); test_framebase_marginheight(fbase, L"1"); test_framebase_marginwidth(fbase, NULL); - set_framebase_marginwidth(fbase, "2px"); + set_framebase_marginwidth(fbase, L"2px"); test_framebase_marginwidth(fbase, L"2"); IHTMLFrameBase_Release(fbase); @@ -6927,7 +6912,7 @@ static void test_window(IHTMLDocument2 *doc) test_window_length(window, 0); test_screen(window); test_window_status(window); - set_window_status(window, "Test!"); + set_window_status(window, L"Test!"); test_history(window); hres = IHTMLWindow2_moveBy(window, 0, 0); @@ -7426,7 +7411,7 @@ static void test_button_elem(IHTMLElement *elem) #define test_tr_possess(e,r,l,i) _test_tr_possess(__LINE__,e,r,l,i) static void _test_tr_possess(unsigned line, IHTMLElement *elem, - IHTMLTableRow *row, LONG len, const char *id) + IHTMLTableRow *row, LONG len, const WCHAR *id) { IHTMLElementCollection *col; IDispatch *disp; @@ -7443,9 +7428,9 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, ok_(__FILE__, line)(lval == len, "expected len = %d, got %d\n", len, lval); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = a2bstr(id); + V_BSTR(&var) = SysAllocString(id); hres = IHTMLElementCollection_tags(col, var, &disp); - ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08x\n", id, hres); + ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08x\n", wine_dbgstr_w(id), hres); ok_(__FILE__, line)(disp != NULL, "disp == NULL\n"); VariantClear(&var); @@ -7461,7 +7446,7 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); - test_tr_possess(elem, row, 1, "td2"); + test_tr_possess(elem, row, 1, L"td2"); hres = IHTMLTableRow_insertCell(row, 0, &disp); ok(hres == S_OK, "insertCell failed: %08x\n", hres); @@ -7471,7 +7456,7 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) ok(cell != NULL, "cell == NULL\n"); if (SUCCEEDED(hres)) IHTMLTableCell_Release(cell); - test_tr_possess(elem, row, 2, "td2"); + test_tr_possess(elem, row, 2, L"td2"); IDispatch_Release(disp); } @@ -7582,13 +7567,13 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) VARIANT vbg, vDefaultbg; test_elem_set_innerhtml((IUnknown*)div, - "<table id=\"tbl\"><tbody>" + L"<table id=\"tbl\"><tbody>" " <tr></tr>" " <tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td><td></td></tr>" " <tr></tr>" "</tbody></table>"); - elem = get_doc_elem_by_id(doc, "td1"); + elem = get_doc_elem_by_id(doc, L"td1"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); IHTMLElement_Release(elem); @@ -7997,7 +7982,7 @@ static void test_table_elem(IHTMLElement *elem) IHTMLTable_Release(table); } -static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) +static void doc_write(IHTMLDocument2 *doc, BOOL ln, const WCHAR *text) { SAFEARRAYBOUND dim; SAFEARRAY *sa; @@ -8010,7 +7995,7 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) hres = SafeArrayAccessData(sa, (void**)&var); ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(var) = VT_BSTR; - V_BSTR(var) = a2bstr(text); + V_BSTR(var) = SysAllocString(text); SafeArrayUnaccessData(sa); if(ln) @@ -8106,14 +8091,14 @@ static void _test_iframe_height(unsigned line, IHTMLElement *elem, const WCHAR * } #define set_iframe_height(a,b) _set_iframe_height(__LINE__,a,b) -static void _set_iframe_height(unsigned line, IHTMLElement *elem, const char *val) +static void _set_iframe_height(unsigned line, IHTMLElement *elem, const WCHAR *val) { IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); VARIANT v; HRESULT hres; V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr(val); + V_BSTR(&v) = SysAllocString(val); hres = IHTMLIFrameElement2_put_height(iframe, v); ok_(__FILE__,line)(hres == S_OK, "put_height failed: %08x\n", hres); VariantClear(&v); @@ -8139,14 +8124,14 @@ static void _test_iframe_width(unsigned line, IHTMLElement *elem, const WCHAR *e } #define set_iframe_width(a,b) _set_iframe_width(__LINE__,a,b) -static void _set_iframe_width(unsigned line, IHTMLElement *elem, const char *val) +static void _set_iframe_width(unsigned line, IHTMLElement *elem, const WCHAR *val) { IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); VARIANT v; HRESULT hres; V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr(val); + V_BSTR(&v) = SysAllocString(val); hres = IHTMLIFrameElement2_put_width(iframe, v); ok_(__FILE__,line)(hres == S_OK, "put_width failed: %08x\n", hres); VariantClear(&v); @@ -8196,13 +8181,13 @@ static void test_iframe_elem(IHTMLElement *elem) } test_iframe_height(elem, NULL); - set_iframe_height(elem, "100px"); - set_iframe_height(elem, "50%"); + set_iframe_height(elem, L"100px"); + set_iframe_height(elem, L"50%"); test_iframe_height(elem, L"50%"); test_iframe_width(elem, NULL); - set_iframe_width(elem, "150px"); - set_iframe_width(elem, "70%"); + set_iframe_width(elem, L"150px"); + set_iframe_width(elem, L"70%"); test_iframe_width(elem, L"70%"); test_framebase_src(elem, L"about:blank"); @@ -8216,10 +8201,10 @@ static void test_iframe_elem(IHTMLElement *elem) ok(iface_cmp((IUnknown*)disp, (IUnknown*)content_window), "disp != content_window\n"); IDispatch_Release(disp); - doc_write(content_doc, FALSE, "<html><head><title>test</title></head>"); + doc_write(content_doc, FALSE, L"<html><head><title>test</title></head>"); doc_complex_write(content_doc); - doc_write(content_doc, TRUE, "<br />"); - doc_write(content_doc, TRUE, "</html>"); + doc_write(content_doc, TRUE, L"<br />"); + doc_write(content_doc, TRUE, L"</html>"); hres = IHTMLDocument2_get_all(content_doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); @@ -8227,8 +8212,8 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLElementCollection_Release(col); body = doc_get_body(content_doc); - test_elem_attr(body, "i4val", L"4"); - test_elem_attr(body, "r8val", L"3.14"); + test_elem_attr(body, L"i4val", L"4"); + test_elem_attr(body, L"r8val", L"3.14"); IHTMLElement_Release(body); hres = IHTMLDocument2_close(content_doc); @@ -8259,9 +8244,9 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, } #define set_stylesheet_csstext(a,b,c) _set_stylesheet_csstext(__LINE__,a,b,c) -static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *csstext, BOOL is_todo) +static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const WCHAR *csstext, BOOL is_todo) { - BSTR str = a2bstr(csstext); + BSTR str = SysAllocString(csstext); HRESULT hres; hres = IHTMLStyleSheet_put_cssText(stylesheet, str); @@ -8297,11 +8282,11 @@ static void test_stylesheet(IDispatch *disp) SysFreeString(href); test_stylesheet_csstext(stylesheet, L".body {", FALSE); - set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); + set_stylesheet_csstext(stylesheet, L".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); test_stylesheet_csstext(stylesheet, L".div {", TRUE); - set_stylesheet_csstext(stylesheet, "", FALSE); + set_stylesheet_csstext(stylesheet, L"", FALSE); test_stylesheet_csstext(stylesheet, NULL, FALSE); - set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); + set_stylesheet_csstext(stylesheet, L".div { margin-right: 1px; }", FALSE); test_stylesheet_csstext(stylesheet, L".div {", FALSE); hres = IHTMLStyleSheet_get_rules(stylesheet, &col); @@ -8462,7 +8447,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) BSTR str; HRESULT hres; - test_elem_set_innerhtml((IUnknown*)div, "<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); + test_elem_set_innerhtml((IUnknown*)div, L"<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentSelector, (void**)&doc_selector); ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDocumentSelector iface: %08x\n", hres); @@ -8524,7 +8509,7 @@ static void test_elemsbyclass(IHTMLElement *div) static const elem_type_t types[] = {ET_DIV, ET_FORM}; - test_elem_set_innerhtml((IUnknown*)div, "<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); + test_elem_set_innerhtml((IUnknown*)div, L"<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); hres = IHTMLElement_QueryInterface(div, &IID_IHTMLElement6, (void**)&elem); ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLElement6 iface: %08x\n", hres); @@ -8610,7 +8595,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); - test_elem_col_item(col, "x", item_types, ARRAY_SIZE(item_types)); + test_elem_col_item(col, L"x", item_types, ARRAY_SIZE(item_types)); elem = get_elem_col_item_idx(col, 0); test_elem_source_index(elem, 0); @@ -8667,16 +8652,16 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_all((IUnknown*)elem, all_types+1, ARRAY_SIZE(all_types)-1); IHTMLElement_Release(elem); - get_elem_by_id(doc, "xxx", FALSE); - elem = get_doc_elem_by_id(doc, "xxx"); + get_elem_by_id(doc, L"xxx", FALSE); + elem = get_doc_elem_by_id(doc, L"xxx"); ok(!elem, "elem != NULL\n"); - elem = get_doc_elem_by_id(doc, "s"); + elem = get_doc_elem_by_id(doc, L"s"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_elem_type((IUnknown*)elem, ET_SELECT); - test_elem_attr(elem, "xxx", NULL); - test_elem_attr(elem, "id", L"s"); + test_elem_attr(elem, L"xxx", NULL); + test_elem_attr(elem, L"id", L"s"); test_elem_class((IUnknown*)elem, NULL); test_elem_set_class((IUnknown*)elem, L"cl"); test_elem_set_class((IUnknown*)elem, NULL); @@ -8737,7 +8722,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "s", TRUE); + elem = get_elem_by_id(doc, L"s", TRUE); if(elem) { IHTMLSelectElement *select = get_select_iface((IUnknown*)elem); IHTMLDocument2 *doc_node, *elem_doc; @@ -8746,7 +8731,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_istextedit(elem, VARIANT_FALSE); test_elem_title((IUnknown*)select, NULL); - test_elem_set_title((IUnknown*)select, "Title"); + test_elem_set_title((IUnknown*)select, L"Title"); test_elem_title((IUnknown*)select, L"Title"); test_elem_offset((IUnknown*)select, L"BODY"); test_elem_bounding_client_rect((IUnknown*)select); @@ -8773,7 +8758,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "sc", TRUE); + elem = get_elem_by_id(doc, L"sc", TRUE); if(elem) { IHTMLScriptElement *script; BSTR type; @@ -8833,7 +8818,7 @@ static void test_elems(IHTMLDocument2 *doc) set_elem_language(elem, L"xxx"); } - elem = get_elem_by_id(doc, "in", TRUE); + elem = get_elem_by_id(doc, L"in", TRUE); if(elem) { IHTMLInputElement *input; @@ -8854,7 +8839,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_istextedit(elem, VARIANT_TRUE); test_node_get_value_str((IUnknown*)elem, NULL); - test_node_put_value_str((IUnknown*)elem, "test"); + test_node_put_value_str((IUnknown*)elem, L"test"); test_node_get_value_str((IUnknown*)elem, NULL); test_input_value((IUnknown*)elem, NULL); test_input_defaultValue((IUnknown*)elem, NULL); @@ -8899,12 +8884,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "imgid", TRUE); + elem = get_elem_by_id(doc, L"imgid", TRUE); if(elem) { test_img_align((IUnknown*)elem, L"left"); test_img_name((IUnknown*)elem, L"WineImg"); test_img_src((IUnknown*)elem, L"", NULL); - test_img_set_src((IUnknown*)elem, "about:blank"); + test_img_set_src((IUnknown*)elem, L"about:blank"); test_img_src((IUnknown*)elem, L"about:blank", NULL); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, L"alt test"); @@ -8915,7 +8900,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "attr", TRUE); + elem = get_elem_by_id(doc, L"attr", TRUE); if(elem) { test_dynamic_properties(elem); test_attr_collection(elem); @@ -8923,7 +8908,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "styleid", TRUE); + elem = get_elem_by_id(doc, L"styleid", TRUE); if(elem) { test_style_media((IUnknown*)elem, NULL); test_style_put_media((IUnknown*)elem, L"screen"); @@ -8932,35 +8917,35 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "tbl"); + elem = get_doc_elem_by_id(doc, L"tbl"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_table_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "labelid"); + elem = get_doc_elem_by_id(doc, L"labelid"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_label_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "row2"); + elem = get_doc_elem_by_id(doc, L"row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_tr_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "ifr"); + elem = get_doc_elem_by_id(doc, L"ifr"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_iframe_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "btnid"); + elem = get_doc_elem_by_id(doc, L"btnid"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_button_elem(elem); @@ -8971,7 +8956,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "objid"); + elem = get_doc_elem_by_id(doc, L"objid"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_object_vspace((IUnknown*)elem, 100); @@ -8981,7 +8966,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "a", TRUE); + elem = get_elem_by_id(doc, L"a", TRUE); if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); @@ -9000,11 +8985,11 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_get_target((IUnknown*)elem, NULL); test_anchor_rel((IUnknown*)elem, NULL); - test_anchor_put_rel((IUnknown*)elem, "Next"); + test_anchor_put_rel((IUnknown*)elem, L"Next"); test_anchor_rel((IUnknown*)elem, L"Next"); /* Change the target */ - test_anchor_put_target((IUnknown*)elem, "wine"); + test_anchor_put_target((IUnknown*)elem, L"wine"); test_anchor_get_target((IUnknown*)elem, L"wine"); /* Restore the target */ @@ -9020,26 +9005,26 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_hash(elem, L"#hash"); test_anchor_search((IUnknown*)elem, L"?how", FALSE); - test_anchor_put_search((IUnknown*)elem, "?word=press"); + test_anchor_put_search((IUnknown*)elem, L"?word=press"); test_anchor_search((IUnknown*)elem, L"?word=press", FALSE); - test_anchor_put_search((IUnknown*)elem, "?????word???press"); + test_anchor_put_search((IUnknown*)elem, L"?????word???press"); test_anchor_search((IUnknown*)elem, L"?????word???press", FALSE); - test_anchor_put_search((IUnknown*)elem, "?q=%E4%BD%A0%E5%A5%BD"); /* encoded cjk characters */ + test_anchor_put_search((IUnknown*)elem, L"?q=%E4%BD%A0%E5%A5%BD"); /* encoded cjk characters */ test_anchor_search((IUnknown*)elem, L"?q=%E4%BD%A0%E5%A5%BD", FALSE); - test_anchor_put_search((IUnknown*)elem, "?how?old=are"); + test_anchor_put_search((IUnknown*)elem, L"?how?old=are"); test_anchor_search((IUnknown*)elem, L"?how?old=are", FALSE); /* due to incorrect behavior of ie6, search string without leading "?" is interpreted as part of the pathname, and cannot be accessed by get_search. */ - test_anchor_put_search((IUnknown*)elem, "word=abc"); + test_anchor_put_search((IUnknown*)elem, L"word=abc"); test_anchor_search((IUnknown*)elem, L"?word=abc", TRUE); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "metaid"); + elem = get_doc_elem_by_id(doc, L"metaid"); if(elem) { test_meta_name((IUnknown*)elem, L"meta name"); test_meta_content((IUnknown*)elem, L"text/html; charset=utf-8"); @@ -9064,7 +9049,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 3, "type=%d\n", type); test_node_get_value_str((IUnknown*)node, L"text test"); - test_node_put_value_str((IUnknown*)elem, "test text"); + test_node_put_value_str((IUnknown*)elem, L"test text"); test_node_get_value_str((IUnknown*)node, L"text test"); hres = IHTMLDOMNode_get_attributes(node, &disp); @@ -9142,7 +9127,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); - elem = get_doc_elem_by_id(doc, "frm"); + elem = get_doc_elem_by_id(doc, L"frm"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); @@ -9154,7 +9139,7 @@ static void test_elems(IHTMLDocument2 *doc) test_create_option_elem(doc); test_create_img_elem(doc); - elem = get_doc_elem_by_id(doc, "tbl"); + elem = get_doc_elem_by_id(doc, L"tbl"); ok(elem != NULL, "elem = NULL\n"); test_elem_set_innertext(elem, L"inner text"); IHTMLElement_Release(elem); @@ -9186,15 +9171,15 @@ static void test_elems(IHTMLDocument2 *doc) test_doc_getelembytag(doc, "Img", ET_IMG, 1); - elem = get_doc_elem_by_id(doc, "y"); - test_elem_set_innerhtml((IUnknown*)elem, "inner html"); + elem = get_doc_elem_by_id(doc, L"y"); + test_elem_set_innerhtml((IUnknown*)elem, L"inner html"); test_elem_innerhtml((IUnknown*)elem, L"inner html"); - test_elem_set_innerhtml((IUnknown*)elem, ""); + test_elem_set_innerhtml((IUnknown*)elem, L""); test_elem_innerhtml((IUnknown*)elem, NULL); node = node_get_next((IUnknown*)elem); ok(!node, "node = %p\n", node); - elem2 = get_doc_elem_by_id(doc, "x"); + elem2 = get_doc_elem_by_id(doc, L"x"); test_elem_tag((IUnknown*)elem2, L"A"); node = node_get_next((IUnknown*)elem2); IHTMLDOMNode_Release(node); @@ -9209,7 +9194,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDocument3_Release(doc3); - elem = get_elem_by_id(doc, "s", TRUE); + elem = get_elem_by_id(doc, L"s", TRUE); if(elem) { static const elem_type_t select_types[] = { ET_OPTION, ET_OPTION, ET_OPTION }; @@ -9234,9 +9219,9 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) VARIANT v; HRESULT hres; - get_elem_attr_node((IUnknown*)elem, "noattr", FALSE); + get_elem_attr_node((IUnknown*)elem, L"noattr", FALSE); - attr = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + attr = get_elem_attr_node((IUnknown*)elem, L"id", TRUE); test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, NULL, L"[object]"); test_ifaces((IUnknown*)attr, attr_iids); @@ -9244,7 +9229,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) test_attr_specified(attr, VARIANT_TRUE); test_attr_parent(attr); - attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + attr2 = get_elem_attr_node((IUnknown*)elem, L"id", TRUE); ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); IHTMLDOMAttribute_Release(attr2); @@ -9261,7 +9246,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) ok(!lstrcmpW(V_BSTR(&v), L"divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - put_attr_value(attr, "divid3"); + put_attr_value(attr, L"divid3"); get_attr_node_value(attr, &v, VT_BSTR); ok(!lstrcmpW(V_BSTR(&v), L"divid3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -9269,7 +9254,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) IHTMLDOMAttribute_Release(attr); - attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); + attr = get_elem_attr_node((IUnknown*)elem, L"emptyattr", TRUE); get_attr_node_value(attr, &v, VT_BSTR); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -9279,7 +9264,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) put_attr_node_value(attr, v); VariantClear(&v); - attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); + attr = get_elem_attr_node((IUnknown*)elem, L"emptyattr", TRUE); get_attr_node_value(attr, &v, VT_BSTR); ok(!lstrcmpW(V_BSTR(&v), L"newvalue"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -9289,8 +9274,8 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) V_VT(&v) = VT_I4; V_I4(&v) = 100; - set_dispex_value((IUnknown*)elem, "dispprop", &v); - attr = get_elem_attr_node((IUnknown*)elem, "dispprop", TRUE); + set_dispex_value((IUnknown*)elem, L"dispprop", &v); + attr = get_elem_attr_node((IUnknown*)elem, L"dispprop", TRUE); get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); test_attr_specified(attr, VARIANT_TRUE); @@ -9302,14 +9287,14 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); - put_attr_value(attr, "160"); + put_attr_value(attr, L"160"); get_attr_node_value(attr, &v, VT_BSTR); ok(!lstrcmpW(V_BSTR(&v), L"160"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IHTMLDOMAttribute_Release(attr); - attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE); + attr = get_elem_attr_node((IUnknown*)elem, L"tabIndex", TRUE); test_attr_specified(attr, VARIANT_FALSE); test_attr_expando(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); @@ -9350,37 +9335,37 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); ok(!attr2, "attr2 != NULL\n"); - test_elem_attr(elem, "Test", L"testing"); - put_attr_value(attr, "new value"); - test_elem_attr(elem, "Test", L"new value"); + test_elem_attr(elem, L"Test", L"testing"); + put_attr_value(attr, L"new value"); + test_elem_attr(elem, L"Test", L"new value"); - attr2 = get_elem_attr_node((IUnknown*)elem, "Test", TRUE); + attr2 = get_elem_attr_node((IUnknown*)elem, L"Test", TRUE); ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr), "attr2 != attr\n"); IHTMLDOMAttribute_Release(attr2); attr3 = create_attr((IUnknown*)doc, "Test"); - put_attr_value(attr3, "replace test"); + put_attr_value(attr3, L"replace test"); hres = IHTMLElement4_setAttributeNode(elem4, attr3, &attr2); ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr), "attr2 != attr\n"); IHTMLDOMAttribute_Release(attr2); - test_elem_attr(elem, "Test", L"replace test"); + test_elem_attr(elem, L"Test", L"replace test"); test_attr_value(attr, L"new value"); test_attr_value(attr3, L"replace test"); - attr2 = get_elem_attr_node((IUnknown*)elem, "Test", TRUE); + attr2 = get_elem_attr_node((IUnknown*)elem, L"Test", TRUE); ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr3), "attr2 != attr3\n"); IHTMLDOMAttribute_Release(attr2); - put_attr_value(attr, "new value2"); - test_elem_attr(elem, "Test", L"replace test"); + put_attr_value(attr, L"new value2"); + test_elem_attr(elem, L"Test", L"replace test"); test_attr_value(attr, L"new value2"); test_attr_value(attr3, L"replace test"); - put_attr_value(attr3, "new replace value"); - test_elem_attr(elem, "Test", L"new replace value"); + put_attr_value(attr3, L"new replace value"); + test_elem_attr(elem, L"Test", L"new replace value"); test_attr_value(attr, L"new value2"); test_attr_value(attr3, L"new replace value"); @@ -9389,7 +9374,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); IHTMLDOMAttribute_Release(attr3); - attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + attr2 = get_elem_attr_node((IUnknown*)elem, L"id", TRUE); hres = IHTMLElement4_setAttributeNode(elem4, attr2, &attr3); ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); IHTMLDOMAttribute_Release(attr2); @@ -9403,32 +9388,32 @@ static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) IHTMLElement *elem; test_elem_set_innerhtml((IUnknown*)outer_elem, - "<img id=\"imgid\" src=\"BLOCKED::http://www.winehq.org/img.png\" />"); - elem = get_elem_by_id(doc, "imgid", TRUE); + L"<img id=\"imgid\" src=\"BLOCKED::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, L"imgid", TRUE); if(elem) { test_img_src((IUnknown*)elem, L"BLOCKED::", L"blocked::http://www.winehq.org/img.png"); IHTMLElement_Release(elem); } test_elem_set_innerhtml((IUnknown*)outer_elem, - "<img id=\"imgid\" src=\"BLOCKE::http://www.winehq.org/img.png\" />"); - elem = get_elem_by_id(doc, "imgid", TRUE); + L"<img id=\"imgid\" src=\"BLOCKE::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, L"imgid", TRUE); if(elem) { test_img_src((IUnknown*)elem, L"blocke::http://www.winehq.org/img.png", NULL); - test_img_set_src((IUnknown*)elem, "BLOCKED:http://www.winehq.org/img.png"); + test_img_set_src((IUnknown*)elem, L"BLOCKED:http://www.winehq.org/img.png"); test_img_src((IUnknown*)elem, L"blocked:http://www.winehq.org/img.png", NULL); - test_img_set_src((IUnknown*)elem, "blocked::http://www.winehq.org/img.png"); + test_img_set_src((IUnknown*)elem, L"blocked::http://www.winehq.org/img.png"); test_img_src((IUnknown*)elem, L"BLOCKED::", L"blocked::http://www.winehq.org/img.png"); IHTMLElement_Release(elem); } } #define doc_get_elems_by_name(a,b) _doc_get_elems_by_name(__LINE__,a,b) -static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocument2 *doc, const char *name) +static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocument2 *doc, const WCHAR *name) { IHTMLDocument3 *doc3 = _get_doc3_iface(line, doc); IHTMLElementCollection *col; - BSTR str = a2bstr(name); + BSTR str = SysAllocString(name); HRESULT hres; hres = IHTMLDocument3_getElementsByName(doc3, str, &col); @@ -9448,17 +9433,17 @@ static void test_elem_names(IHTMLDocument2 *doc) static const elem_type_t test1_types[] = {ET_INPUT, ET_A, ET_DIV}; - set_body_html(doc, "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); - col = doc_get_elems_by_name(doc, "test"); + set_body_html(doc, L"<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); + col = doc_get_elems_by_name(doc, L"test"); test_elem_collection((IUnknown*)col, test1_types, ARRAY_SIZE(test1_types)); IHTMLElementCollection_Release(col); - col = doc_get_elems_by_name(doc, "yyy"); + col = doc_get_elems_by_name(doc, L"yyy"); test_elem_collection((IUnknown*)col, NULL, 0); IHTMLElementCollection_Release(col); /* case insensivity test */ - col = doc_get_elems_by_name(doc, "Xxx"); + col = doc_get_elems_by_name(doc, L"Xxx"); hres = IHTMLElementCollection_get_length(col, &len); ok(hres == S_OK, "get_length failed: %08x\n", hres); todo_wine ok(len == 1, "len = %d\n", len); @@ -9474,9 +9459,9 @@ static void test_elems2(IHTMLDocument2 *doc) ET_A }; - div = get_doc_elem_by_id(doc, "divid"); + div = get_doc_elem_by_id(doc, L"divid"); - elem = get_elem_by_id(doc, "linkid", TRUE); + elem = get_elem_by_id(doc, L"linkid", TRUE); if(elem) { test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, L"stylesheet"); @@ -9492,22 +9477,22 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - test_elem_set_innerhtml((IUnknown*)div, "<div id=\"innerid\"></div>"); - elem2 = get_doc_elem_by_id(doc, "innerid"); + test_elem_set_innerhtml((IUnknown*)div, L"<div id=\"innerid\"></div>"); + elem2 = get_doc_elem_by_id(doc, L"innerid"); ok(elem2 != NULL, "elem2 == NULL\n"); - test_elem_set_outerhtml((IUnknown*)elem2, "<br><a href=\"about:blank\" id=\"aid\">a</a>"); + test_elem_set_outerhtml((IUnknown*)elem2, L"<br><a href=\"about:blank\" id=\"aid\">a</a>"); test_elem_all((IUnknown*)div, outer_types, ARRAY_SIZE(outer_types)); IHTMLElement_Release(elem2); - elem2 = get_doc_elem_by_id(doc, "aid"); + elem2 = get_doc_elem_by_id(doc, L"aid"); ok(elem2 != NULL, "elem2 == NULL\n"); - test_elem_set_outerhtml((IUnknown*)elem2, ""); + test_elem_set_outerhtml((IUnknown*)elem2, L""); test_elem_all((IUnknown*)div, outer_types, 1); IHTMLElement_Release(elem2); test_elem_set_innerhtml((IUnknown*)div, - "<input value=\"val\" id =\"inputid\" />"); - elem = get_elem_by_id(doc, "inputid", TRUE); + L"<input value=\"val\" id =\"inputid\" />"); + elem = get_elem_by_id(doc, L"inputid", TRUE); if(elem) { test_input_defaultValue((IUnknown*)elem, L"val"); test_input_put_value((IUnknown*)elem, L"test"); @@ -9516,26 +9501,26 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - test_elem_set_innerhtml((IUnknown*)div, ""); + test_elem_set_innerhtml((IUnknown*)div, L""); test_insert_adjacent_elems(doc, div); test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); - elem = get_elem_by_id(doc, "sform", TRUE); - elem2 = get_elem_by_id(doc, "form", TRUE); + L"<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); + elem = get_elem_by_id(doc, L"sform", TRUE); + elem2 = get_elem_by_id(doc, L"form", TRUE); if(elem && elem2) { IHTMLFormElement *form; test_select_form((IUnknown*)elem, (IUnknown*)elem2); IHTMLElement_Release(elem); - elem = get_elem_by_id(doc, "oform", TRUE); + elem = get_elem_by_id(doc, L"oform", TRUE); if(elem) { test_option_form((IUnknown*)elem, (IUnknown*)elem2); IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, "btnid", TRUE); + elem = get_elem_by_id(doc, L"btnid", TRUE); form = get_button_form(elem); ok(iface_cmp((IUnknown*)form, (IUnknown*)elem2), "form != elem2\n"); @@ -9548,11 +9533,11 @@ static void test_elems2(IHTMLDocument2 *doc) test_selectors(doc, div); test_elemsbyclass(div); - test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); - elem = get_elem_by_id(doc, "elemid", TRUE); + test_elem_set_innerhtml((IUnknown*)div, L"<div id=\"elemid\">test</div>"); + elem = get_elem_by_id(doc, L"elemid", TRUE); if(elem) { test_elem_outertext(elem, L"test"); - test_elem_set_outertext(elem, "outer text"); + test_elem_set_outertext(elem, L"outer text"); test_elem_outertext(elem, NULL); test_elem_all((IUnknown*)div, NULL, 0); elem2 = test_elem_get_parent((IUnknown*)elem); @@ -9560,8 +9545,8 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - test_elem_set_innerhtml((IUnknown*)div, "<map><area id=\"areaid\"></area></map>"); - elem = get_elem_by_id(doc, "areaid", TRUE); + test_elem_set_innerhtml((IUnknown*)div, L"<map><area id=\"areaid\"></area></map>"); + elem = get_elem_by_id(doc, L"areaid", TRUE); if(elem) { test_elem_type((IUnknown*)elem, ET_AREA); IHTMLElement_Release(elem); @@ -9581,11 +9566,11 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLFormElement *form; test_elem_set_innerhtml((IUnknown*)parent, - "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); - elem = get_elem_by_id(doc, "ta", TRUE); + L"<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); + elem = get_elem_by_id(doc, L"ta", TRUE); test_elem_type((IUnknown*)elem, ET_TEXTAREA); - form_elem = get_elem_by_id(doc, "fid", TRUE); + form_elem = get_elem_by_id(doc, L"fid", TRUE); ok(form_elem != NULL, "form_elem == NULL\n"); form = get_textarea_form((IUnknown*)elem); @@ -9596,8 +9581,8 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(form_elem); IHTMLElement_Release(elem); - test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\"></textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); + test_elem_set_innerhtml((IUnknown*)parent, L"<textarea id=\"ta\"></textarea>"); + elem = get_elem_by_id(doc, L"ta", TRUE); test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, L"test"); @@ -9616,8 +9601,8 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); - test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\">default text</textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); + test_elem_set_innerhtml((IUnknown*)parent, L"<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, L"ta", TRUE); test_textarea_defaultvalue((IUnknown*)elem, L"default text"); IHTMLElement_Release(elem); } @@ -9629,11 +9614,11 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) static const elem_type_t elems_textarea_input[] = { ET_TEXTAREA, ET_INPUT }; test_elem_set_innerhtml((IUnknown*)parent, - "<form id=\"form\">" + L"<form id=\"form\">" "<textarea></textarea>" "<div><input type=\"text\" id=\"inputid\" /></div>" "</form>"); - elem = get_elem_by_id(doc, "form", TRUE); + elem = get_elem_by_id(doc, L"form", TRUE); test_elem_type((IUnknown*)elem, ET_FORM); test_form_length((IUnknown*)elem, 2); @@ -9655,7 +9640,7 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) test_form_reset((IUnknown*)elem); test_form_target((IUnknown*)elem); - input_elem = get_elem_by_id(doc, "inputid", TRUE); + input_elem = get_elem_by_id(doc, L"inputid", TRUE); test_input_get_form((IUnknown*)input_elem, L"form"); IHTMLElement_Release(input_elem); @@ -9667,7 +9652,7 @@ static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLDOMNode *svg_node, *circle_node, *tspan_node; test_elem_set_innerhtml((IUnknown*)parent, - "<svg width=\"100\" height=\"100\" id=\"svgid\">" + L"<svg width=\"100\" height=\"100\" id=\"svgid\">" "<circle cx=\"50\" cy=\"50\" r=\"40\" fill=\"black\" />" "<tspan></tspan>" "</svg>"); @@ -9700,8 +9685,8 @@ static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *div; - set_body_html(doc, "<div id=\"parentdiv\"></div>"); - div = get_doc_elem_by_id(doc, "parentdiv"); + set_body_html(doc, L"<div id=\"parentdiv\"></div>"); + div = get_doc_elem_by_id(doc, L"parentdiv"); test_textarea_element(doc, div); test_form_element(doc, div); @@ -9723,7 +9708,7 @@ static void test_create_elems(IHTMLDocument2 *doc) static const elem_type_t types1[] = { ET_TESTG }; - elem = test_create_elem(doc, "TEST"); + elem = test_create_elem(doc, L"TEST"); test_elem_tag((IUnknown*)elem, L"TEST"); type = get_node_type((IUnknown*)elem); ok(type == 1, "type=%d\n", type); @@ -9755,24 +9740,24 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); IHTMLDOMNode_Release(node); - node = test_create_text(doc, "abc"); + node = test_create_text(doc, L"abc"); test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, NULL, L"[object]"); test_text_length((IUnknown*)node, 3); test_text_data((IUnknown*)node, L"abc"); - set_text_data((IUnknown*)node, "test"); + set_text_data((IUnknown*)node, L"test"); test_text_data((IUnknown*)node, L"test"); - text_append_data((IUnknown*)node, " append"); + text_append_data((IUnknown*)node, L" append"); test_text_data((IUnknown*)node, L"test append"); text_append_data((IUnknown*)node, NULL); test_text_data((IUnknown*)node, L"test append"); - set_text_data((IUnknown*)node, "test"); + set_text_data((IUnknown*)node, L"test"); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var); IHTMLDOMNode_Release(node); - node = test_create_text(doc, "insert "); + node = test_create_text(doc, L"insert "); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)node2; @@ -9784,7 +9769,7 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_innertext(body, L"insert test"); test_elem_innerhtml((IUnknown*)body, L"insert test"); - node = test_create_text(doc, " Test"); + node = test_create_text(doc, L" Test"); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; test_node_insertbefore((IUnknown*)body, node, &var); @@ -9804,7 +9789,7 @@ static void test_create_elems(IHTMLDocument2 *doc) test_node_get_value_str((IUnknown*)comment, L"testing"); test_elem_title((IUnknown*)comment, NULL); - test_elem_set_title((IUnknown*)comment, "comment title"); + test_elem_set_title((IUnknown*)comment, L"comment title"); test_elem_title((IUnknown*)comment, L"comment title"); test_comment_text((IUnknown*)comment, L""); test_elem_outerhtml((IUnknown*)comment, L""); @@ -9835,7 +9820,7 @@ static void test_replacechild_elems(IHTMLDocument2 *doc) body = doc_get_body(doc); - node = test_create_text(doc, "insert"); + node = test_create_text(doc, L"insert"); V_VT(&var) = VT_NULL; V_DISPATCH(&var) = NULL; @@ -9844,7 +9829,7 @@ static void test_replacechild_elems(IHTMLDocument2 *doc) test_elem_innertext(body, L"insert"); - node3 = test_create_text(doc, "replaced"); + node3 = test_create_text(doc, L"replaced"); nodeBody = _get_node_iface(__LINE__, (IUnknown *)body); @@ -9886,7 +9871,7 @@ static void test_noscript(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); body = doc_get_body(doc); - test_elem_set_innerhtml((IUnknown*)body, "<div>test</div><noscript><a href=\"about:blank\">A</a></noscript>"); + test_elem_set_innerhtml((IUnknown*)body, L"<div>test</div><noscript><a href=\"about:blank\">A</a></noscript>"); test_elem_all((IUnknown*)body, body_all_types, ARRAY_SIZE(body_all_types)); IHTMLElement_Release(body); } @@ -10255,7 +10240,7 @@ static void test_frameset(IHTMLDocument2 *doc) test_frames_collection((IHTMLFramesCollection2*)window, L"fr2"); /* getElementById with node name attributes */ - elem = get_doc_elem_by_id(doc, "nm1"); + elem = get_doc_elem_by_id(doc, L"nm1"); test_elem_id((IUnknown*)elem, L"fr1"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6); @@ -10290,7 +10275,7 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLElement_Release(elem); /* get_name with no name attr */ - elem = get_doc_elem_by_id(doc, "fr3"); + elem = get_doc_elem_by_id(doc, L"fr3"); test_framebase_name(elem, NULL); test_framebase_put_name(elem, L"frame name"); test_framebase_put_name(elem, NULL); @@ -10347,7 +10332,7 @@ static void test_docfrag(IHTMLDocument2 *doc) ok(hres == E_UNEXPECTED, "get_location failed: %08x\n", hres); ok(location == (void*)0xdeadbeef, "location changed\n"); - br = test_create_elem(doc, "BR"); + br = test_create_elem(doc, L"BR"); test_elem_source_index(br, -1); test_node_append_child((IUnknown*)frag, (IUnknown*)br); test_elem_source_index(br, 0); @@ -10356,7 +10341,7 @@ static void test_docfrag(IHTMLDocument2 *doc) test_doc_getelembytag(frag, "a", ET_A, 0); test_doc_getelembytag(frag, "Br", ET_BR, 1); - div = get_elem_by_id(doc, "divid", TRUE); + div = get_elem_by_id(doc, L"divid", TRUE); test_node_append_child((IUnknown*)div, (IUnknown*)frag); IHTMLElement_Release(div); @@ -10365,7 +10350,7 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); - div = test_create_elem(frag, "div"); + div = test_create_elem(frag, L"div"); owner_doc = get_owner_doc((IUnknown*)div); doc_node = get_doc_node(doc); ok(iface_cmp((IUnknown*)owner_doc, (IUnknown*)doc_node), "owner_doc != doc_node\n"); -- 2.24.1

3 2

[PATCH 1/2] mshtml/tests: Avoid a2bstr() on string literals in dom.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Just split out because of the size of the next patch. dlls/mshtml/tests/dom.c | 134 ++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c758fb2907..64c20e11e6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1449,7 +1449,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); /* get a non-present attribute */ - bstr = a2bstr("notAnAttribute"); + bstr = SysAllocString(L"notAnAttribute"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); ok(hres == S_OK, "getAttribute failed: %08x\n", hres); ok(V_VT(&val) == VT_NULL, "variant type should have been VT_NULL (0x%x), was: 0x%x\n", VT_NULL, V_VT(&val)); @@ -1457,7 +1457,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) SysFreeString(bstr); /* get a present attribute */ - bstr = a2bstr("scrollHeight"); + bstr = SysAllocString(L"scrollHeight"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); ok(hres == S_OK, "getAttribute failed: %08x\n", hres); ok(V_VT(&val) == VT_I4, "variant type should have been VT_I4 (0x%x), was: 0x%x\n", VT_I4, V_VT(&val)); @@ -1465,10 +1465,10 @@ static void test_get_set_attr(IHTMLDocument2 *doc) SysFreeString(bstr); /* create a new BSTR attribute */ - bstr = a2bstr("newAttribute"); + bstr = SysAllocString(L"newAttribute"); V_VT(&val) = VT_BSTR; - V_BSTR(&val) = a2bstr("the value"); + V_BSTR(&val) = SysAllocString(L"the value"); hres = IHTMLElement_setAttribute(elem, bstr, val, 0); ok(hres == S_OK, "setAttribute failed: %08x\n", hres); VariantClear(&val); @@ -1495,7 +1495,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) SysFreeString(bstr); /* case-insensitive */ - bstr = a2bstr("newattribute"); + bstr = SysAllocString(L"newattribute"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); ok(hres == S_OK, "getAttribute failed: %08x\n", hres); ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); @@ -1999,7 +1999,7 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const WCHAR *extext static IHTMLDOMAttribute *_create_attr(unsigned line, IUnknown *unk, const char *name) { IHTMLDocument5 *doc = _get_htmldoc5_iface(line, unk); - BSTR str = a2bstr("Test"); + BSTR str = SysAllocString(L"Test"); IHTMLDOMAttribute *attr; HRESULT hres; @@ -2061,7 +2061,7 @@ static void _test_comment_attrs(unsigned line, IUnknown *unk) IHTMLElement *elem = _get_elem_iface(__LINE__,unk); IHTMLElement4 *elem4 = _get_elem4_iface(__LINE__,unk); IHTMLDOMAttribute *attr; - BSTR name = a2bstr("test"); + BSTR name = SysAllocString(L"test"); VARIANT val; HRESULT hres; @@ -2226,7 +2226,7 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, IHTMLImgElement *img; IHTMLWindow2 *window; VARIANT width, height; - char buf[16]; + WCHAR buf[16]; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2240,18 +2240,18 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, test_disp((IUnknown*)factory, &IID_IHTMLImageElementFactory, NULL, L"[object]"); if(wdth >= 0){ - sprintf(buf, "%d", wdth); + wsprintfW(buf, L"%d", wdth); V_VT(&width) = VT_BSTR; - V_BSTR(&width) = a2bstr(buf); + V_BSTR(&width) = SysAllocString(buf); }else{ V_VT(&width) = VT_EMPTY; wdth = 0; } if(hght >= 0){ - sprintf(buf, "%d", hght); + wsprintfW(buf, L"%d", hght); V_VT(&height) = VT_BSTR; - V_BSTR(&height) = a2bstr(buf); + V_BSTR(&height) = SysAllocString(buf); }else{ V_VT(&height) = VT_EMPTY; hght = 0; @@ -2941,7 +2941,7 @@ static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const ch #define test_elem_set_outertext_fail(a) _test_elem_set_outertext_fail(__LINE__,a) static void _test_elem_set_outertext_fail(unsigned line, IHTMLElement *elem) { - BSTR str = a2bstr("test"); + BSTR str = SysAllocString(L"test"); HRESULT hres; hres = IHTMLElement_put_outerText(elem, str); @@ -3579,7 +3579,7 @@ static void test_attr_collection_disp(IDispatch *disp) hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); - bstr = a2bstr("0"); + bstr = SysAllocString(L"0"); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); SysFreeString(bstr); @@ -3591,7 +3591,7 @@ static void test_attr_collection_disp(IDispatch *disp) ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); VariantClear(&var); - bstr = a2bstr("attr1"); + bstr = SysAllocString(L"attr1"); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); SysFreeString(bstr); @@ -3717,7 +3717,7 @@ static void test_attr_collection(IHTMLElement *elem) ok(hres == E_INVALIDARG, "item failed: %08x\n", hres); V_VT(&id) = VT_BSTR; - V_BSTR(&id) = a2bstr("nonexisting"); + V_BSTR(&id) = SysAllocString(L"nonexisting"); hres = IHTMLAttributeCollection_item(attr_col, &id, &attr); ok(hres == E_INVALIDARG, "item failed: %08x\n", hres); VariantClear(&id); @@ -3831,7 +3831,7 @@ static void test_contenteditable(IUnknown *unk) hres = IHTMLElement3_get_contentEditable(elem3, &strDefault); ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); - str = a2bstr("true"); + str = SysAllocString(L"true"); hres = IHTMLElement3_put_contentEditable(elem3, str); ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08x\n", wine_dbgstr_w(str), hres); SysFreeString(str); @@ -6169,7 +6169,7 @@ static void test_framebase(IUnknown *unk) ok(!lstrcmpW(str, L"auto"), "get_scrolling should have given 'auto', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr("no"); + str = SysAllocString(L"no"); hres = IHTMLFrameBase_put_scrolling(fbase, str); ok(hres == S_OK, "IHTMLFrameBase_put_scrolling failed: 0x%08x\n", hres); SysFreeString(str); @@ -6179,7 +6179,7 @@ static void test_framebase(IUnknown *unk) ok(!lstrcmpW(str, L"no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr("junk"); + str = SysAllocString(L"junk"); hres = IHTMLFrameBase_put_scrolling(fbase, str); ok(hres == E_INVALIDARG, "IHTMLFrameBase_put_scrolling should have failed " "with E_INVALIDARG, instead: 0x%08x\n", hres); @@ -6194,7 +6194,7 @@ static void test_framebase(IUnknown *unk) ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); ok(!str, "frameBorder = %s\n", wine_dbgstr_w(str)); - str = a2bstr("1"); + str = SysAllocString(L"1"); hres = IHTMLFrameBase_put_frameBorder(fbase, str); ok(hres == S_OK, "put_frameBorder failed: %08x\n", hres); SysFreeString(str); @@ -6498,7 +6498,7 @@ static void test_doc_dir(IHTMLDocument2 *doc2) ok(hres == S_OK, "get_dir failed: %08x\n", hres); ok(!dir, "dir = %s\n", wine_dbgstr_w(dir)); - dir = a2bstr("rtl"); + dir = SysAllocString(L"rtl"); hres = IHTMLDocument3_put_dir(doc, dir); ok(hres == S_OK, "put_dir failed: %08x\n", hres); SysFreeString(dir); @@ -6509,7 +6509,7 @@ static void test_doc_dir(IHTMLDocument2 *doc2) ok(!lstrcmpW(dir, L"rtl"), "dir = %s\n", wine_dbgstr_w(dir)); SysFreeString(dir); - dir = a2bstr("ltr"); + dir = SysAllocString(L"ltr"); hres = IHTMLDocument3_put_dir(doc, dir); ok(hres == S_OK, "put_dir failed: %08x\n", hres); SysFreeString(dir); @@ -6648,7 +6648,7 @@ static void test_default_body(IHTMLBodyElement *body) /* get_text - Invalid Text */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("Invalid"); + V_BSTR(&v) = SysAllocString(L"Invalid"); hres = IHTMLBodyElement_put_text(body, v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); VariantClear(&v); @@ -6662,7 +6662,7 @@ static void test_default_body(IHTMLBodyElement *body) /* get_text - Valid Text */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("#FF0000"); + V_BSTR(&v) = SysAllocString(L"#FF0000"); hres = IHTMLBodyElement_put_text(body, v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); VariantClear(&v); @@ -6711,7 +6711,7 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = a2bstr("red"); + V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLBodyElement_put_bgColor(body, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg); @@ -6735,7 +6735,7 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) /* Set via IHTMLDocument2 */ V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = a2bstr("red"); + V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLDocument2_put_bgColor(doc, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg); @@ -6820,7 +6820,7 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) static void test_read_only_style(IHTMLCSSStyleDeclaration *style) { - BSTR none = a2bstr("none"), display = a2bstr("display"), str; + BSTR none = SysAllocString(L"none"), display = SysAllocString(L"display"), str; VARIANT v; HRESULT hres; @@ -7028,9 +7028,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc) ok(hres == S_OK, "get_implementation failed: %08x\n", hres); ok(dom_implementation != NULL, "dom_implementation == NULL\n"); - str = a2bstr("test"); + str = SysAllocString(L"test"); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("1.0"); + V_BSTR(&v) = SysAllocString(L"1.0"); b = 100; hres = IHTMLDOMImplementation_hasFeature(dom_implementation, str, v, &b); SysFreeString(str); @@ -7050,7 +7050,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, L"[object]"); - str = a2bstr("test"); + str = SysAllocString(L"test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); ok(hres == S_OK, "createHTMLDocument failed: %08x\n", hres); @@ -7107,7 +7107,7 @@ static void test_xhr(IHTMLDocument2 *doc) hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatchEx, (void**)&dispex); ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); - str = a2bstr("XMLHttpRequest"); + str = SysAllocString(L"XMLHttpRequest"); hres = IDispatchEx_GetDispID(dispex, str, 0, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); SysFreeString(str); @@ -7264,7 +7264,7 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFiltersCollection, (void**)&body); ok(hres == E_NOINTERFACE, "got interface IHTMLFiltersCollection\n"); - str = a2bstr("xxx"); + str = SysAllocString(L"xxx"); b = 100; V_VT(&v) = VT_EMPTY; hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); @@ -7272,7 +7272,7 @@ static void test_defaults(IHTMLDocument2 *doc) "execCommand failed: %08x, expected OLECMDERR_E_NOTSUPPORTED or E_INVALIDARG\n", hres); SysFreeString(str); - str = a2bstr("respectvisibilityindesign"); + str = SysAllocString(L"respectvisibilityindesign"); b = 100; V_VT(&v) = VT_BOOL; V_BOOL(&v) = VARIANT_TRUE; @@ -7499,7 +7499,7 @@ static void test_tr_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, cell_types, ARRAY_SIZE(cell_types)); IHTMLElementCollection_Release(col); - bstr = a2bstr("left"); + bstr = SysAllocString(L"left"); hres = IHTMLTableRow_put_align(row, bstr); ok(hres == S_OK, "set_align failed: %08x\n", hres); SysFreeString(bstr); @@ -7511,7 +7511,7 @@ static void test_tr_elem(IHTMLElement *elem) ok(!lstrcmpW(bstr, L"left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - bstr = a2bstr("top"); + bstr = SysAllocString(L"top"); hres = IHTMLTableRow_put_vAlign(row, bstr); ok(hres == S_OK, "set_valign failed: %08x\n", hres); SysFreeString(bstr); @@ -7539,7 +7539,7 @@ static void test_tr_elem(IHTMLElement *elem) ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = a2bstr("red"); + V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTableRow_put_bgColor(row, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg); @@ -7598,7 +7598,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); ok(!lval, "Expected 0, got %d\n", lval); - str = a2bstr("left"); + str = SysAllocString(L"left"); hres = IHTMLTableCell_put_align(cell, str); ok(hres == S_OK, "put_align failed: %08x\n", hres); SysFreeString(str); @@ -7618,7 +7618,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = a2bstr("red"); + V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTableCell_put_bgColor(cell, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg); @@ -7697,7 +7697,7 @@ static void test_label_elem(IHTMLElement *elem) ok(!lstrcmpW(str, L"in"), "htmlFor = %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr(""); + str = SysAllocString(L""); hres = IHTMLLabelElement_put_htmlFor(label, str); ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); SysFreeString(str); @@ -7708,7 +7708,7 @@ static void test_label_elem(IHTMLElement *elem) ok(!lstrcmpW(str, L""), "htmlFor = %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr("abc"); + str = SysAllocString(L"abc"); hres = IHTMLLabelElement_put_htmlFor(label, str); ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); SysFreeString(str); @@ -7852,7 +7852,7 @@ static void test_table_elem(IHTMLElement *elem) test_table_cell_spacing(table, L"10"); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("11"); + V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_cellSpacing(table, v); ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); test_table_cell_spacing(table, L"11"); @@ -7867,7 +7867,7 @@ static void test_table_elem(IHTMLElement *elem) test_table_cell_padding(table, L"10"); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("11"); + V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_cellPadding(table, v); ok(hres == S_OK, "put_cellPadding = %08x\n", hres); test_table_cell_padding(table, L"11"); @@ -7879,7 +7879,7 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "put_cellPadding = %08x\n", hres); test_table_cell_padding(table, L"5"); - bstr = a2bstr("left"); + bstr = SysAllocString(L"left"); hres = IHTMLTable_put_align(table, bstr); ok(hres == S_OK, "set_align failed: %08x\n", hres); SysFreeString(bstr); @@ -7897,7 +7897,7 @@ static void test_table_elem(IHTMLElement *elem) ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; - V_BSTR(&vbg) = a2bstr("red"); + V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTable_put_bgColor(table, vbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vbg); @@ -7926,7 +7926,7 @@ static void test_table_elem(IHTMLElement *elem) VariantClear(&vDefaultbg); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("11"); + V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); @@ -7936,7 +7936,7 @@ static void test_table_elem(IHTMLElement *elem) VariantClear(&v); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("11.9"); + V_BSTR(&v) = SysAllocString(L"11.9"); hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); @@ -7946,7 +7946,7 @@ static void test_table_elem(IHTMLElement *elem) VariantClear(&v); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("40.2%"); + V_BSTR(&v) = SysAllocString(L"40.2%"); hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); @@ -7973,7 +7973,7 @@ static void test_table_elem(IHTMLElement *elem) ok(!lstrcmpW(V_BSTR(&v), L"11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - bstr = a2bstr("box"); + bstr = SysAllocString(L"box"); hres = IHTMLTable_put_frame(table, bstr); ok(hres == S_OK, "put_frame = %08x\n", hres); SysFreeString(bstr); @@ -7983,7 +7983,7 @@ static void test_table_elem(IHTMLElement *elem) SysFreeString(bstr); test_table_modify(table); - bstr = a2bstr("summary"); + bstr = SysAllocString(L"summary"); hres = IHTMLTable3_put_summary(table3, bstr); ok(hres == S_OK, "put_summary = %08x\n", hres); SysFreeString(bstr); @@ -8034,15 +8034,15 @@ static void doc_complex_write(IHTMLDocument2 *doc) ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(args) = VT_BSTR; - V_BSTR(args) = a2bstr("<body i4val=\""); + V_BSTR(args) = SysAllocString(L"<body i4val=\""); V_VT(args+1) = VT_I4; V_I4(args+1) = 4; V_VT(args+2) = VT_BSTR; - V_BSTR(args+2) = a2bstr("\" r8val=\""); + V_BSTR(args+2) = SysAllocString(L"\" r8val=\""); V_VT(args+3) = VT_R8; V_R8(args+3) = 3.14; V_VT(args+4) = VT_BSTR; - V_BSTR(args+4) = a2bstr("\">"); + V_BSTR(args+4) = SysAllocString(L"\">"); SafeArrayUnaccessData(sa); hres = IHTMLDocument2_write(doc, sa); @@ -8206,7 +8206,7 @@ static void test_iframe_elem(IHTMLElement *elem) test_iframe_width(elem, L"70%"); test_framebase_src(elem, L"about:blank"); - str = a2bstr("text/html"); + str = SysAllocString(L"text/html"); V_VT(&errv) = VT_ERROR; disp = NULL; hres = IHTMLDocument2_open(content_doc, str, errv, errv, errv, &disp); @@ -8472,7 +8472,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) } collection = NULL; - str = a2bstr("nomatch"); + str = SysAllocString(L"nomatch"); hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8481,7 +8481,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) SysFreeString(str); collection = NULL; - str = a2bstr(".cl1"); + str = SysAllocString(L".cl1"); hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8495,7 +8495,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) ok(hres == S_OK, "Could not get IElementSelector iface: %08x\n", hres); collection = NULL; - str = a2bstr("nomatch"); + str = SysAllocString(L"nomatch"); hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8504,7 +8504,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) SysFreeString(str); collection = NULL; - str = a2bstr(".cl1"); + str = SysAllocString(L".cl1"); hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8534,7 +8534,7 @@ static void test_elemsbyclass(IHTMLElement *div) } collection = NULL; - str = a2bstr("nomatch"); + str = SysAllocString(L"nomatch"); hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8543,7 +8543,7 @@ static void test_elemsbyclass(IHTMLElement *div) SysFreeString(str); collection = NULL; - str = a2bstr("cl1"); + str = SysAllocString(L"cl1"); hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); @@ -8794,7 +8794,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(type == NULL, "Unexpected type %s\n", wine_dbgstr_w(type)); - type = a2bstr("text/javascript"); + type = SysAllocString(L"text/javascript"); hres = IHTMLScriptElement_put_type (script, type); ok(hres == S_OK, "put_type failed: %08x\n", hres); SysFreeString(type); @@ -9174,7 +9174,7 @@ static void test_elems(IHTMLDocument2 *doc) if(hres == S_OK) { DISPID pid = -1; - BSTR str = a2bstr("Testing"); + BSTR str = SysAllocString(L"Testing"); hres = IDispatchEx_GetDispID(dispex, str, 1, &pid); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); ok(pid != -1, "pid == -1\n"); @@ -9253,7 +9253,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) VariantClear(&v); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("divid2"); + V_BSTR(&v) = SysAllocString(L"divid2"); put_attr_node_value(attr, v); VariantClear(&v); @@ -9275,7 +9275,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) VariantClear(&v); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("newvalue"); + V_BSTR(&v) = SysAllocString(L"newvalue"); put_attr_node_value(attr, v); VariantClear(&v); @@ -9339,7 +9339,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) get_attr_node_value(attr, &v, VT_EMPTY); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("testing"); + V_BSTR(&v) = SysAllocString(L"testing"); put_attr_node_value(attr, v); SysFreeString(V_BSTR(&v)); test_attr_value(attr, L"testing"); @@ -9793,7 +9793,7 @@ static void test_create_elems(IHTMLDocument2 *doc) doc5 = get_htmldoc5_iface((IUnknown*)doc); if(doc5) { - str = a2bstr("testing"); + str = SysAllocString(L"testing"); hres = IHTMLDocument5_createComment(doc5, str, &comment); SysFreeString(str); ok(hres == S_OK, "createComment failed: %08x\n", hres); @@ -10263,13 +10263,13 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLElement2 *elem2; BSTR str; - str = a2bstr("nm1"); + str = SysAllocString(L"nm1"); hres = IHTMLDocument6_getElementById(doc6, str, &elem2); ok(hres == S_OK, "getElementById failed: %08x\n", hres); ok(!elem2, "elem = %p\n", elem2); SysFreeString(str); - str = a2bstr("fr1"); + str = SysAllocString(L"fr1"); hres = IHTMLDocument6_getElementById(doc6, str, &elem2); ok(hres == S_OK, "getElementById failed: %08x\n", hres); ok(elem2 != NULL, "elem2 is NULL\n"); -- 2.24.1

3 2

[PATCH 2/2] mshtml/tests: Get rid of a2bstr() in activex.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/activex.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index a9af72d91c..23e4b00cac 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -195,18 +195,6 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static IOleClientSite *client_site; static IDispatch *sink_disp; static READYSTATE plugin_readystate = READYSTATE_UNINITIALIZED; @@ -1527,7 +1515,7 @@ static void test_elem_dispex(IDispatchEx *dispex) BSTR str; HRESULT hres; - str = a2bstr("scriptprop"); + str = SysAllocString(L"scriptprop"); SET_EXPECT(GetIDsOfNames_scriptprop); hres = IDispatchEx_GetDispID(dispex, str, 0, &id); CHECK_CALLED(GetIDsOfNames_scriptprop); @@ -1625,7 +1613,7 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - str = a2bstr("objid"); + str = SysAllocString(L"objid"); elem = (void*)0xdeadbeef; hres = IHTMLDocument3_getElementById(doc3, str, &elem); IHTMLDocument3_Release(doc3); @@ -2596,7 +2584,7 @@ static void test_nooleobj_ax(void) release_doc(doc); } -static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char *langa) +static void test_exec_script(IHTMLDocument2 *doc, const WCHAR *codew, const WCHAR *langw) { IHTMLWindow2 *window; BSTR code, lang; @@ -2606,8 +2594,8 @@ static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); - code = a2bstr(codea); - lang = a2bstr(langa); + code = SysAllocString(codew); + lang = SysAllocString(langw); hres = IHTMLWindow2_execScript(window, code, lang, &v); ok(hres == S_OK, "execScript failed: %08x\n", hres); @@ -2635,9 +2623,9 @@ static void test_create_element(void) SET_EXPECT(FreezeEvents_FALSE); test_exec_script(doc, - "var test_elem = document.createElement('object');" + L"var test_elem = document.createElement('object');" "test_elem.classid = 'CLSID:178fc163-f585-4e24-9c13-4bb7f6680746';", - "javascript"); + L"javascript"); CHECK_CALLED(CreateInstance); todo_wine CHECK_CALLED(FreezeEvents_TRUE); @@ -2650,8 +2638,8 @@ static void test_create_element(void) SET_EXPECT(DoVerb); test_exec_script(doc, - "document.body.appendChild(test_elem);", - "javascript"); + L"document.body.appendChild(test_elem);", + L"javascript"); todo_wine CHECK_CALLED(DoVerb); SET_EXPECT(InPlaceDeactivate); -- 2.24.1

3 2

[PATCH 1/2] mshtml/tests: Get rid of strcmp_wa() in activex.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/activex.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 8b6a47c391..a9af72d91c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -195,13 +195,6 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -235,7 +228,7 @@ static void set_plugin_readystate(READYSTATE state) IPropertyNotifySink_Release(prop_notif); } -static void test_mon_displayname(IMoniker *mon, const char *exname, const char *broken_name) +static void test_mon_displayname(IMoniker *mon, const WCHAR *exname, const WCHAR *broken_name) { LPOLESTR display_name; DWORD mksys; @@ -243,7 +236,7 @@ static void test_mon_displayname(IMoniker *mon, const char *exname, const char * hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(display_name, exname) || broken(broken_name && !strcmp_wa(display_name, broken_name)), + ok(!lstrcmpW(display_name, exname) || broken(broken_name && !lstrcmpW(display_name, broken_name)), "display_name = %s\n", wine_dbgstr_w(display_name)); CoTaskMemFree(display_name); @@ -591,7 +584,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IPropertyBag_Read(pPropBag, param_nameW, &v, NULL); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "param_value"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"param_value"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 0xdeadbeef; @@ -604,7 +597,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IPropertyBag_Read(pPropBag, num_paramW, &v, NULL); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_I4; @@ -640,7 +633,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:test.swf", "about:blanktest.swf"); + test_mon_displayname(mon, L"about:test.swf", L"about:blanktest.swf"); IMoniker_Release(mon); IBindHost_Release(bind_host); @@ -649,7 +642,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:blank", NULL); + test_mon_displayname(mon, L"about:blank", NULL); IMoniker_Release(mon); set_plugin_readystate(READYSTATE_COMPLETE); @@ -715,10 +708,10 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOL ok(rgszNames != NULL, "rgszNames == NULL\n"); ok(rgDispId != NULL, "rgDispId == NULL\n"); - if(!strcmp_wa(rgszNames[0], "scriptprop")) { + if(!lstrcmpW(rgszNames[0], L"scriptprop")) { CHECK_EXPECT(GetIDsOfNames_scriptprop); *rgDispId = DISPID_SCRIPTPROP; - }else if(!strcmp_wa(rgszNames[0], "scriptCall")) { + }else if(!lstrcmpW(rgszNames[0], L"scriptCall")) { *rgDispId = DISPID_SCRIPTCALL; }else { ok(0, "rgszNames[0] = %s\n", wine_dbgstr_w(rgszNames[0])); @@ -1660,13 +1653,13 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLObjectElement_get_width(objelem, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "300"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"300"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLObjectElement_get_height(objelem, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "200"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"200"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_I4; @@ -1681,7 +1674,7 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLObjectElement_get_width(objelem, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "400"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"400"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_I4; @@ -1696,7 +1689,7 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLObjectElement_get_height(objelem, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "250"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"250"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IHTMLObjectElement_Release(objelem); -- 2.24.1

3 2

[PATCH 3/3] mshtml/tests: Get rid of wstr_contains()
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f8cb0c1278..e473ee0f21 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -283,13 +283,6 @@ static const WCHAR wszTimesNewRoman[] = static const WCHAR wszArial[] = {'A','r','i','a','l',0}; -static BOOL wstr_contains(const WCHAR *strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return strstr(buf, stra) != NULL; -} - /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. */ @@ -3484,7 +3477,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i }else { ok(cbPostData == 9, "cbPostData = %d\n", cbPostData); ok(!memcmp(pPostData, "cmd=TEST", cbPostData), "pPostData = %p\n", pPostData); - ok(wstr_contains(lpszHeaders, "Content-Type: application/x-www-form-urlencoded\r\n"), + ok(wcsstr(lpszHeaders, L"Content-Type: application/x-www-form-urlencoded\r\n") != NULL, "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); } -- 2.24.1

3 2

[PATCH 2/3] mshtml/tests: Get rid of a2bstr() in htmldoc.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 40 +++++++++++++------------------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5b21daa6a2..f8cb0c1278 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -290,18 +290,6 @@ static BOOL wstr_contains(const WCHAR *strw, const char *stra) return strstr(buf, stra) != NULL; } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. */ @@ -5366,7 +5354,7 @@ static void test_doscroll(IUnknown *unk) ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("left"); + V_BSTR(&v) = SysAllocString(L"left"); hres = IHTMLElement2_doScroll(elem2, v); SysFreeString(V_BSTR(&v)); IHTMLElement2_Release(elem2); @@ -6099,7 +6087,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr SET_EXPECT(Exec_ShellDocView_84); str = SysAllocString(nav_url); - str2 = a2bstr(""); + str2 = SysAllocString(L""); V_VT(&vempty) = VT_EMPTY; hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); SysFreeString(str); @@ -6254,7 +6242,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); url = SysAllocString(nav_serv_url = nav_url = L"about:blank"); - name = a2bstr("test"); + name = SysAllocString(L"test"); new_window = (void*)0xdeadbeef; trace("open...\n"); @@ -7826,7 +7814,7 @@ static void test_cookies(IHTMLDocument2 *doc) SysFreeString(str); } - str = a2bstr("test=testval"); + str = SysAllocString(L"test=testval"); hres = IHTMLDocument2_put_cookie(doc, str); ok(hres == S_OK, "put_cookie failed: %08x\n", hres); @@ -7843,7 +7831,7 @@ static void test_cookies(IHTMLDocument2 *doc) SysFreeString(str); SysFreeString(str2); - str = a2bstr("test=testval2"); + str = SysAllocString(L"test=testval2"); hres = IHTMLDocument2_put_cookie(doc, str); ok(hres == S_OK, "put_cookie failed: %08x\n", hres); @@ -7871,7 +7859,7 @@ static void test_doc_domain(IHTMLDocument2 *doc) ok(!lstrcmpW(str, L"test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr("winehq.org"); + str = SysAllocString(L"winehq.org"); hres = IHTMLDocument2_put_domain(doc, str); ok(hres == S_OK, "put_domain failed: %08x\n", hres); SysFreeString(str); @@ -7881,7 +7869,7 @@ static void test_doc_domain(IHTMLDocument2 *doc) ok(!lstrcmpW(str, L"winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = a2bstr("winehq.com"); + str = SysAllocString(L"winehq.com"); hres = IHTMLDocument2_put_domain(doc, str); ok(hres == E_INVALIDARG, "put_domain failed: %08x, expected E_INVALIDARG\n", hres); SysFreeString(str); @@ -7970,9 +7958,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) ok(!ref, "ref=%d, expected 0\n", ref); } -static void put_inner_html(IHTMLElement *elem, const char *html) +static void put_inner_html(IHTMLElement *elem, const WCHAR *html) { - BSTR str = a2bstr(html); + BSTR str = SysAllocString(html); HRESULT hres; hres = IHTMLElement_put_innerHTML(elem, str); @@ -7981,10 +7969,10 @@ static void put_inner_html(IHTMLElement *elem, const char *html) SysFreeString(str); } -static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id) +static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) { IHTMLDocument3 *doc3; - BSTR str = a2bstr(id); + BSTR str = SysAllocString(id); IHTMLElement *ret; HRESULT hres; @@ -8055,10 +8043,10 @@ static void test_submit(void) ok(hres == S_OK, "get_body failed: %08x\n", hres); ok(body != NULL, "body = NULL\n"); - put_inner_html(body, "<form action='test_submit' method='post' id='fid'><input type='hidden' name='cmd' value='TEST'></form>"); + put_inner_html(body, L"<form action='test_submit' method='post' id='fid'><input type='hidden' name='cmd' value='TEST'></form>"); IHTMLElement_Release(body); - form_elem = get_elem_by_id(doc, "fid"); + form_elem = get_elem_by_id(doc, L"fid"); ok(form_elem != NULL, "form = NULL\n"); hres = IHTMLElement_QueryInterface(form_elem, &IID_IHTMLFormElement, (void**)&form); @@ -8380,7 +8368,7 @@ static void test_editing_mode(BOOL do_load, BOOL use_design_mode) SET_EXPECT(InPlaceFrame_SetBorderSpace); SET_EXPECT(OnChanged_1014); - on = a2bstr("On"); + on = SysAllocString(L"On"); hres = IHTMLDocument2_put_designMode(doc, on); SysFreeString(on); ok(hres == S_OK, "put_designMode failed: %08x\n", hres); -- 2.24.1

3 2

[PATCH 1/3] mshtml/tests: Get rid of strcmp_wa() in htmldoc.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 136 ++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 69 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2dcc1eecf1..5b21daa6a2 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -238,7 +238,7 @@ static enum load_state_t { } load_state; static LPCOLESTR expect_status_text = NULL; -static const char *nav_url, *nav_serv_url, *prev_url; +static const WCHAR *nav_url, *nav_serv_url, *prev_url; static const char html_page[] = "<html>" @@ -283,13 +283,6 @@ static const WCHAR wszTimesNewRoman[] = static const WCHAR wszArial[] = {'A','r','i','a','l',0}; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static BOOL wstr_contains(const WCHAR *strw, const char *stra) { CHAR buf[512]; @@ -379,7 +372,7 @@ static void test_timer(DWORD flags) static IMoniker Moniker; #define test_GetCurMoniker(u,m,v,t) _test_GetCurMoniker(__LINE__,u,m,v,t) -static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, const char *exurl, BOOL is_todo) +static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, const WCHAR *exurl, BOOL is_todo) { IHTMLDocument2 *doc; IPersistMoniker *permon; @@ -426,7 +419,8 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c if(!*ptr) ok(!lstrcmpW(url, doc_url), "url %s != doc_url %s\n", wine_dbgstr_w(url), wine_dbgstr_w(doc_url)); else - ok(!strcmp_wa(url, nav_serv_url), "url = %s, expected %s\n", wine_dbgstr_w(url), nav_serv_url); + ok(!lstrcmpW(url, nav_serv_url), "url = %s, expected %s\n", wine_dbgstr_w(url), + wine_dbgstr_w(nav_serv_url)); CoTaskMemFree(url); }else if(exurl) { LPOLESTR url; @@ -437,7 +431,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); todo_wine_if(is_todo) - ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); + ok_(__FILE__,line)(!lstrcmpW(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); if(!*ptr) ok_(__FILE__,line)(!lstrcmpW(url, doc_url), "url %s != doc_url %s\n", wine_dbgstr_w(url), wine_dbgstr_w(doc_url)); @@ -446,7 +440,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c ok_(__FILE__,line)(hres == E_UNEXPECTED, "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres); ok_(__FILE__,line)(mon == (IMoniker*)0xdeadbeef, "mon=%p\n", mon); - ok_(__FILE__,line)(!strcmp_wa(doc_url, "about:blank"), "doc_url is not about:blank\n"); + ok_(__FILE__,line)(!lstrcmpW(doc_url, L"about:blank"), "doc_url is not about:blank\n"); } SysFreeString(doc_url); @@ -456,7 +450,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c } #define test_current_url(a,b) _test_current_url(__LINE__,a,b) -static void _test_current_url(unsigned line, IUnknown *unk, const char *exurl) +static void _test_current_url(unsigned line, IUnknown *unk, const WCHAR *exurl) { IHTMLDocument2 *doc; BSTR url; @@ -467,7 +461,8 @@ static void _test_current_url(unsigned line, IUnknown *unk, const char *exurl) hres = IHTMLDocument2_get_URL(doc, &url); ok_(__FILE__,line)(hres == S_OK, "get_URL failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(url, exurl), "Unexpected URL %s, expected %s\n", wine_dbgstr_w(url), exurl); + ok_(__FILE__,line)(!lstrcmpW(url, exurl), "Unexpected URL %s, expected %s\n", wine_dbgstr_w(url), + wine_dbgstr_w(exurl)); SysFreeString(url); IHTMLDocument2_Release(doc); @@ -585,7 +580,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(!grfPI, "grfPI = %x\n", grfPI); ok(!dwReserved, "dwReserved = %lx\n", dwReserved); if(is_mhtml) - ok(!strcmp_wa(szUrl, "winetest:doc"), "unexpected URL %s\n", wine_dbgstr_w(szUrl)); + ok(!lstrcmpW(szUrl, L"winetest:doc"), "unexpected URL %s\n", wine_dbgstr_w(szUrl)); memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); @@ -847,7 +842,8 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB hres = IMoniker_GetDisplayName(mon, NULL, NULL, &location); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(location, nav_url), "unexpected display name %s, expected %s\n", wine_dbgstr_w(location), nav_url); + ok(!lstrcmpW(location, nav_url), "unexpected display name %s, expected %s\n", wine_dbgstr_w(location), + wine_dbgstr_w(nav_url)); CoTaskMemFree(location); IMoniker_Release(mon); @@ -915,9 +911,9 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac { CHECK_EXPECT(EvaluateNewWindow); - ok(!strcmp_wa(pszUrl, "about:blank"), "pszUrl = %s\n", wine_dbgstr_w(pszUrl)); - ok(!strcmp_wa(pszName, "test"), "pszName = %s\n", wine_dbgstr_w(pszName)); - ok(!strcmp_wa(pszUrlContext, prev_url), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); + ok(!lstrcmpW(pszUrl, L"about:blank"), "pszUrl = %s\n", wine_dbgstr_w(pszUrl)); + ok(!lstrcmpW(pszName, L"test"), "pszName = %s\n", wine_dbgstr_w(pszName)); + ok(!lstrcmpW(pszUrlContext, prev_url), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); ok(!fReplace, "fReplace = %x\n", fReplace); ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %x\n", dwFlags); @@ -2643,7 +2639,8 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate); todo_wine_if(loading_hash) - ok(!strcmp_wa(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), nav_serv_url); + ok(!lstrcmpW(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), + wine_dbgstr_w(nav_serv_url)); ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); @@ -2923,7 +2920,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(nav_url) test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE); else if(load_from_stream) - test_GetCurMoniker(doc_unk, NULL, "about:blank", FALSE); + test_GetCurMoniker(doc_unk, NULL, L"about:blank", FALSE); else if(!editmode) test_GetCurMoniker(doc_unk, doc_mon, NULL, FALSE); } @@ -2966,8 +2963,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n", - wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); + ok(!lstrcmpW(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n", + wine_dbgstr_w(V_BSTR(pvaIn)), wine_dbgstr_w(nav_serv_url)); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); ok(V_BOOL(pvaOut) == VARIANT_TRUE, "V_BOOL(pvaOut) = %x\n", V_BOOL(pvaOut)); @@ -3108,7 +3105,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ind = 1; SafeArrayGetElement(sa, &ind, &var); ok(V_VT(&var) == VT_BSTR, "Incorrect data type: %d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "winetest:doc"), "Page address: %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"winetest:doc"), "Page address: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); ind = 2; SafeArrayGetElement(sa, &ind, &var); @@ -3299,11 +3296,11 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember hres = IHTMLDocument2_get_readyState(doc, &state); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - if(!strcmp_wa(state, "interactive")) + if(!lstrcmpW(state, L"interactive")) CHECK_EXPECT(Invoke_OnReadyStateChange_Interactive); - else if(!strcmp_wa(state, "loading")) + else if(!lstrcmpW(state, L"loading")) CHECK_EXPECT(Invoke_OnReadyStateChange_Loading); - else if(!strcmp_wa(state, "complete")) { + else if(!lstrcmpW(state, L"complete")) { CHECK_EXPECT(Invoke_OnReadyStateChange_Complete); complete = TRUE; } else @@ -3488,13 +3485,13 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i CHECK_EXPECT(FireBeforeNavigate2); ok(!pDispatch, "pDispatch = %p\n", pDispatch); - ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); + ok(!lstrcmpW(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), wine_dbgstr_w(nav_url)); ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); ok(!cbPostData, "cbPostData = %d\n", cbPostData); - ok(!lpszHeaders || !strcmp_wa(lpszHeaders, "Referer: http://test.winehq.org/tests/winehq_snapshot/\r\n"), + ok(!lpszHeaders || !lstrcmpW(lpszHeaders, L"Referer: http://test.winehq.org/tests/winehq_snapshot/\r\n"), "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); }else { ok(cbPostData == 9, "cbPostData = %d\n", cbPostData); @@ -4330,7 +4327,7 @@ static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointCo static void test_NavigateWithBindCtx(BSTR uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment) { - ok(!strcmp_wa(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri)); + ok(!lstrcmpW(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri)); ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); ok(!target_frame, "target_frame != NULL\n"); @@ -5391,13 +5388,13 @@ static void _test_readyState(unsigned line, IUnknown *unk) VARIANT out; HRESULT hres; - static const LPCSTR expected_state[] = { - "uninitialized", - "loading", + static const LPCWSTR expected_state[] = { + L"uninitialized", + L"loading", NULL, - "interactive", - "complete", - "uninitialized" + L"interactive", + L"complete", + L"uninitialized" }; if(open_call || resetting_document) @@ -5417,11 +5414,11 @@ static void _test_readyState(unsigned line, IUnknown *unk) hres = IHTMLDocument2_get_readyState(htmldoc, &state); ok(hres == S_OK, "get_ReadyState failed: %08x\n", hres); - if(!strcmp_wa(state, "interactive") && load_state == LD_LOADING) + if(!lstrcmpW(state, L"interactive") && load_state == LD_LOADING) load_state = LD_INTERACTIVE; ok_(__FILE__, line) - (!strcmp_wa(state, expected_state[load_state]), "unexpected state %s, expected %d\n", + (!lstrcmpW(state, expected_state[load_state]), "unexpected state %s, expected %d\n", wine_dbgstr_w(state), load_state); SysFreeString(state); @@ -5439,7 +5436,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) IHTMLElement2_Release(elem2); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(state) = %d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "complete"), "unexpected body state %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"complete"), "unexpected body state %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); }else { ok_(__FILE__,line)(load_state != LD_COMPLETE, "body is NULL in complete state\n"); @@ -5700,7 +5697,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) if(!is_mhtml) test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE); else - test_GetCurMoniker((IUnknown*)persist, NULL, "mhtml:winetest:doc", FALSE); + test_GetCurMoniker((IUnknown*)persist, NULL, L"mhtml:winetest:doc", FALSE); IBindCtx_Release(bind); @@ -5985,17 +5982,17 @@ static void test_Persist(IHTMLDocument2 *doc, IMoniker *mon) } } -static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *href, const char *new_nav_url, BOOL is_js, +static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *href, const WCHAR *new_nav_url, BOOL is_js, BOOL is_hash, DWORD dwl_flags) { - const char *prev_nav_url = NULL; + const WCHAR *prev_nav_url = NULL; IHTMLPrivateWindow *priv_window; IHTMLLocation *location; IHTMLWindow2 *window; BSTR str, str2; HRESULT hres; - trace("put_href %s...\n", new_nav_url); + trace("put_href %s...\n", wine_dbgstr_w(new_nav_url)); loading_js = is_js; loading_hash = is_hash; @@ -6012,7 +6009,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre if(!href) href = new_nav_url; - str = a2bstr(href); + str = SysAllocString(href); SET_EXPECT(TranslateUrl); if(support_wbapp) { SET_EXPECT(FireBeforeNavigate2); @@ -6101,7 +6098,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre SET_EXPECT(Exec_ShellDocView_63); SET_EXPECT(Exec_ShellDocView_84); - str = a2bstr(nav_url); + str = SysAllocString(nav_url); str2 = a2bstr(""); V_VT(&vempty) = VT_EMPTY; hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); @@ -6125,7 +6122,8 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre if(!is_hash) { hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); - ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s, expected %s\n", wine_dbgstr_w(str2), prev_nav_url); + ok(!lstrcmpW(str2, prev_nav_url), "unexpected address bar url: %s, expected %s\n", wine_dbgstr_w(str2), + wine_dbgstr_w(prev_nav_url)); SysFreeString(str2); if(is_js) { @@ -6145,11 +6143,11 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); if(is_js) - ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + ok(!lstrcmpW(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); else if (dwl_flags & DWL_EXTERNAL) - todo_wine ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + todo_wine ok(!lstrcmpW(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); else - ok(!strcmp_wa(str2, nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + ok(!lstrcmpW(str2, nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); IHTMLPrivateWindow_Release(priv_window); @@ -6169,8 +6167,8 @@ static void test_load_history(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); prev_url = nav_url; - nav_url = "http://test.winehq.org/tests/winehq_snapshot/#test"; - nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; + nav_url = L"http://test.winehq.org/tests/winehq_snapshot/#test"; + nav_serv_url = L"http://test.winehq.org/tests/winehq_snapshot/"; SET_EXPECT(Exec_ShellDocView_138); SET_EXPECT(Exec_ShellDocView_67); @@ -6255,7 +6253,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); - url = a2bstr(nav_serv_url = nav_url = "about:blank"); + url = SysAllocString(nav_serv_url = nav_url = L"about:blank"); name = a2bstr("test"); new_window = (void*)0xdeadbeef; @@ -6345,7 +6343,7 @@ static void test_elem_from_point(IHTMLDocument2 *doc) hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); ok(hres == S_OK, "get_tagName failed: %08x\n", hres); - ok(!strcmp_wa(tag, "DIV"), "tag = %s\n", wine_dbgstr_w(tag)); + ok(!lstrcmpW(tag, L"DIV"), "tag = %s\n", wine_dbgstr_w(tag)); } static void test_clear(IHTMLDocument2 *doc) @@ -7492,7 +7490,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); - test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); + test_GetCurMoniker((IUnknown*)doc, NULL, L"about:blank", FALSE); IPersistStreamInit_Release(init); } @@ -7526,7 +7524,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); - test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); + test_GetCurMoniker((IUnknown*)doc, NULL, L"about:blank", FALSE); IPersistStreamInit_Release(init); } @@ -7729,7 +7727,7 @@ static void test_MHTMLDocument(void) init_test(LD_DOLOAD); is_mhtml = TRUE; - nav_url = nav_serv_url = "mhtml:winetest:doc"; + nav_url = nav_serv_url = L"mhtml:winetest:doc"; hres = CoCreateInstance(&CLSID_MHTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); @@ -7751,7 +7749,7 @@ static void test_MHTMLDocument(void) test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE); test_Persist(doc, &Moniker); set_custom_uihandler(doc, &CustomDocHostUIHandler); - test_GetCurMoniker((IUnknown*)doc, NULL, "mhtml:winetest:doc", FALSE); + test_GetCurMoniker((IUnknown*)doc, NULL, L"mhtml:winetest:doc", FALSE); test_download(0); test_exec_onunload(doc); @@ -7870,7 +7868,7 @@ static void test_doc_domain(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_domain(doc, &str); ok(hres == S_OK, "get_domain failed: %08x\n", hres); - ok(!strcmp_wa(str, "test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = a2bstr("winehq.org"); @@ -7880,7 +7878,7 @@ static void test_doc_domain(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_domain(doc, &str); ok(hres == S_OK, "get_domain failed: %08x\n", hres); - ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = a2bstr("winehq.com"); @@ -7890,7 +7888,7 @@ static void test_doc_domain(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_domain(doc, &str); ok(hres == S_OK, "get_domain failed: %08x\n", hres); - ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -7933,19 +7931,19 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_binding_ui((IUnknown*)doc); test_doc_domain(doc); - nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ + nav_url = nav_serv_url = L"http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) { - test_put_href(doc, FALSE, "#test", "http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0); + test_put_href(doc, FALSE, L"#test", L"http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0); test_travellog(doc); test_refresh(doc); } - test_put_href(doc, FALSE, NULL, "javascript:external%20&&undefined", TRUE, FALSE, 0); - test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); - test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0); + test_put_href(doc, FALSE, NULL, L"javascript:external%20&&undefined", TRUE, FALSE, 0); + test_put_href(doc, FALSE, NULL, L"about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); + test_put_href(doc, TRUE, NULL, L"about:replace", FALSE, FALSE, 0); if(support_wbapp) { test_load_history(doc); test_OmHistory(doc); - test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); + test_put_href(doc, FALSE, NULL, L"about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); } prev_url = nav_serv_url; @@ -7953,7 +7951,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) if(!support_wbapp) /* FIXME */ test_open_window(doc, FALSE); if(support_wbapp) { - test_put_href(doc, FALSE, NULL, "http://test.winehq.org/tests/file.winetest", FALSE, FALSE, DWL_EXTERNAL); + test_put_href(doc, FALSE, NULL, L"http://test.winehq.org/tests/file.winetest", FALSE, FALSE, DWL_EXTERNAL); test_window_close(doc); } @@ -8017,7 +8015,7 @@ static void reset_document(IHTMLDocument2 *doc) resetting_document = FALSE; - test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); + test_GetCurMoniker((IUnknown*)doc, NULL, L"about:blank", FALSE); IPersistStreamInit_Release(init); } @@ -8067,7 +8065,7 @@ static void test_submit(void) ok(hres == S_OK, "Could not get IHTMLFormElement: %08x\n", hres); IHTMLElement_Release(form_elem); - nav_url = nav_serv_url = "winetest:test_submit"; + nav_url = nav_serv_url = L"winetest:test_submit"; testing_submit = TRUE; SET_EXPECT(TranslateUrl); -- 2.24.1

3 2

[PATCH] mshtml/tests: Get rid of a2bstr() in script.c
by Michael Stefaniuc 12 Feb '20

12 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/script.c | 59 ++++++++++++++------------------------ 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 27405a71b5..38fd0b4e8a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -172,21 +172,6 @@ static BOOL skip_loadobject_tests; static IActiveScriptSite *site; static SCRIPTSTATE state; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static BOOL init_key(const char *key_name, const char *def_value, BOOL init) { HKEY hkey; @@ -296,7 +281,7 @@ static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VA ok(vt == VT_BSTR, "vt = %d\n", vt); V_VT(dst) = VT_BSTR; - V_BSTR(dst) = a2bstr("red"); + V_BSTR(dst) = SysAllocString(L"red"); return S_OK; } @@ -1943,7 +1928,7 @@ static void test_func(IDispatchEx *obj) VARIANT var; HRESULT hres; - str = a2bstr("toString"); + str = SysAllocString(L"toString"); hres = IDispatchEx_GetDispID(obj, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -2023,7 +2008,7 @@ static void test_nextdispid(IDispatchEx *dispex) VARIANT var; HRESULT hres; - name = a2bstr("dynVal"); + name = SysAllocString(L"dynVal"); hres = IDispatchEx_GetDispID(dispex, name, fdexNameCaseSensitive|fdexNameEnsure, &dyn_id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); SysFreeString(name); @@ -2066,7 +2051,7 @@ static void test_global_id(void) SET_EXPECT(GetScriptDispatch); SET_EXPECT(script_divid_d); - tmp = a2bstr("divid"); + tmp = SysAllocString(L"divid"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); SysFreeString(tmp); @@ -2157,7 +2142,7 @@ static void test_default_arg_conv(IHTMLWindow2 *window) test_elem_disabled(elem, VARIANT_FALSE); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("test"); + V_BSTR(&v) = SysAllocString(L"test"); hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); SysFreeString(V_BSTR(&v)); @@ -2395,7 +2380,7 @@ static void test_script_run(void) test_default_arg_conv(window); IHTMLWindow2_Release(window); - tmp = a2bstr("test"); + tmp = SysAllocString(L"test"); hres = IDispatchEx_DeleteMemberByName(dispex, tmp, fdexNameCaseSensitive); ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); @@ -2405,7 +2390,7 @@ static void test_script_run(void) SET_EXPECT(GetScriptDispatch); SET_EXPECT(script_testprop_d); - tmp = a2bstr("testProp"); + tmp = SysAllocString(L"testProp"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); @@ -2413,7 +2398,7 @@ static void test_script_run(void) CHECK_CALLED(script_testprop_d); SysFreeString(tmp); - tmp = a2bstr("testProp"); + tmp = SysAllocString(L"testProp"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); @@ -2431,7 +2416,7 @@ static void test_script_run(void) SET_EXPECT(GetScriptDispatch); SET_EXPECT(script_testprop2_d); - tmp = a2bstr("testProp2"); + tmp = SysAllocString(L"testProp2"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); ok(id != DISPID_SCRIPT_TESTPROP2, "id == DISPID_SCRIPT_TESTPROP2\n"); @@ -2439,7 +2424,7 @@ static void test_script_run(void) CHECK_CALLED(script_testprop2_d); SysFreeString(tmp); - tmp = a2bstr("test"); + tmp = SysAllocString(L"test"); hres = IDispatchEx_DeleteMemberByName(window_dispex, tmp, fdexNameCaseSensitive); ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); @@ -2835,7 +2820,7 @@ static void report_data(ProtocolHandler *This) CoTaskMemFree(addl_headers); - headers = a2bstr("HTTP/1.1 200 OK\r\n\r\n"); + headers = SysAllocString(L"HTTP/1.1 200 OK\r\n\r\n"); hres = IHttpNegotiate_OnResponse(http_negotiate, 200, headers, NULL, NULL); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); SysFreeString(headers); @@ -3253,7 +3238,7 @@ static const char simple_script_str[] = "<script language=\"TestScript\">simple script</script>" "</body></html>"; -static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char *langa) +static void test_exec_script(IHTMLDocument2 *doc, const WCHAR *codew, const WCHAR *langw) { IHTMLWindow2 *window; BSTR code, lang; @@ -3263,8 +3248,8 @@ static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); - code = a2bstr(codea); - lang = a2bstr(langa); + code = SysAllocString(codew); + lang = SysAllocString(langw); SET_EXPECT(ParseScriptText_execScript); hres = IHTMLWindow2_execScript(window, code, lang, &v); @@ -3274,7 +3259,7 @@ static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char CHECK_CALLED(ParseScriptText_execScript); SysFreeString(lang); - lang = a2bstr("invalid"); + lang = SysAllocString(L"invalid"); V_VT(&v) = 100; hres = IHTMLWindow2_execScript(window, code, lang, &v); ok(hres == CO_E_CLASSSTRING, "execScript failed: %08x, expected CO_E_CLASSSTRING\n", hres); @@ -3323,7 +3308,7 @@ static void test_simple_script(void) CHECK_CALLED(ParseScriptText_script); CHECK_CALLED(SetScriptState_CONNECTED); - test_exec_script(doc, "execScript call", "TestScript"); + test_exec_script(doc, L"execScript call", L"TestScript"); if(site) IActiveScriptSite_Release(site); @@ -3395,17 +3380,17 @@ static void run_js_script(const char *test_name) IMoniker_Release(mon); } -static void run_from_path(const char *path, const char *opt) +static void run_from_path(const WCHAR *path, const char *opt) { - char buf[255] = "http://winetest.example.org"; + WCHAR buf[255] = L"http://winetest.example.org"; IMoniker *mon; BSTR url; HRESULT hres; - strcat(buf, path); + lstrcatW(buf, path); if(opt) - sprintf(buf + strlen(buf), "?%s", opt); - url = a2bstr(buf); + wsprintfW(buf + lstrlenW(buf), L"?%S", opt); + url = SysAllocString(buf); hres = CreateURLMoniker(NULL, url, &mon); SysFreeString(url); ok(hres == S_OK, "CreateUrlMoniker failed: %08x\n", hres); @@ -3436,7 +3421,7 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co document_mode ? "\">" : "", script); - run_from_path("/index.html", opt ? opt : script); + run_from_path(L"/index.html", opt ? opt : script); } static void init_protocol_handler(void) -- 2.24.1

3 2

[PATCH] ieframe: use ARRAY_SIZE for GetLongPathNameW
by Marcus Meissner 12 Feb '20

12 Feb '20

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 7a8946b847..426fe18da0 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3973,7 +3973,7 @@ static void test_FileProtocol(void) } CloseHandle(file); - GetLongPathNameW(file_path, file_path, sizeof(file_path)); + GetLongPathNameW(file_path, file_path, ARRAY_SIZE(file_path)); lstrcatW(file_url, file_path); test_ConnectionPoint(webbrowser, TRUE); -- 2.25.0

2 1

[v2 PATCH 1/3] ntdll: Add threadpool stack information exports.
by Nikolay Sivov 12 Feb '20

12 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/threadpool.c | 50 +++++++++++++++++++++++++++++++++++++---- include/winternl.h | 2 ++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bda..7aa953ca6c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1070,6 +1070,7 @@ @ stdcall TpDisassociateCallback(ptr) @ stdcall TpIsTimerSet(ptr) @ stdcall TpPostWork(ptr) +@ stdcall TpQueryPoolStackInformation(ptr ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) @ stdcall TpReleasePool(ptr) @@ -1078,6 +1079,7 @@ @ stdcall TpReleaseWork(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) +@ stdcall TpSetPoolStackInformation(ptr ptr) @ stdcall TpSetTimer(ptr ptr long long) @ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a7ad321a8b..b7a096f981 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -131,6 +131,7 @@ struct threadpool int min_workers; int num_workers; int num_busy_workers; + TP_POOL_STACK_INFORMATION stack_info; }; enum threadpool_objtype @@ -1648,6 +1649,7 @@ static void tp_waitqueue_unlock( struct threadpool_object *wait ) */ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); struct threadpool *pool; unsigned int i; @@ -1666,10 +1668,12 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) list_init( &pool->pools[i] ); RtlInitializeConditionVariable( &pool->update_event ); - pool->max_workers = 500; - pool->min_workers = 0; - pool->num_workers = 0; - pool->num_busy_workers = 0; + pool->max_workers = 500; + pool->min_workers = 0; + pool->num_workers = 0; + pool->num_busy_workers = 0; + pool->stack_info.StackReserve = nt->OptionalHeader.SizeOfStackReserve; + pool->stack_info.StackCommit = nt->OptionalHeader.SizeOfStackCommit; TRACE( "allocated threadpool %p\n", pool ); @@ -2989,3 +2993,41 @@ VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending ) tp_object_cancel( this ); tp_object_wait( this, FALSE ); } + +/*********************************************************************** + * TpSetPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpSetPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + this->stack_info = *stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * TpQueryPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpQueryPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + *stack_info = this->stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index ea6707714d..5298eaa0f7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3021,6 +3021,7 @@ NTSYSAPI void WINAPI TpCallbackUnloadDllOnCompletion(TP_CALLBACK_INSTANCE * NTSYSAPI void WINAPI TpDisassociateCallback(TP_CALLBACK_INSTANCE *); NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); +NTSYSAPI NTSTATUS WINAPI TpQueryPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); NTSYSAPI void WINAPI TpReleasePool(TP_POOL *); @@ -3029,6 +3030,7 @@ NTSYSAPI void WINAPI TpReleaseWait(TP_WAIT *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); NTSYSAPI void WINAPI TpSetPoolMaxThreads(TP_POOL *,DWORD); NTSYSAPI BOOL WINAPI TpSetPoolMinThreads(TP_POOL *,DWORD); +NTSYSAPI NTSTATUS WINAPI TpSetPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); NTSYSAPI void WINAPI TpSetWait(TP_WAIT *,HANDLE,LARGE_INTEGER *); NTSYSAPI NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); -- 2.25.0

2 5

[PATCH v2 1/2] wined3d: Support AMD alpha to coverage state.
by Paul Gofman 12 Feb '20

12 Feb '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - combine state_blend_object() and state_alpha_to_coverage() to avoid conflicts. dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/state.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 8 +++++++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 859f3e5f1f..b4991d4e5e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27100,7 +27100,7 @@ static void test_alpha_to_coverage(void) colour = get_readback_color(&rb, 64, 64); /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cc7afe5165..4ec882d112 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12173,6 +12173,8 @@ static void glsl_vertex_pipe_pointsize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; + + state_atoc(context, state, state_id); } static void glsl_vertex_pipe_pointscale(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87e1ca4bac..856a4c9867 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -613,10 +613,10 @@ static void state_blend_factor(struct wined3d_context *context, const struct win checkGLcall("glBlendColor"); } -static void state_blend_object(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +void state_atoc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - BOOL alpha_to_coverage = FALSE; + BOOL alpha_to_coverage; if (!gl_info->supported[ARB_MULTISAMPLE]) return; @@ -626,6 +626,23 @@ static void state_blend_object(struct wined3d_context *context, const struct win struct wined3d_blend_state_desc *desc = &state->blend_state->desc; alpha_to_coverage = desc->alpha_to_coverage; } + else + { + if (context->amd_atoc_enabled + && state->render_states[WINED3D_RS_POINTSIZE] != WINED3D_ALPHA_TO_COVERAGE_DISABLE) + return; + + if (state->render_states[WINED3D_RS_POINTSIZE] == WINED3D_ALPHA_TO_COVERAGE_ENABLE) + { + alpha_to_coverage = TRUE; + context->amd_atoc_enabled = 1; + } + else + { + alpha_to_coverage = FALSE; + context->amd_atoc_enabled = 0; + } + } if (alpha_to_coverage) gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); @@ -1532,6 +1549,8 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glPointSize(max(pointsize, FLT_MIN)); checkGLcall("glPointSize(...);"); + + state_atoc(context, state, state_id); } static void state_debug_monitor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4520,7 +4539,7 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_BLEND, { STATE_BLEND, state_blend_object }, WINED3D_GL_EXT_NONE }, + { STATE_BLEND, { STATE_BLEND, state_atoc }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b9b342441..dddf3e120a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -1974,7 +1977,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD amd_atoc_enabled : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -4608,6 +4612,8 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; +void state_atoc(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) DECLSPEC_HIDDEN; -- 2.24.1

2 12

[PATCH] kerberos: Add support for SECQOP_WRAP_NO_ENCRYPT to SpSealMessage.
by Dmitry Timoshkov 12 Feb '20

12 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 3827e5ccbc..f426290673 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1413,11 +1413,21 @@ static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBuf } #ifdef SONAME_LIBGSSAPI_KRB5 -static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) +static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; + int token_idx, data_idx, conf_flag, conf_state; + + if (!quality_of_protection) + conf_flag = 1; /* confidentiality + integrity */ + else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } /* FIXME: multiple data buffers, read-only buffers */ if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; @@ -1439,7 +1449,7 @@ static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *messa iov[3].buffer.length = 0; iov[3].buffer.value = NULL; - ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + ret = pgss_wrap_iov( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) @@ -1452,11 +1462,21 @@ static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *messa return status_gss_to_sspi( ret ); } -static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) +static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; + int token_idx, data_idx, conf_flag, conf_state; + + if (!quality_of_protection) + conf_flag = 1; /* confidentiality + integrity */ + else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } /* FIXME: multiple data buffers, read-only buffers */ if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; @@ -1465,7 +1485,7 @@ static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message ) input.length = message->pBuffers[data_idx].cbBuffer; input.value = message->pBuffers[data_idx].pvBuffer; - ret = pgss_wrap( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); + ret = pgss_wrap( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); TRACE( "gss_wrap returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) @@ -1494,18 +1514,13 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual gss_ctx_id_t ctxt_handle; TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - if (quality_of_protection) - { - FIXME( "flags %08x not supported\n", quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (is_dce_style_context( ctxt_handle )) return seal_message_iov( ctxt_handle, message ); - return seal_message( ctxt_handle, message ); + if (is_dce_style_context( ctxt_handle )) return seal_message_iov( ctxt_handle, message, quality_of_protection ); + return seal_message( ctxt_handle, message, quality_of_protection ); #else FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); return SEC_E_UNSUPPORTED_FUNCTION; -- 2.20.1

1 0

[PATCH] activeds: Implement AllocADsMem and FreeADsMem.
by Dmitry Timoshkov 12 Feb '20

12 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 69c5c447dc..1ac0add3db 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -141,8 +141,7 @@ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbufle */ LPVOID WINAPI AllocADsMem(DWORD cb) { - FIXME("(%d)!stub\n",cb); - return NULL; + return HeapAlloc(GetProcessHeap(), 0, cb); } /***************************************************** @@ -150,8 +149,7 @@ LPVOID WINAPI AllocADsMem(DWORD cb) */ BOOL WINAPI FreeADsMem(LPVOID pMem) { - FIXME("(%p)!stub\n",pMem); - return FALSE; + return HeapFree(GetProcessHeap(), 0, pMem); } /***************************************************** -- 2.20.1

1 0

[PATCH] ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage().
by Nikolay Sivov 12 Feb '20

12 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-com-l1-1-0.spec | 4 +- .../api-ms-win-core-com-l1-1-1.spec | 4 +- dlls/combase/combase.spec | 4 +- dlls/ole32/compobj.c | 71 +++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/tests/compobj.c | 41 +++++++++++ include/objbase.h | 4 ++ 8 files changed, 126 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index bc85dda7fa..eb81d23855 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 9a8f1da3cc..6c3115d600 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 64394f461d..36005929da 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -116,7 +116,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index daa405356f..69b9cec3b3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -637,6 +637,7 @@ static APARTMENT *apartment_construct(DWORD model) list_init(&apt->proxies); list_init(&apt->stubmgrs); list_init(&apt->loaded_dlls); + list_init(&apt->usage_cookies); apt->ipidc = 0; apt->refs = 1; apt->remunk_exported = FALSE; @@ -5268,6 +5269,76 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +struct mta_cookie +{ + struct list entry; +}; + +/*********************************************************************** + * CoIncrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + struct mta_cookie *mta_cookie; + + TRACE("%p\n", cookie); + + *cookie = NULL; + + if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie)))) + return E_OUTOFMEMORY; + + EnterCriticalSection(&csApartment); + + if (MTA) + apartment_addref(MTA); + else + MTA = apartment_construct(0); + list_add_head(&MTA->usage_cookies, &mta_cookie->entry); + + LeaveCriticalSection(&csApartment); + + *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie; + + return S_OK; +} + +/*********************************************************************** + * CoDecrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; + BOOL release = FALSE; + + ERR("%p\n", cookie); + + EnterCriticalSection(&csApartment); + + if (MTA) + { + struct mta_cookie *cur; + + LIST_FOR_EACH_ENTRY(cur, &MTA->usage_cookies, struct mta_cookie, entry) + { + release = mta_cookie == cur; + if (release) + { + list_remove(&cur->entry); + apartment_release(MTA); + break; + } + } + } + + LeaveCriticalSection(&csApartment); + + if (release) + heap_free(mta_cookie); + + return S_OK; +} + /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29f94421d1..e151241673 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -151,6 +151,8 @@ struct apartment HWND win; /* message window (LOCK) */ LPMESSAGEFILTER filter; /* message filter (CS cs) */ BOOL main; /* is this a main-threaded-apartment? (RO) */ + /* MTA-only */ + struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */ }; struct init_spy diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eaf0e6b7f4..dd10d65b78 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -47,6 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3404c806b8..7eb25af9e6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -76,6 +76,8 @@ static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNe static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); +static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -3818,6 +3820,8 @@ static void init_funcs(void) pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); + pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); + pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -3916,6 +3920,42 @@ static void test_CoGetCurrentProcess(void) ok(id2 && id2 != id, "Unexpected id from another thread.\n"); } +static void test_mta_usage(void) +{ + CO_MTA_USAGE_COOKIE cookie, cookie2; + HRESULT hr; + + if (!pCoIncrementMTAUsage) + { + win_skip("CoIncrementMTAUsage() is not available.\n"); + return; + } + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + cookie2 = 0; + hr = pCoIncrementMTAUsage(&cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie2 != NULL && cookie2 != cookie, "Unexpected cookie %p.\n", cookie2); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); +} + START_TEST(compobj) { init_funcs(); @@ -3967,6 +4007,7 @@ START_TEST(compobj) test_GlobalOptions(); test_implicit_mta(); test_CoGetCurrentProcess(); + test_mta_usage(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index 0eae397b43..a17cbeb870 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -287,12 +287,16 @@ typedef enum tagCOINIT COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */ } COINIT; +DECLARE_HANDLE(CO_MTA_USAGE_COOKIE); + HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie); +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); -- 2.25.0

2 1

[PATCH] api-ms: Update EnumDisplayDevicesW() entries.
by Nikolay Sivov 12 Feb '20

12 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 2 +- .../ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec index 587a495563..3283708ec6 100644 --- a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec index ffb8f5b381..ff83143469 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW -- 2.25.0

1 0

[v2 PATCH] mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams.
by Nikolay Sivov 12 Feb '20

12 Feb '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed messed up implementation diff dlls/mfplat/main.c | 50 ++++++++++++++++++-------------------- dlls/mfplat/tests/mfplat.c | 20 ++++++++++++++- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1ebd443131..ef0db5a276 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3287,22 +3287,18 @@ static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +static HRESULT WINAPI bytestream_file_GetCurrentPosition(IMFByteStream *iface, QWORD *position) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); + struct bytestream *stream = impl_from_IMFByteStream(iface); - return E_NOTIMPL; -} + TRACE("%p, %p.\n", iface, position); -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); + if (!position) + return E_INVALIDARG; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + *position = stream->position; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) @@ -3445,6 +3441,19 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } +static HRESULT WINAPI bytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + + EnterCriticalSection(&stream->cs); + stream->position = position; + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, @@ -3453,8 +3462,8 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_GetCapabilities, bytestream_file_GetLength, mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, + bytestream_file_GetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, @@ -3512,19 +3521,6 @@ static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, return S_OK; } -static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); - - EnterCriticalSection(&stream->cs); - stream->position = position; - LeaveCriticalSection(&stream->cs); - - return S_OK; -} - static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3642,7 +3638,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, - bytestream_stream_SetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_stream_IsEndOfStream, bytestream_stream_Read, bytestream_BeginRead, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ec0b01982..67123d0b69 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1340,15 +1340,16 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { IMFByteStream *bytestream, *bytestream2; + QWORD bytestream_length, position; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; - QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; IUnknown *unk; HRESULT hr; WCHAR *str; + BOOL eos; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; @@ -1415,6 +1416,23 @@ static void test_file_stream(void) ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + hr = IMFByteStream_SetCurrentPosition(bytestream, 2 * bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, &position); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.25.0

2 1

[PATCH] oledb32: Add All page to Data Link dialog.
by Alistair Leslie-Hughes 12 Feb '20

12 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 53 +++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 6 +++++ dlls/oledb32/version.rc | 12 +++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index d33d637264..11ee76cddb 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -436,11 +436,57 @@ static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM return 0; } +static void create_page_all_columns(HWND lv) +{ + RECT rc; + WCHAR buf[256]; + LVCOLUMNW column; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + GetWindowRect(lv, &rc); + LoadStringW(instance, IDS_COL_NAME, buf, ARRAY_SIZE(buf)); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right / 2); + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + LoadStringW(instance, IDS_COL_VALUE, buf, ARRAY_SIZE(buf)); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right / 2); + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); +} + +static LRESULT CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + HWND lv = GetDlgItem(hwnd, IDC_LST_PROPERTIES); + create_page_all_columns(lv); + break; + } + case WM_COMMAND: + { + if (LOWORD(wp) == IDC_BTN_EDIT) + { + /* TODO: Implement Connection dialog */ + MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + } + } + } + + return 0; + } + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW pages[3]; + PROPSHEETPAGEW pages[4]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -467,6 +513,11 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); pages[2].pfnDlgProc = data_link_advanced_dlg_proc; + pages[3].dwSize = sizeof(pages[0]); + pages[3].hInstance = instance; + pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_ALL); + pages[3].pfnDlgProc = data_link_all_dlg_proc; + memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = This->hwnd; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 99d3595d4a..5a4c9a2a71 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -57,3 +57,9 @@ #define IDC_GRP_NETWORK 4005 #define IDC_LBL_LEVEL 4006 #define IDC_LBL_PROTECTION 4007 + +#define IDD_ALL 5010 +#define IDC_BTN_EDIT 5011 +#define IDC_LST_PROPERTIES 5012 +#define IDS_COL_NAME 5013 +#define IDS_COL_VALUE 5014 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 33ef916b83..e6bcadd256 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -35,6 +35,8 @@ STRINGTABLE { IDS_PROPSHEET_TITLE "Data Link Properties" IDS_COL_PROVIDER "OLE DB Provider(s)" + IDS_COL_NAME "Name" + IDS_COL_VALUE "Value" IDS_PERM_READ "Read" IDS_PERM_READWRITE "ReadWrite" @@ -98,3 +100,13 @@ BEGIN LTEXT "A&ccess:",-1,14,91,100,8 CONTROL "",IDC_LST_PERMISSIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,83,91,131,55 END + +IDD_ALL DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_CAPTION +CAPTION "All" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_LST_PROPERTIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,213,155 + LTEXT "These are the initialization properties for this type of data. To edit a value, select a property, then choose Edit Value below.",-1,7,7,213,23 + PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT,7,194,60,14 +END -- 2.25.0

1 0

[PATCH 1/6] quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
by Zebediah Figura 12 Feb '20

12 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Thanks to Henri Verbeet. dlls/quartz/vmr9.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 928e98f6056..58a7e2b1218 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -627,7 +627,10 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; + unsigned int row_size; BITMAPINFOHEADER bih; + LONG i, size_left; + char *dst; HRESULT hr; TRACE("filter %p, size %d, image %p.\n", filter, *size, image); @@ -661,7 +664,20 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L if (FAILED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_READONLY))) goto out; - memcpy(image, &bih, min(*size, sizeof(BITMAPINFOHEADER))); + size_left = *size; + memcpy(image, &bih, min(size_left, sizeof(BITMAPINFOHEADER))); + size_left -= sizeof(BITMAPINFOHEADER); + + dst = (char *)image + sizeof(BITMAPINFOHEADER); + row_size = bih.biWidth * bih.biBitCount / 8; + + for (i = 0; i < bih.biHeight && size_left > 0; ++i) + { + memcpy(dst, (char *)locked_rect.pBits + (i * locked_rect.Pitch), min(row_size, size_left)); + dst += row_size; + size_left -= row_size; + } + if (*size > sizeof(BITMAPINFOHEADER)) memcpy((char *)image + sizeof(BITMAPINFOHEADER), locked_rect.pBits, min(*size - sizeof(BITMAPINFOHEADER), bih.biSizeImage)); -- 2.25.0

2 8

[PATCH] tests: Restore the colon in the todo, skip and trace lines.
by Francois Gouget 12 Feb '20

12 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sigh. Some more colons were missing :-( I hacked the build, debian10 and debiant VMs so they have this patch. It should also not interfere with WineTest and all should get back to normal when this patch gets committed. So the TestBot should not be broken for a second day. But some jobs completed before I tweaked the VMs so it's too late for those. include/wine/test.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 7a5606a1ec5..3af3ffd2a91 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -346,7 +346,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d Test marked todo: ", + printf( "%s:%d: Test marked todo: ", data->current_file, data->current_line ); vprintf(msg, args); } @@ -396,7 +396,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d ", data->current_file, data->current_line ); + printf( "%s:%d: ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -410,7 +410,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&skipped); } -- 2.20.1

2 1

sponsored development to make Autodesk's "DWG TrueView" installer work
by René Genz 12 Feb '20

12 Feb '20

Dear sir or madam, I would like to use Autodesk's "DWG TrueView 2020" to open DWG files on GNU/Linux without using a virtual computer running Microsoft Windows. But the installer fails in Crossover and Wine [1]. It is a known issue [2]. You can try the installer yourself [3]. I cannot fix it. I would like to spend money to make the installer work. Whom can I sponsor? At which company can I buy development hours? Are there other options from your point of view? Thank you for your input. [1] I tried "DWG TrueView 2020" with Crossover 18.5.0 without success. The installer fails with error message "Install error 120: Call not implemented." I tried with Wine 4.14, 5.0, and 5.1 staging on Fedora 30 x86_64. Same problem. [2] On 2019-08-24 I reported the problem to Codeweavers at: https://www.codeweavers.com/support/tickets/browse/?ticket_id=1230834 The problem was confirmed 2 days later, but no solution available. I asked for information about sponsored development to no avail. This seems to be the bug on WineHQ.org: https://bugs.winehq.org/show_bug.cgi?id=12532 [3] Since the 2020 version a 64-bit operating system is required. On the website: https://www.autodesk.com/products/dwg/viewers you can download the "DWG TrueView" installer. It is 680 MiB. Note that the installer will download 1.9 GiB during installation. -- Kind regards, René

2 1

[PATCH] include: Fix size of RecordCreateOptionsEnum.
by Brendan Shanks 11 Feb '20

11 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum -- 2.24.1

1 0

[PATCH] include: Fix size of tomConstants enum.
by Brendan Shanks 11 Feb '20

11 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/tom.idl | 342 ++++++++++++++++++++++++------------------------ 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 5c1fd6bd97..fda81777db 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -25,185 +25,185 @@ cpp_quote("#endif") typedef enum tagTomConstants { - tomFalse = 0, - tomTrue = -1, - tomUndefined = -9999999, - tomToggle = -9999998, - tomAutoColor = -9999997, - tomDefault = -9999996, - tomSuspend = -9999995, - tomResume = -9999994, + tomFalse = (int) 0, + tomTrue = (int) -1, + tomUndefined = (int) -9999999, + tomToggle = (int) -9999998, + tomAutoColor = (int) -9999997, + tomDefault = (int) -9999996, + tomSuspend = (int) -9999995, + tomResume = (int) -9999994, /* ITextFont::Reset() modes */ - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, - tomApplyTmp = 4, - tomDisableSmartFont = 8, - tomEnableSmartFont = 9, - tomUsePoints = 10, - tomUseTwips = 11, + tomApplyNow = (int) 0, + tomApplyLater = (int) 1, + tomTrackParms = (int) 2, + tomCacheParms = (int) 3, + tomApplyTmp = (int) 4, + tomDisableSmartFont = (int) 8, + tomEnableSmartFont = (int) 9, + tomUsePoints = (int) 10, + tomUseTwips = (int) 11, - tomBackward = 0xc0000001, - tomForward = 0x3fffffff, - tomMove = 0, - tomExtend = 1, - tomNoSelection = 0, - tomSelectionIP = 1, - tomSelectionNormal = 2, - tomSelectionFrame = 3, - tomSelectionColumn = 4, - tomSelectionRow = 5, - tomSelectionBlock = 6, - tomSelectionInlineShape = 7, - tomSelectionShape = 8, - tomSelStartActive = 1, - tomSelAtEOL = 2, - tomSelOvertype = 4, - tomSelActive = 8, - tomSelReplace = 16, - tomEnd = 0, - tomStart = 32, - tomCollapseEnd = 0, - tomCollapseStart = 1, - tomClientCoord = 256, - tomNone = 0, - tomSingle = 1, - tomWords = 2, - tomDouble = 3, - tomDotted = 4, - tomDash = 5, - tomDashDot = 6, - tomDashDotDot = 7, - tomWave = 8, - tomThick = 9, - tomHair = 10, - tomLineSpaceSingle = 0, - tomLineSpace1pt5 = 1, - tomLineSpaceDouble = 2, - tomLineSpaceAtLeast = 3, - tomLineSpaceExactly = 4, - tomLineSpaceMultiple = 5, - tomAlignLeft = 0, - tomAlignCenter = 1, - tomAlignRight = 2, - tomAlignJustify = 3, - tomAlignDecimal = 3, - tomAlignBar = 4, - tomAlignInterWord = 3, - tomAlignInterLetter = 4, - tomAlignScaled = 5, - tomAlignGlyphs = 6, - tomAlignSnapGrid = 7, - tomSpaces = 0, - tomDots = 1, - tomDashes = 2, - tomLines = 3, - tomThickLines = 4, - tomEquals = 5, - tomTabBack = -3, - tomTabNext = -2, - tomTabHere = -1, - tomListBullet = 1, - tomListNumberAsArabic = 2, - tomListNumberAsLCLetter = 3, - tomListNumberAsUCLetter = 4, - tomListNumberAsLCRoman = 5, - tomListNumberAsUCRoman = 6, - tomListNumberAsSequence = 7, - tomListParentheses = 0x10000, - tomListPeriod = 0x20000, - tomListPlain = 0x30000, - tomCharacter = 1, - tomWord = 2, - tomSentence = 3, - tomParagraph = 4, - tomLine = 5, - tomStory = 6, - tomScreen = 7, - tomSection = 8, - tomColumn = 9, - tomRow = 10, - tomWindow = 11, - tomCell = 12, - tomCharFormat = 13, - tomParaFormat = 14, - tomTable = 15, - tomObject = 16, - tomMatchWord = 2, - tomMatchCase = 4, - tomMatchPattern = 8, + tomBackward = (int) 0xc0000001, + tomForward = (int) 0x3fffffff, + tomMove = (int) 0, + tomExtend = (int) 1, + tomNoSelection = (int) 0, + tomSelectionIP = (int) 1, + tomSelectionNormal = (int) 2, + tomSelectionFrame = (int) 3, + tomSelectionColumn = (int) 4, + tomSelectionRow = (int) 5, + tomSelectionBlock = (int) 6, + tomSelectionInlineShape = (int) 7, + tomSelectionShape = (int) 8, + tomSelStartActive = (int) 1, + tomSelAtEOL = (int) 2, + tomSelOvertype = (int) 4, + tomSelActive = (int) 8, + tomSelReplace = (int) 16, + tomEnd = (int) 0, + tomStart = (int) 32, + tomCollapseEnd = (int) 0, + tomCollapseStart = (int) 1, + tomClientCoord = (int) 256, + tomNone = (int) 0, + tomSingle = (int) 1, + tomWords = (int) 2, + tomDouble = (int) 3, + tomDotted = (int) 4, + tomDash = (int) 5, + tomDashDot = (int) 6, + tomDashDotDot = (int) 7, + tomWave = (int) 8, + tomThick = (int) 9, + tomHair = (int) 10, + tomLineSpaceSingle = (int) 0, + tomLineSpace1pt5 = (int) 1, + tomLineSpaceDouble = (int) 2, + tomLineSpaceAtLeast = (int) 3, + tomLineSpaceExactly = (int) 4, + tomLineSpaceMultiple = (int) 5, + tomAlignLeft = (int) 0, + tomAlignCenter = (int) 1, + tomAlignRight = (int) 2, + tomAlignJustify = (int) 3, + tomAlignDecimal = (int) 3, + tomAlignBar = (int) 4, + tomAlignInterWord = (int) 3, + tomAlignInterLetter = (int) 4, + tomAlignScaled = (int) 5, + tomAlignGlyphs = (int) 6, + tomAlignSnapGrid = (int) 7, + tomSpaces = (int) 0, + tomDots = (int) 1, + tomDashes = (int) 2, + tomLines = (int) 3, + tomThickLines = (int) 4, + tomEquals = (int) 5, + tomTabBack = (int) -3, + tomTabNext = (int) -2, + tomTabHere = (int) -1, + tomListBullet = (int) 1, + tomListNumberAsArabic = (int) 2, + tomListNumberAsLCLetter = (int) 3, + tomListNumberAsUCLetter = (int) 4, + tomListNumberAsLCRoman = (int) 5, + tomListNumberAsUCRoman = (int) 6, + tomListNumberAsSequence = (int) 7, + tomListParentheses = (int) 0x10000, + tomListPeriod = (int) 0x20000, + tomListPlain = (int) 0x30000, + tomCharacter = (int) 1, + tomWord = (int) 2, + tomSentence = (int) 3, + tomParagraph = (int) 4, + tomLine = (int) 5, + tomStory = (int) 6, + tomScreen = (int) 7, + tomSection = (int) 8, + tomColumn = (int) 9, + tomRow = (int) 10, + tomWindow = (int) 11, + tomCell = (int) 12, + tomCharFormat = (int) 13, + tomParaFormat = (int) 14, + tomTable = (int) 15, + tomObject = (int) 16, + tomMatchWord = (int) 2, + tomMatchCase = (int) 4, + tomMatchPattern = (int) 8, /* ITextRange story type values */ - tomUnknownStory = 0, - tomMainTextStory = 1, - tomFootnotesStory = 2, - tomEndnotesStory = 3, - tomCommentsStory = 4, - tomTextFrameStory = 5, - tomEvenPagesHeaderStory = 6, - tomPrimaryHeaderStory = 7, - tomEvenPagesFooterStory = 8, - tomPrimaryFooterStory = 9, - tomFirstPageHeaderStory = 10, - tomFirstPageFooterStory = 11, + tomUnknownStory = (int) 0, + tomMainTextStory = (int) 1, + tomFootnotesStory = (int) 2, + tomEndnotesStory = (int) 3, + tomCommentsStory = (int) 4, + tomTextFrameStory = (int) 5, + tomEvenPagesHeaderStory = (int) 6, + tomPrimaryHeaderStory = (int) 7, + tomEvenPagesFooterStory = (int) 8, + tomPrimaryFooterStory = (int) 9, + tomFirstPageHeaderStory = (int) 10, + tomFirstPageFooterStory = (int) 11, /* ITextFont animation property */ - tomNoAnimation = 0, - tomLasVegasLights = 1, - tomBlinkingBackground = 2, - tomSparkleText = 3, - tomMarchingBlackAnts = 4, - tomMarchingRedAnts = 5, - tomShimmer = 6, - tomWipeDown = 7, - tomWipeRight = 8, - tomAnimationMax = 8, + tomNoAnimation = (int) 0, + tomLasVegasLights = (int) 1, + tomBlinkingBackground = (int) 2, + tomSparkleText = (int) 3, + tomMarchingBlackAnts = (int) 4, + tomMarchingRedAnts = (int) 5, + tomShimmer = (int) 6, + tomWipeDown = (int) 7, + tomWipeRight = (int) 8, + tomAnimationMax = (int) 8, - tomLowerCase = 0, - tomUpperCase = 1, - tomTitleCase = 2, - tomSentenceCase = 4, - tomToggleCase = 5, - tomReadOnly = 0x100, - tomShareDenyRead = 0x200, - tomShareDenyWrite = 0x400, - tomPasteFile = 0x1000, - tomCreateNew = 0x10, - tomCreateAlways = 0x20, - tomOpenExisting = 0x30, - tomOpenAlways = 0x40, - tomTruncateExisting = 0x50, - tomRTF = 0x1, - tomText = 0x2, - tomHTML = 0x3, - tomWordDocument = 0x4, - tomBold = 0x80000001, - tomItalic = 0x80000002, - tomUnderline = 0x80000004, - tomStrikeout = 0x80000008, - tomProtected = 0x80000010, - tomLink = 0x80000020, - tomSmallCaps = 0x80000040, - tomAllCaps = 0x80000080, - tomHidden = 0x80000100, - tomOutline = 0x80000200, - tomShadow = 0x80000400, - tomEmboss = 0x80000800, - tomImprint = 0x80001000, - tomDisabled = 0x80002000, - tomRevised = 0x80004000, - tomNormalCaret = 0, - tomKoreanBlockCaret = 0x1, - tomIncludeInset = 0x1, - tomIgnoreCurrentFont = 0, - tomMatchFontCharset = 0x1, - tomMatchFontSignature = 0x2, - tomCharset = 0x80000000, - tomRE10Mode = 0x1, - tomNoIME = 0x80000, - tomSelfIME = 0x40000 + tomLowerCase = (int) 0, + tomUpperCase = (int) 1, + tomTitleCase = (int) 2, + tomSentenceCase = (int) 4, + tomToggleCase = (int) 5, + tomReadOnly = (int) 0x100, + tomShareDenyRead = (int) 0x200, + tomShareDenyWrite = (int) 0x400, + tomPasteFile = (int) 0x1000, + tomCreateNew = (int) 0x10, + tomCreateAlways = (int) 0x20, + tomOpenExisting = (int) 0x30, + tomOpenAlways = (int) 0x40, + tomTruncateExisting = (int) 0x50, + tomRTF = (int) 0x1, + tomText = (int) 0x2, + tomHTML = (int) 0x3, + tomWordDocument = (int) 0x4, + tomBold = (int) 0x80000001, + tomItalic = (int) 0x80000002, + tomUnderline = (int) 0x80000004, + tomStrikeout = (int) 0x80000008, + tomProtected = (int) 0x80000010, + tomLink = (int) 0x80000020, + tomSmallCaps = (int) 0x80000040, + tomAllCaps = (int) 0x80000080, + tomHidden = (int) 0x80000100, + tomOutline = (int) 0x80000200, + tomShadow = (int) 0x80000400, + tomEmboss = (int) 0x80000800, + tomImprint = (int) 0x80001000, + tomDisabled = (int) 0x80002000, + tomRevised = (int) 0x80004000, + tomNormalCaret = (int) 0, + tomKoreanBlockCaret = (int) 0x1, + tomIncludeInset = (int) 0x1, + tomIgnoreCurrentFont = (int) 0, + tomMatchFontCharset = (int) 0x1, + tomMatchFontSignature = (int) 0x2, + tomCharset = (int) 0x80000000, + tomRE10Mode = (int) 0x1, + tomNoIME = (int) 0x80000, + tomSelfIME = (int) 0x40000 } tomConstants; interface ITextRange; -- 2.24.1

1 0

[PATCH 1/5] wined3d: Use a bitmask for the {v, p}s_const_f fields in struct wined3d_saved_states.
by Matteo Bruni 11 Feb '20

11 Feb '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/device.c | 5 ++- dlls/wined3d/stateblock.c | 63 ++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84056437414..2297d7de916 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -27,7 +27,6 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif @@ -3848,7 +3847,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) { - if (stateblock->changed.vs_consts_f[i]) + if (stateblock->changed.vs_consts_f[i >> 5] & (1u << (i & 0x1f))) ++count; else if (count) { @@ -3890,7 +3889,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) { - if (stateblock->changed.ps_consts_f[i]) + if (stateblock->changed.ps_consts_f[i >> 5] & (1u << (i & 0x1f))) ++count; else if (count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 499d23fbbd3..6d1562cc60e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -189,7 +189,7 @@ static const DWORD vertex_states_sampler[] = WINED3D_SAMP_DMAP_OFFSET, }; -static inline void stateblock_set_bits(DWORD *map, UINT map_size) +static inline void stateblock_set_all_bits(DWORD *map, UINT map_size) { DWORD mask = (1u << (map_size & 0x1f)) - 1; memset(map, 0xff, (map_size >> 5) * sizeof(*map)); @@ -201,7 +201,6 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, { unsigned int i; - /* Single values */ states->indices = 1; states->material = 1; states->viewport = 1; @@ -210,12 +209,11 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShader = 1; states->scissorRect = 1; - /* Fixed size arrays */ states->streamSource = 0xffff; states->streamFreq = 0xffff; states->textures = 0xfffff; - stateblock_set_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); - stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + stateblock_set_all_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); + stateblock_set_all_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; @@ -224,9 +222,8 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShaderConstantsB = 0xffff; states->vertexShaderConstantsI = 0xffff; - /* Dynamically sized arrays */ - memset(states->ps_consts_f, TRUE, sizeof(BOOL) * ps_consts); - memset(states->vs_consts_f, TRUE, sizeof(BOOL) * vs_consts); + memset(states->ps_consts_f, 0xffu, sizeof(states->ps_consts_f)); + memset(states->vs_consts_f, 0xffu, sizeof(states->vs_consts_f)); } static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants) @@ -252,7 +249,7 @@ static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; - memset(states->ps_consts_f, TRUE, sizeof(BOOL) * num_constants); + memset(states->ps_consts_f, 0xffu, sizeof(states->ps_consts_f)); } static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants) @@ -279,12 +276,12 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexShaderConstantsB = 0xffff; states->vertexShaderConstantsI = 0xffff; - memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); + memset(states->vs_consts_f, 0xffu, sizeof(states->vs_consts_f)); } void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { - const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; unsigned int i, j; for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) @@ -311,11 +308,14 @@ void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *s } } - for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) { - if (stateblock->changed.vs_consts_f[i]) + DWORD bitmask = stateblock->changed.vs_consts_f[i]; + + while (bitmask) { - stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i; + j = wined3d_bit_scan(&bitmask); + stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i * word_bit_count + j; ++stateblock->num_contained_vs_consts_f; } } @@ -338,11 +338,14 @@ void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *s } } - for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) { - if (stateblock->changed.ps_consts_f[i]) + DWORD bitmask = stateblock->changed.ps_consts_f[i]; + + while (bitmask) { - stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i; + j = wined3d_bit_scan(&bitmask); + stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i * word_bit_count + j; ++stateblock->num_contained_ps_consts_f; } } @@ -1280,6 +1283,28 @@ void CDECL wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *state stateblock->changed.vertexShader = TRUE; } +static void wined3d_bitmask_set_bits(DWORD *bitmask, unsigned int offset, unsigned int count) +{ + const unsigned int word_bit_count = sizeof(*bitmask) * CHAR_BIT; + const unsigned int shift = offset % word_bit_count; + + bitmask += offset / word_bit_count; + *bitmask |= ~0u >> (word_bit_count - min(count, word_bit_count)) << shift; + ++bitmask; + count -= min(count, word_bit_count - shift); + if (!count) + return; + if (count >= word_bit_count) + { + memset(bitmask, 0xffu, count / CHAR_BIT); + bitmask += count / word_bit_count; + count = count % word_bit_count; + if (!count) + return; + } + *bitmask |= (1u << count) - 1; +} + HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { @@ -1290,7 +1315,7 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stat return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); - memset(&stateblock->changed.vs_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.vs_consts_f)); + wined3d_bitmask_set_bits(stateblock->changed.vs_consts_f, start_idx, count); return WINED3D_OK; } @@ -1356,7 +1381,7 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); - memset(&stateblock->changed.ps_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.ps_consts_f)); + wined3d_bitmask_set_bits(stateblock->changed.ps_consts_f, start_idx, count); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52bf..c8b22832e65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3919,10 +3919,10 @@ struct wined3d_saved_states DWORD clipplane; /* WINED3D_MAX_USER_CLIP_PLANES, 32 */ WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - BOOL ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; + DWORD ps_consts_f[WINED3D_MAX_PS_CONSTS_F >> 5]; WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - BOOL vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; + DWORD vs_consts_f[WINED3D_MAX_VS_CONSTS_F >> 5]; DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ DWORD indices : 1; DWORD material : 1; -- 2.24.1

3 12

[PATCH] user32: Allow using null driver as a normal graphics driver.
by Jacek Caban 11 Feb '20

11 Feb '20

When explicitly requested by config, Wine will use null driver in the same way as we allow using it for invisible winstations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 33 +++++++++++++++++---------------- programs/explorer/desktop.c | 10 +++++++++- 2 files changed, 26 insertions(+), 17 deletions(-)

2 1

[PATCH 0/2] winealsa.drv: cooperate with other sequencer clients
by Jacek Konieczny 11 Feb '20

11 Feb '20

winealsa.drv uses ALSA sequencer interface to access MIDI ports. It is generally the preferred API for that in Linux, as it allows multiple applications access MIDI hardware at the same time and to route messages between software MIDI ports. The connections between the applications and hardware can be controlled within the app or by external tools. Unfortunately wine uses the API in a way that won't allow other aplications to alter its MIDI connections. It disallows external changes to the connections and does not use the configured connection (subscriptions) to send outgoing messages (instead, it addresses the target device directly). That has been already confusing, as e.g. https://bugs.winehq.org/show_bug.cgi?id=43725 shows. Enabling other apps to alter wine MIDI connection has many use cases, like: - fixing Windows application that fail to select proper MIDI device - reverse-engineering Windows application controlling external MIDI hardware (recording SYSEX messages) - adding Linux application in the MIDI chain for processing MIDI streams before they hit the target device Jacek Konieczny (2): winealsa.drv: allow external MIDI port connection changes winealsa.drv: send MIDI events to port subscribers dlls/winealsa.drv/midi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.17.1

2 4

[PATCH] include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.
by Jacek Caban 11 Feb '20

11 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> This is useful for winelib applications that don't use -fshort-wchar. They may use u"" for string literals and u16string. However, C++ has builtin char16_t type, so we need WCHAR to be compatible with that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/sqltypes.h | 4 +++- include/tchar.h | 4 +++- include/winnt.h | 9 ++++++--- include/winnt.rh | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-)

1 0

[PATCH] d3dx9_36: Support D3DFMT_X8L8V8U8 in DDS files.
by Zebediah Figura 11 Feb '20

11 Feb '20

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I have been unable to determine an application that requires this. dlls/d3dx9_36/surface.c | 14 ++++++++++++++ dlls/d3dx9_36/tests/surface.c | 2 ++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 29325d5c0a2..42e7bf16f1f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -111,6 +111,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) #define DDS_PF_RGB 0x40 #define DDS_PF_YUV 0x200 #define DDS_PF_LUMINANCE 0x20000 +#define DDS_PF_BUMPLUMINANCE 0x40000 #define DDS_PF_BUMPDUDV 0x80000 struct dds_pixel_format @@ -360,6 +361,17 @@ static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_form return D3DFMT_UNKNOWN; } +static D3DFORMAT dds_bump_luminance_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + if (pixel_format->bpp == 32 && pixel_format->rmask == 0x000000ff && pixel_format->gmask == 0x0000ff00 + && pixel_format->bmask == 0x00ff0000) + return D3DFMT_X8L8V8U8; + + WARN("Unknown bump pixel format (%u, %#x, %#x, %#x, %#x).\n", pixel_format->bpp, + pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); + return D3DFMT_UNKNOWN; +} + static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) { TRACE("pixel_format: size %u, flags %#x, fourcc %#x, bpp %u.\n", pixel_format->size, @@ -377,6 +389,8 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return dds_alpha_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_BUMPDUDV) return dds_bump_to_d3dformat(pixel_format); + if (pixel_format->flags & DDS_PF_BUMPLUMINANCE) + return dds_bump_luminance_to_d3dformat(pixel_format); WARN("Unknown pixel format (flags %#x, fourcc %#x, bpp %u, r %#x, g %#x, b %#x, a %#x)\n", pixel_format->flags, pixel_format->fourcc, pixel_format->bpp, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 1a39d82961d..d5d3d6d2112 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -235,6 +235,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PF_FOURCC 0x00000004 #define DDS_PF_RGB 0x00000040 #define DDS_PF_LUMINANCE 0x00020000 +#define DDS_PF_BUMPLUMINANCE 0x00040000 #define DDS_PF_BUMPDUDV 0x00080000 struct dds_pixel_format @@ -703,6 +704,7 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); + check_dds_pixel_format(DDS_PF_BUMPLUMINANCE, 0, 32, 0x0000ff, 0x00ff00, 0xff0000, 0, D3DFMT_X8L8V8U8); test_dds_header_handling(); -- 2.25.0

3 3

[PATCH v4 1/7] vbscript: Fail if we have no context in InvokeEx.
by Gabriel Ivăncescu 11 Feb '20

11 Feb '20

The current code can't cope with it, so do the same thing as in GetDispID, to prevent a possible crash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Added a lot more tests. Store a ref to the named item in vbscode_t. Implement SCRIPTITEM_CODEONLY properly. dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b..36eba21 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1388,6 +1388,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if (!This->ctx) + return E_UNEXPECTED; + if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; -- 2.21.0

2 10

[PATCH] gdiplus: Print fixme in GdipGetNearestColor only once.
by Dmitry Timoshkov 11 Feb '20

11 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f3272b281..e8606f6b60 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4785,8 +4785,9 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if (graphics->image->type == ImageTypeBitmap) { + static int once; GpBitmap *bitmap = (GpBitmap *)graphics->image; - if (IsIndexedPixelFormat(bitmap->format)) + if (IsIndexedPixelFormat(bitmap->format) && !once++) FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); } -- 2.20.1

3 2

[PATCH 1/2] gdiplus: Fix calculation for 32-bit PARGB to ARGB conversion.
by Jeff Smith 11 Feb '20

11 Feb '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/image.c | 13 +++++++++---- dlls/gdiplus/tests/image.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9fa2aaee95..29fba1a9c1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -239,12 +239,17 @@ static inline void getpixel_32bppPARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, { *a = row[x*4+3]; if (*a == 0) - *r = *g = *b = 0; + { + *r = row[x*4+2]; + *g = row[x*4+1]; + *b = row[x*4]; + } else { - *r = row[x*4+2] * 255 / *a; - *g = row[x*4+1] * 255 / *a; - *b = row[x*4] * 255 / *a; + DWORD scaled_q = (255 << 15) / *a; + *r = (row[x*4+2] > *a) ? 0xff : (row[x*4+2] * scaled_q) >> 15; + *g = (row[x*4+1] > *a) ? 0xff : (row[x*4+1] * scaled_q) >> 15; + *b = (row[x*4] > *a) ? 0xff : (row[x*4] * scaled_q) >> 15; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5923611163..7334a756ae 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4806,6 +4806,39 @@ static void test_ARGB_conversion(void) GdipDisposeImage((GpImage *)bitmap); } +static void test_PARGB_conversion(void) +{ + BYTE pargb[8] = { 0x62,0x77,0x99,0x77, 0x62,0x77,0x99,0 }; + BYTE argb[8] = { 0xd1,0xfe,0xff,0x77, 0x62,0x77,0x99,0 }; + BYTE *bits; + GpBitmap *bitmap; + BitmapData data; + GpStatus status; + int match; + + status = GdipCreateBitmapFromScan0(2, 1, 8, PixelFormat32bppPARGB, pargb, &bitmap); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppARGB, "expected PixelFormat32bppARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, argb, sizeof(argb)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + GdipDisposeImage((GpImage *)bitmap); +} + static void test_CloneBitmapArea(void) { @@ -5626,6 +5659,7 @@ START_TEST(image) test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); + test_PARGB_conversion(); test_DrawImage_scale(); test_image_format(); test_DrawImage(); -- 2.23.0

2 3

[PATCH 1/5] d3d9: Retrieve vertex shader constants from the primary stateblock.
by Zebediah Figura 11 Feb '20

11 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 51 +++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a7072162d5..bc9a3b98b2 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -114,7 +114,7 @@ struct d3d9_device DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ - unsigned int max_user_clip_planes; + unsigned int max_user_clip_planes, vs_uniform_count; UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fe23625a05..f0741045ad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3567,26 +3567,29 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *iface, - UINT reg_idx, float *data, UINT count) + UINT start_idx, float *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (reg_idx + count > D3D9_MAX_VERTEX_SHADER_CONSTANTF) + if (!constants) + return D3DERR_INVALIDCALL; + + if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) { WARN("Trying to access %u constants, but d3d9 only supports %u\n", - reg_idx + count, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + start_idx + count, device->vs_uniform_count); return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, - reg_idx, count, (struct wined3d_vec4 *)data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *iface, @@ -3609,19 +3612,24 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *iface, - UINT reg_idx, int *data, UINT count) + UINT start_idx, int *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_ivec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_i(device->wined3d_device, - reg_idx, count, (struct wined3d_ivec4 *)data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_i; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *iface, @@ -3642,18 +3650,22 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *iface, - UINT reg_idx, BOOL *data, UINT count) + UINT start_idx, BOOL *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data); + memcpy(constants, &wined3d_stateblock_get_state(device->state)->vs_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, @@ -4609,6 +4621,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_get_device_caps(wined3d, adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; + device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) count = caps.NumberOfAdaptersInGroup; -- 2.25.0

3 14

[PATCH] wpp: Do not pass NULL %s to fprintf.
by Rémi Bernon 11 Feb '20

11 Feb '20

It works but it's undefined behavior and it generates a warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/wpp/ppl.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 4fd12c6b172..505df41bcf9 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1620,8 +1620,8 @@ void pp_do_include(char *fname, int type) pp_incl_state.ppp = NULL; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='(null)', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ifdepth); pp_status.file = fp; ppy__switch_to_buffer(ppy__create_buffer(NULL, YY_BUF_SIZE)); -- 2.25.0

1 0

[PATCH] tests: Restore the colon in the test summary line.
by Francois Gouget 11 Feb '20

11 Feb '20

Adjust the silenced tests line to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sorry. The previous patch was not meant to change the test summary line. include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index edaf89bcca9..7a5606a1ec5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -550,10 +550,10 @@ static int run_test( const char *name ) if (winetest_debug) { if (muted_todo_successes || muted_skipped || muted_traces) - printf( "%04x:%s Silenced %d todos, %d skips and %d traces.\n", + printf( "%04x:%s: Silenced %d todos, %d skips and %d traces.\n", GetCurrentProcessId(), test->name, muted_todo_successes, muted_skipped, muted_traces); - printf( "%04x:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", GetCurrentProcessId(), test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, -- 2.20.1

1 0

[PATCH] ieframe/tests: Get rid of a2bstr() and strcmp_wa()
by Jacek Caban 11 Feb '20

11 Feb '20

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/webbrowser.c | 104 +++++++++++++------------------- 1 file changed, 43 insertions(+), 61 deletions(-)

2 1

[PATCH] ieframe/tests: Get rid of a2bstr() in ie.c
by Michael Stefaniuc 11 Feb '20

11 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/tests/ie.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 4d51f70329..b2c39e7baa 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -59,18 +59,6 @@ DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); static BOOL navigate_complete; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { @@ -223,7 +211,7 @@ static void test_window(IWebBrowser2 *wb) ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); } -static void test_navigate(IWebBrowser2 *wb, const char *url) +static void test_navigate(IWebBrowser2 *wb, const WCHAR *url) { VARIANT urlv, emptyv; MSG msg; @@ -232,7 +220,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url) SET_EXPECT(Invoke_NAVIGATECOMPLETE2); V_VT(&urlv) = VT_BSTR; - V_BSTR(&urlv) = a2bstr(url); + V_BSTR(&urlv) = SysAllocString(url); V_VT(&emptyv) = VT_EMPTY; hres = IWebBrowser2_Navigate2(wb, &urlv, &emptyv, &emptyv, &emptyv, &emptyv); ok(hres == S_OK, "Navigate2 failed: %08x\n", hres); @@ -284,7 +272,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); test_window(wb); - test_navigate(wb, "http://test.winehq.org/tests/hello.html"); + test_navigate(wb, L"http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE); -- 2.24.1

2 1

[PATCH] mshtml/tests: Get rid of strcmp_wa() in script.c
by Michael Stefaniuc 11 Feb '20

11 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/script.c | 55 +++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 87ac62a6a7..27405a71b5 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -172,13 +172,6 @@ static BOOL skip_loadobject_tests; static IActiveScriptSite *site; static SCRIPTSTATE state; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -509,21 +502,21 @@ static IDispatchEx funcDisp = { &testObjVtbl }; static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "testProp")) { + if(!lstrcmpW(bstrName, L"testProp")) { CHECK_EXPECT(script_testprop_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP; return S_OK; } - if(!strcmp_wa(bstrName, "testProp2")) { + if(!lstrcmpW(bstrName, L"testProp2")) { CHECK_EXPECT(script_testprop2_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP2; return S_OK; } - if(!strcmp_wa(bstrName, "divid")) { + if(!lstrcmpW(bstrName, L"divid")) { CHECK_EXPECT(script_divid_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); return E_FAIL; @@ -583,31 +576,31 @@ static IDispatchEx scriptDisp = { &scriptDispVtbl }; static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "ok")) { + if(!lstrcmpW(bstrName, L"ok")) { *pid = DISPID_EXTERNAL_OK; return S_OK; } - if(!strcmp_wa(bstrName, "trace")) { + if(!lstrcmpW(bstrName, L"trace")) { *pid = DISPID_EXTERNAL_TRACE; return S_OK; } - if(!strcmp_wa(bstrName, "reportSuccess")) { + if(!lstrcmpW(bstrName, L"reportSuccess")) { *pid = DISPID_EXTERNAL_REPORTSUCCESS; return S_OK; } - if(!strcmp_wa(bstrName, "todo_wine_ok")) { + if(!lstrcmpW(bstrName, L"todo_wine_ok")) { *pid = DISPID_EXTERNAL_TODO_WINE_OK; return S_OK; } - if(!strcmp_wa(bstrName, "broken")) { + if(!lstrcmpW(bstrName, L"broken")) { *pid = DISPID_EXTERNAL_BROKEN; return S_OK; } - if(!strcmp_wa(bstrName, "win_skip")) { + if(!lstrcmpW(bstrName, L"win_skip")) { *pid = DISPID_EXTERNAL_WIN_SKIP; return S_OK; } - if(!strcmp_wa(bstrName, "writeStream")) { + if(!lstrcmpW(bstrName, L"writeStream")) { *pid = DISPID_EXTERNAL_WRITESTREAM; return S_OK; } @@ -1981,7 +1974,7 @@ static void test_func(IDispatchEx *obj) VARIANT args[2]; ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); dp.rgdispidNamedArgs = named_args; @@ -1995,7 +1988,7 @@ static void test_func(IDispatchEx *obj) hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } @@ -2014,7 +2007,7 @@ static void test_func(IDispatchEx *obj) hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "\nfunction toString() {\n [native code]\n}\n"), + ok(!lstrcmpW(V_BSTR(&var), L"\nfunction toString() {\n [native code]\n}\n"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); todo_wine CHECK_CALLED(QS_IActiveScriptSite); @@ -2049,9 +2042,9 @@ static void test_nextdispid(IDispatchEx *dispex) ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); if(id == dyn_id) - ok(!strcmp_wa(name, "dynVal"), "name = %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"dynVal"), "name = %s\n", wine_dbgstr_w(name)); else if(id == DISPID_IOMNAVIGATOR_PLATFORM) - ok(!strcmp_wa(name, "platform"), "name = %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"platform"), "name = %s\n", wine_dbgstr_w(name)); SysFreeString(name); last_id = id; @@ -2465,19 +2458,19 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(pvarResult != NULL, "pvarResult == NULL\n"); ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); - if(!strcmp_wa(pstrCode, "execScript call")) { + if(!lstrcmpW(pstrCode, L"execScript call")) { CHECK_EXPECT(ParseScriptText_execScript); ok(!pstrItemName, "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); - ok(!strcmp_wa(pstrDelimiter, "\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(!lstrcmpW(pstrDelimiter, L"\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %x\n", dwFlags); V_VT(pvarResult) = VT_I4; V_I4(pvarResult) = 10; return S_OK; - }else if(!strcmp_wa(pstrCode, "simple script")) { + }else if(!lstrcmpW(pstrCode, L"simple script")) { CHECK_EXPECT(ParseScriptText_script); - ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); - ok(!strcmp_wa(pstrDelimiter, "</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(!lstrcmpW(pstrItemName, L"window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!lstrcmpW(pstrDelimiter, L"</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %x\n", dwFlags); test_script_run(); @@ -2682,7 +2675,7 @@ static HRESULT WINAPI ActiveScript_GetScriptDispatch(IActiveScript *iface, LPCOL { CHECK_EXPECT(GetScriptDispatch); - ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!lstrcmpW(pstrItemName, L"window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); if(!script_disp) return E_NOTIMPL; @@ -3102,10 +3095,10 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, if(FAILED(hres)) return hres; - if(!strcmp_wa(path, "/index.html")) { + if(!lstrcmpW(path, L"/index.html")) { This->data = index_html_data; This->size = strlen(This->data); - }else if(!strcmp_wa(path, "/echo.php")) { + }else if(!lstrcmpW(path, L"/echo.php")) { ok(This->bind_info.dwBindVerb == BINDVERB_POST, "unexpected bind verb %d\n", This->bind_info.dwBindVerb == BINDVERB_POST); todo_wine ok(This->bind_info.stgmedData.tymed == TYMED_ISTREAM, "tymed = %x\n", This->bind_info.stgmedData.tymed); switch(This->bind_info.stgmedData.tymed) { @@ -3120,7 +3113,7 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, default: ok(0, "unexpected tymed %d\n", This->bind_info.stgmedData.tymed); } - }else if(!strcmp_wa(path, "/jsstream.php")) { + }else if(!lstrcmpW(path, L"/jsstream.php")) { BSTR query; hres = IUri_GetQuery(uri, &query); -- 2.24.1

2 1

[PATCH] ucrtbase: Added stub for _get_FMA3_enable.
by Piotr Caban 11 Feb '20

11 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 15 ++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-)

2 1

[PATCH] makedep: Use -mno-cygwin for linking modules with no sources.
by Jacek Caban 11 Feb '20

11 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH] po: Update German translation.
by Julian Rüger 11 Feb '20

11 Feb '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 5

[PATCH] gdi32: Fix function names in comments.
by Akihiro Sagawa 11 Feb '20

11 Feb '20

Should I rewrite these function tables by using C99 notation instead? Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/path.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 1/9] include: Add the rest of async callback flags.
by Nikolay Sivov 11 Feb '20

11 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfobjects.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 203acc770f..758fd82cb1 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -425,8 +425,11 @@ interface IMFRemoteAsyncCallback : IUnknown HRESULT Invoke([in] HRESULT hr, [in] IUnknown *pRemoteResult); } -cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x0001") -cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x0002" ) +cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x00000001") +cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x00000002") +cpp_quote("#define MFASYNC_BLOCKING_CALLBACK 0x00000004") +cpp_quote("#define MFASYNC_REPLY_CALLBACK 0x00000008") +cpp_quote("#define MFASYNC_LOCALIZE_REMOTE_CALLBACK 0x00000010") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_UNDEFINED 0x00000000") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_STANDARD 0x00000001") -- 2.25.0

2 11

[PATCH 1/2] crypt32/tests: Detect missing HEXRAW support by output.
by Nikolay Sivov 11 Feb '20

11 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/tests/base64.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index ac41d5c86d..874f8e432d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -363,11 +363,16 @@ static void test_CryptBinaryToString(void) heap_free(encodedW); } - /* winxp and win2k3 are documented as not handling HEXRAW but do not return failure */ - GetVersionExA(&ver); - if (ver.dwMajorVersion <= 5) + /* Systems that don't support HEXRAW format convert to BASE64 instead - 3 bytes in -> 4 chars + crlf + 1 null out. */ + strLen = 0; + ret = CryptBinaryToStringW(input, 3, CRYPT_STRING_HEXRAW, NULL, &strLen); +todo_wine { + ok(ret, "Failed to get string length.\n"); + ok(strLen == 9 || broken(strLen == 7), "Unexpected string length %d.\n", strLen); +} + if (strLen == 7) { - win_skip("CryptBinaryToString(HEX) not supported\n"); + win_skip("CryptBinaryToString(HEXRAW) not supported\n"); return; } @@ -376,6 +381,12 @@ static void test_CryptBinaryToString(void) for (i = 0; i < ARRAY_SIZE(flags); i++) { + strLen = 0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); +todo_wine { + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen > 0, "Unexpected string length.\n"); +} strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); -- 2.25.0

2 3

[PATCH v2] bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider.
by Hans Leidekker 11 Feb '20

11 Feb '20

v2: Rebased. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index d026dab729..5cc2c249da 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -154,7 +154,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - BOOL hmac; + ULONG flags; }; #if defined(HAVE_GNUTLS_CIPHER_INIT) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ac36d3db0..298bfb4007 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -216,7 +216,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { - const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; + const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG | BCRYPT_HASH_REUSABLE_FLAG; struct algorithm *alg; enum alg_id alg_id; ULONG i; @@ -254,7 +254,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->mode = MODE_ID_CBC; - alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; + alg->flags = flags; *handle = alg; return STATUS_SUCCESS; @@ -692,8 +692,9 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - if (alg->hmac) hash->flags = HASH_FLAG_HMAC; - if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; + if (alg->flags & BCRYPT_ALG_HANDLE_HMAC_FLAG) hash->flags = HASH_FLAG_HMAC; + if ((alg->flags & BCRYPT_HASH_REUSABLE_FLAG) || (flags & BCRYPT_HASH_REUSABLE_FLAG)) + hash->flags |= HASH_FLAG_REUSABLE; if (secretlen && !(hash->secret = heap_alloc( secretlen ))) { -- 2.20.1

2 1

[PATCH] dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace().
by Nikolay Sivov 11 Feb '20

11 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 16 ++++++++++++++-- dlls/dwrite/tests/font.c | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 353282bbd4..bd969a8fa6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -6493,9 +6493,21 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) { - FIXME("%p, %p.\n", iface, fontface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + IDWriteFontFace3 *fontface3; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontface); + + /* FIXME: created instance should likely respect given axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, + &fontface3))) + { + hr = IDWriteFontFace3_QueryInterface(fontface3, &IID_IDWriteFontFace5, (void **)fontface); + IDWriteFontFace3_Release(fontface3); + } + + return hr; } static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d21326f7c9..38a7b4f3f8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9633,6 +9633,10 @@ static void test_font_resource(void) ok(hr == S_OK, "Failed to get axis values, hr %#x.\n", hr); ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected axis tag.\n"); + hr = IDWriteFontFaceReference1_CreateFontFace(reference, &fontface5); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + IDWriteFontFace5_Release(fontface5); + IDWriteFontFaceReference1_Release(reference); IDWriteFontFile_Release(fontfile); -- 2.25.0

2 1

[PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.
by Dmitry Timoshkov 11 Feb '20

11 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/Makefile.in | 1 + dlls/adsldp/tests/ldap.c | 81 +++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/sysinfo.c | 2 + 3 files changed, 84 insertions(+) create mode 100644 dlls/adsldp/tests/ldap.c diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 777d2aa9de..52141139d5 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = adsldp.dll IMPORTS = ole32 oleaut32 secur32 advapi32 uuid C_SRCS = \ + ldap.c \ sysinfo.c diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c new file mode 100644 index 0000000000..e2ce9ee1a2 --- /dev/null +++ b/dlls/adsldp/tests/ldap.c @@ -0,0 +1,81 @@ +/* + * LDAPNamespace Tests + * + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +static void test_LDAP(void) +{ + HRESULT hr; + IUnknown *unk; + IADs *ads; + IADsOpenDSObject *ads_open; + IDispatch *disp; + BSTR path; + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); + ok(hr == S_OK, "got %#x\n", hr); + IADs_Release(ads); + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(disp); + + hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); + ok(hr == S_OK, "got %#x\n", hr); + IADsOpenDSObject_Release(ads_open); + + path = SysAllocString(L"LDAP:"); + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + SysFreeString(path); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + IDispatch_Release(disp); + + IUnknown_Release(unk); +} + +START_TEST(ldap) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_LDAP(); + + CoUninitialize(); +} diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index f2fc92a1b2..c7495dcb88 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -210,4 +210,6 @@ START_TEST(sysinfo) test_ComputerName(); test_UserName(); test_sysinfo(); + + CoUninitialize(); } -- 2.20.1

2 1

[PATCH 4/5] adsldp: Add IADsOpenDSObject stubs.
by Dmitry Timoshkov 11 Feb '20

11 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index ef62aad279..bdce30c143 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -260,6 +260,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) typedef struct { IADs IADs_iface; + IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; } LDAP_namespace; @@ -270,6 +271,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface) static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IADs(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -283,6 +286,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IADsOpenDSObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IADsOpenDSObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -436,6 +446,97 @@ static const IADsVtbl IADs_vtbl = ldapns_GetInfoEx }; +static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface); +} + +static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsOpenDSObject) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsOpenDSObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, + LONG reserved, IDispatch **obj) +{ + FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), + reserved, obj); + return E_NOTIMPL; +} + +static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = +{ + openobj_QueryInterface, + openobj_AddRef, + openobj_Release, + openobj_GetTypeInfoCount, + openobj_GetTypeInfo, + openobj_GetIDsOfNames, + openobj_Invoke, + openobj_OpenDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -445,6 +546,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) if (!ldap) return E_OUTOFMEMORY; ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); -- 2.20.1

2 1

[PATCH] bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider.
by Hans Leidekker 11 Feb '20

11 Feb '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index d026dab729..5cc2c249da 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -154,7 +154,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - BOOL hmac; + ULONG flags; }; #if defined(HAVE_GNUTLS_CIPHER_INIT) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 079eaebe6e..e8a2be8699 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -216,7 +216,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { - const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; + const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG | BCRYPT_HASH_REUSABLE_FLAG; struct algorithm *alg; enum alg_id alg_id; ULONG i; @@ -254,7 +254,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->mode = MODE_ID_CBC; - alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; + alg->flags = flags; *handle = alg; TRACE( "returning handle %p\n", alg ); @@ -693,8 +693,9 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - if (alg->hmac) hash->flags = HASH_FLAG_HMAC; - if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; + if (alg->flags & BCRYPT_ALG_HANDLE_HMAC_FLAG) hash->flags = HASH_FLAG_HMAC; + if ((alg->flags & BCRYPT_HASH_REUSABLE_FLAG) || (flags & BCRYPT_HASH_REUSABLE_FLAG)) + hash->flags |= HASH_FLAG_REUSABLE; if (secretlen && !(hash->secret = heap_alloc( secretlen ))) { -- 2.20.1

2 1

[PATCH 6/6] user32: Reject detaching adapters.
by Zhiyi Zhang 11 Feb '20

11 Feb '20

It is currently unsupported. This helps later patches so that we could introduce settings handlers using a new interface without detaching adapter support, making patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 12 +++++++++++- dlls/winemac.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/settings.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a60e4a2dbd..41afb1beab 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3287,6 +3287,15 @@ static void trace_devmode(const DEVMODEW *devmode) TRACE("\n"); } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) */ @@ -3318,7 +3327,8 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmICMMethod)) return DISP_CHANGE_BADMODE; - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + if (is_detached_mode(devmode) || + ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 68fab08359..02cd3caa35 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -763,6 +763,15 @@ static BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) * @@ -803,6 +812,12 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapter is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e9039022d5..705d271ea7 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -329,6 +329,15 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } +BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -357,6 +366,12 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapter is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c99985e7e6..1e87807d2d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -660,6 +660,7 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH 5/6] winemac.drv: Reject changing non-primary adapter settings.
by Zhiyi Zhang 11 Feb '20

11 Feb '20

Changing non-primary adapter settings is currently unsupported. Reject non-primary adapter settings changes so that when users want to change the settings of non-primary adapters, the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 0a05753b8e..68fab08359 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -921,6 +921,11 @@ better: } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); -- 2.20.1

2 1

[PATCH 4/6] winex11.drv: Reject changing non-primary adapter settings.
by Zhiyi Zhang 11 Feb '20

11 Feb '20

Changing non-primary adapter settings is currently unsupported. Reject non-primary adapter settings changes so that when users want to change the settings of non-primary adapters, the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 3e7a5960f0..e9039022d5 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -386,6 +386,12 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (flags & CDS_UPDATEREGISTRY) write_registry_settings(devmode); + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (!(flags & (CDS_TEST | CDS_NORESET))) return pSetCurrentMode(i); -- 2.20.1

2 1

[PATCH 2/5] activeds: Implement ADsOpenObject.
by Dmitry Timoshkov 11 Feb '20

11 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/Makefile.in | 1 + dlls/activeds/activeds_main.c | 80 +++++++++++++++++++++++++++++++++-- include/iads.idl | 14 ++++++ 3 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 20578a93bc..54f86d661e 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,5 +1,6 @@ MODULE = activeds.dll IMPORTLIB = activeds +IMPORTS = advapi32 ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 69c5c447dc..8ff587e332 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -2,6 +2,7 @@ * Implementation of the Active Directory Service Interface * * Copyright 2005 Detlef Riekenberg + * Copyright 2019 Dmitry Timoshkov * * This file contains only stubs to get the printui.dll up and running * activeds.dll is much much more than this @@ -30,8 +31,10 @@ #include "winuser.h" #include "objbase.h" +#include "initguid.h" #include "iads.h" #include "adshlp.h" +#include "adserr.h" #include "wine/debug.h" @@ -112,11 +115,80 @@ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, /***************************************************** * ADsOpenObject [ACTIVEDS.9] */ -HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD reserved, REFIID riid, void **obj) { - FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName), - debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT hr; + HKEY hkey, hprov; + WCHAR provider[MAX_PATH], progid[MAX_PATH]; + DWORD idx = 0; + + TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); + + if (!path || !riid || !obj) + return E_INVALIDARG; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return E_ADS_BAD_PATHNAME; + + hr = E_ADS_BAD_PATHNAME; + + for (;;) + { + if (RegEnumKeyW(hkey, idx++, provider, ARRAY_SIZE(provider))) + break; + + TRACE("provider %s\n", debugstr_w(provider)); + + if (!wcsnicmp(path, provider, wcslen(provider)) && path[wcslen(provider)] == ':') + { + LONG size; + + if (RegOpenKeyExW(hkey, provider, 0, KEY_READ, &hprov)) + break; + + size = ARRAY_SIZE(progid); + if (!RegQueryValueW(hprov, NULL, progid, &size)) + { + CLSID clsid; + + if (CLSIDFromProgID(progid, &clsid) == S_OK) + { + IADsOpenDSObject *adsopen; + IDispatch *disp; + + TRACE("ns %s => clsid %s\n", debugstr_w(progid), wine_dbgstr_guid(&clsid)); + if (CoCreateInstance(&clsid, 0, CLSCTX_INPROC_SERVER, &IID_IADsOpenDSObject, (void **)&adsopen) == S_OK) + { + BSTR bpath, buser, bpassword; + + bpath = SysAllocString(path); + buser = SysAllocString(user); + bpassword = SysAllocString(password); + + hr = IADsOpenDSObject_OpenDSObject(adsopen, bpath, buser, bpassword, reserved, &disp); + if (hr == S_OK) + { + hr = IDispatch_QueryInterface(disp, riid, obj); + IDispatch_Release(disp); + } + + SysFreeString(bpath); + SysFreeString(buser); + SysFreeString(bpassword); + + IADsOpenDSObject_Release(adsopen); + } + } + } + + RegCloseKey(hprov); + break; + } + } + + RegCloseKey(hkey); + + return hr; } /***************************************************** diff --git a/include/iads.idl b/include/iads.idl index 6931b6f734..add52571c7 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -794,6 +794,20 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IID_IADsOpenDSObject interface + */ +[ + odl, + uuid(ddf2891e-0f9c-11d0-8ad4-00c04fd8d503), + dual, + oleautomation +] +interface IADsOpenDSObject : IDispatch +{ + HRESULT OpenDSObject([in] BSTR path, [in] BSTR user, [in] BSTR password, [in] long reserved, [out,retval] IDispatch **obj); +} + /***************************************************************************** * IADsADSystemInfo interface */ -- 2.20.1

1 0

[PATCH 1/5] include: Add adserr.h.
by Dmitry Timoshkov 11 Feb '20

11 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/Makefile.in | 1 + include/adserr.h | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 include/adserr.h diff --git a/include/Makefile.in b/include/Makefile.in index a91372eb4d..3b8a901383 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -7,6 +7,7 @@ SOURCES = \ activaut.idl \ activdbg.idl \ activscp.idl \ + adserr.h \ adshlp.h \ advpub.h \ af_irda.h \ diff --git a/include/adserr.h b/include/adserr.h new file mode 100644 index 0000000000..83da568763 --- /dev/null +++ b/include/adserr.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __ADSERR_H +#define __ADSERR_H + +#ifdef RC_INVOKED +#define _HRESULT_TYPEDEF_(x) (x) +#else +#define _HRESULT_TYPEDEF_(x) ((HRESULT)x) +#endif + +#define E_ADS_BAD_PATHNAME _HRESULT_TYPEDEF_(0x80005000) +#define E_ADS_INVALID_DOMAIN_OBJECT _HRESULT_TYPEDEF_(0x80005001) +#define E_ADS_INVALID_USER_OBJECT _HRESULT_TYPEDEF_(0x80005002) +#define E_ADS_INVALID_COMPUTER_OBJECT _HRESULT_TYPEDEF_(0x80005003) +#define E_ADS_UNKNOWN_OBJECT _HRESULT_TYPEDEF_(0x80005004) +#define E_ADS_PROPERTY_NOT_SET _HRESULT_TYPEDEF_(0x80005005) +#define E_ADS_PROPERTY_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80005006) +#define E_ADS_PROPERTY_INVALID _HRESULT_TYPEDEF_(0x80005007) +#define E_ADS_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80005008) +#define E_ADS_OBJECT_UNBOUND _HRESULT_TYPEDEF_(0x80005009) +#define E_ADS_PROPERTY_NOT_MODIFIED _HRESULT_TYPEDEF_(0x8000500A) +#define E_ADS_PROPERTY_MODIFIED _HRESULT_TYPEDEF_(0x8000500B) +#define E_ADS_CANT_CONVERT_DATATYPE _HRESULT_TYPEDEF_(0x8000500C) +#define E_ADS_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0x8000500D) +#define E_ADS_OBJECT_EXISTS _HRESULT_TYPEDEF_(0x8000500E) +#define E_ADS_SCHEMA_VIOLATION _HRESULT_TYPEDEF_(0x8000500F) +#define E_ADS_COLUMN_NOT_SET _HRESULT_TYPEDEF_(0x80005010) +#define S_ADS_ERRORSOCCURRED _HRESULT_TYPEDEF_(0x00005011) +#define S_ADS_NOMORE_ROWS _HRESULT_TYPEDEF_(0x00005012) +#define S_ADS_NOMORE_COLUMNS _HRESULT_TYPEDEF_(0x00005013) +#define E_ADS_INVALID_FILTER _HRESULT_TYPEDEF_(0x80005014) + +#endif /* __ADSERR_H */ -- 2.20.1

1 0

[PATCH 3/6] user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW().
by Zhiyi Zhang 11 Feb '20

11 Feb '20

NULL device and mode means to restore all devices to their registry settings. Since all user graphics drivers only support the primary adapter now, it's fine to restore only the primary adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 3 +++ dlls/winemac.drv/display.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 75 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c5c98a7ea1..a60e4a2dbd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3300,6 +3300,9 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); + if (!devname && !devmode) + return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (!devname && devmode) { if (!get_primary_adapter(primary_adapter)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4c610c4573..0a05753b8e 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -745,6 +745,23 @@ void check_retina_status(void) } } +static BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) @@ -753,7 +770,9 @@ void check_retina_status(void) LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid) { + WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_BADMODE; + DEVMODEW default_mode; int bpp; struct macdrv_display *displays; int num_displays; @@ -768,6 +787,22 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 24644db620..3e7a5960f0 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -252,6 +252,24 @@ static BOOL write_registry_settings(const DEVMODEW *dm) return ret; } +BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -318,9 +336,27 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; + DEVMODEW default_mode; DWORD i; + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947b..c99985e7e6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLS extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; +extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH 2/6] user32: Handle NULL device and not NULL mode parameters in ChangeDisplaySettingsExW().
by Zhiyi Zhang 11 Feb '20

11 Feb '20

This makes sure that user graphics drivers has a valid device name when a DEVMODE is specified. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e3919ad1b1..c5c98a7ea1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3293,12 +3293,21 @@ static void trace_devmode(const DEVMODEW *devmode) LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { + WCHAR primary_adapter[CCHDEVICENAME]; BOOL def_mode = TRUE; DEVMODEW dm; TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); + if (!devname && devmode) + { + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + devname = primary_adapter; + } + if (devmode) { trace_devmode(devmode); -- 2.20.1

2 1

[PATCH 1/6] user32: Handle NULL device parameter in EnumDisplaySettingsExW().
by Zhiyi Zhang 11 Feb '20

11 Feb '20

This makes sure that user graphics drivers always have a valid device name. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a146f31071..e3919ad1b1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -567,6 +567,24 @@ RECT get_virtual_screen_rect(void) return info.virtual_rect; } +static BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + /* get text metrics and/or "average" char width of the specified logfont * for the specified dc */ static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW * ptm, UINT *psz) @@ -3394,6 +3412,18 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { + WCHAR primary_adapter[CCHDEVICENAME]; + + TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + + if (!lpszDeviceName) + { + if (!get_primary_adapter(primary_adapter)) + return FALSE; + + lpszDeviceName = primary_adapter; + } + return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); } -- 2.20.1

2 1

[PATCH 1/5] iphlpapi: Get rid of dummy arguments to sscanf
by Alex Henrie 11 Feb '20

11 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/ipstats.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f09f042135..6ce322a8d1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2088,7 +2088,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= TCP_TABLE_OWNER_PID_LISTENER) map = get_pid_map( &num_entries ); @@ -2097,9 +2097,9 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets(buf, sizeof(buf), fp); while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (sscanf( ptr, "%x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &row.dwLocalAddr, &row.dwLocalPort, &row.dwRemoteAddr, - &row.dwRemotePort, &row.dwState, &inode ) != 7) + &row.dwRemotePort, &row.dwState, &inode ) != 6) continue; row.dwLocalPort = htons( row.dwLocalPort ); row.dwRemotePort = htons( row.dwRemotePort ); @@ -2386,7 +2386,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); @@ -2395,8 +2395,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets( buf, sizeof(buf), fp ); while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (sscanf( ptr, "%u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, - &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 4) + if (sscanf( ptr, "%*u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", + &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 3) continue; row.dwLocalPort = htons( row.dwLocalPort ); @@ -2708,7 +2708,6 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int num_entries = 0; struct ipv6_addr_scope *addr_scopes; unsigned int addr_scopes_size = 0; - unsigned int dummy; int inode; addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); @@ -2721,9 +2720,9 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { DWORD *local_addr = (DWORD *)&row.ucLocalAddr; - if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], - &row.dwLocalPort, &inode ) != 7) + &row.dwLocalPort, &inode ) != 6) continue; row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); row.dwLocalPort = htons( row.dwLocalPort ); -- 2.25.0

2 9

[PATCH v2 5/5] iphlpapi/tests: Drop workarounds for Windows <= 2000
by Alex Henrie 11 Feb '20

11 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Restore accidentally removed references to pGetIfEntry2 --- dlls/iphlpapi/tests/Makefile.in | 1 + dlls/iphlpapi/tests/iphlpapi.c | 1102 ++++++++++++++----------------- 2 files changed, 484 insertions(+), 619 deletions(-) diff --git a/dlls/iphlpapi/tests/Makefile.in b/dlls/iphlpapi/tests/Makefile.in index 1aded198db..d813101354 100644 --- a/dlls/iphlpapi/tests/Makefile.in +++ b/dlls/iphlpapi/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = iphlpapi.dll +IMPORTS = iphlpapi C_SRCS = \ iphlpapi.c diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index af119e317c..dcc1bcc194 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -41,6 +41,7 @@ #include "ws2tcpip.h" #include "windns.h" #include "iphlpapi.h" +#include "icmpapi.h" #include "iprtrmib.h" #include "netioapi.h" #include "wine/test.h" @@ -52,41 +53,14 @@ static HMODULE hLibrary = NULL; static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWORD,DWORD); -static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); -static DWORD (WINAPI *pGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL); -static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); -static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); -static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); -static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); -static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); -static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); -static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); -static DWORD (WINAPI *pGetNetworkParams)(PFIXED_INFO,PULONG); -static DWORD (WINAPI *pGetIcmpStatistics)(PMIB_ICMP); -static DWORD (WINAPI *pGetIpStatistics)(PMIB_IPSTATS); -static DWORD (WINAPI *pGetTcpStatistics)(PMIB_TCPSTATS); -static DWORD (WINAPI *pGetUdpStatistics)(PMIB_UDPSTATS); -static DWORD (WINAPI *pGetIcmpStatisticsEx)(PMIB_ICMP_EX,DWORD); -static DWORD (WINAPI *pGetIpStatisticsEx)(PMIB_IPSTATS,DWORD); -static DWORD (WINAPI *pGetTcpStatisticsEx)(PMIB_TCPSTATS,DWORD); -static DWORD (WINAPI *pGetUdpStatisticsEx)(PMIB_UDPSTATS,DWORD); -static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); -static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); -static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); -static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pGetUnicastIpAddressTable)(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); -static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); -static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); -static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); -static HANDLE(WINAPI *pIcmpCreateFile)(VOID); -static DWORD (WINAPI *pIcmpSendEcho)(HANDLE,IPAddr,LPVOID,WORD,PIP_OPTION_INFORMATION,LPVOID,DWORD,DWORD); static DWORD (WINAPI *pCreateSortedAddressPairs)(const PSOCKADDR_IN6,ULONG,const PSOCKADDR_IN6,ULONG,ULONG, PSOCKADDR_IN6_PAIR*,ULONG*); static void (WINAPI *pFreeMibTable)(void*); @@ -109,41 +83,14 @@ static void loadIPHlpApi(void) hLibrary = LoadLibraryA("iphlpapi.dll"); if (hLibrary) { pAllocateAndGetTcpExTableFromStack = (void *)GetProcAddress(hLibrary, "AllocateAndGetTcpExTableFromStack"); - pGetNumberOfInterfaces = (void *)GetProcAddress(hLibrary, "GetNumberOfInterfaces"); - pGetIpAddrTable = (void *)GetProcAddress(hLibrary, "GetIpAddrTable"); - pGetIfEntry = (void *)GetProcAddress(hLibrary, "GetIfEntry"); pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); - pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); - pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); - pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); - pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); - pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); - pGetAdaptersInfo = (void *)GetProcAddress(hLibrary, "GetAdaptersInfo"); - pGetNetworkParams = (void *)GetProcAddress(hLibrary, "GetNetworkParams"); - pGetIcmpStatistics = (void *)GetProcAddress(hLibrary, "GetIcmpStatistics"); - pGetIpStatistics = (void *)GetProcAddress(hLibrary, "GetIpStatistics"); - pGetTcpStatistics = (void *)GetProcAddress(hLibrary, "GetTcpStatistics"); - pGetUdpStatistics = (void *)GetProcAddress(hLibrary, "GetUdpStatistics"); - pGetIcmpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetIcmpStatisticsEx"); - pGetIpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetIpStatisticsEx"); - pGetTcpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetTcpStatisticsEx"); - pGetUdpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetUdpStatisticsEx"); - pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); - pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); - pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); - pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pGetUnicastIpAddressTable = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressTable"); - pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); - pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); - pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); - pIcmpCreateFile = (void *)GetProcAddress(hLibrary, "IcmpCreateFile"); - pIcmpSendEcho = (void *)GetProcAddress(hLibrary, "IcmpSendEcho"); pCreateSortedAddressPairs = (void *)GetProcAddress(hLibrary, "CreateSortedAddressPairs"); pFreeMibTable = (void *)GetProcAddress(hLibrary, "FreeMibTable"); pConvertInterfaceGuidToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceGuidToLuid"); @@ -200,37 +147,34 @@ static void testWin98OnlyFunctions(void) static void testGetNumberOfInterfaces(void) { - if (pGetNumberOfInterfaces) { - DWORD apiReturn, numInterfaces; + DWORD apiReturn, numInterfaces; - /* Crashes on Vista */ - if (0) { - apiReturn = pGetNumberOfInterfaces(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) - return; - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetNumberOfInterfaces(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - } - - apiReturn = pGetNumberOfInterfaces(&numInterfaces); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetNumberOfInterfaces is not supported\n"); + /* Crashes on Vista */ + if (0) { + apiReturn = GetNumberOfInterfaces(NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) return; - } - ok(apiReturn == NO_ERROR, - "GetNumberOfInterfaces returned %d, expected 0\n", apiReturn); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetNumberOfInterfaces(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); } + + apiReturn = GetNumberOfInterfaces(&numInterfaces); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetNumberOfInterfaces is not supported\n"); + return; + } + ok(apiReturn == NO_ERROR, + "GetNumberOfInterfaces returned %d, expected 0\n", apiReturn); } static void testGetIfEntry(DWORD index) { - if (pGetIfEntry) { DWORD apiReturn; MIB_IFROW row; memset(&row, 0, sizeof(row)); - apiReturn = pGetIfEntry(NULL); + apiReturn = GetIfEntry(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIfEntry is not supported\n"); return; @@ -239,380 +183,363 @@ static void testGetIfEntry(DWORD index) "GetIfEntry(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); row.dwIndex = -1; /* hope that's always bogus! */ - apiReturn = pGetIfEntry(&row); + apiReturn = GetIfEntry(&row); ok(apiReturn == ERROR_INVALID_DATA || apiReturn == ERROR_FILE_NOT_FOUND /* Vista */, "GetIfEntry(bogus row) returned %d, expected ERROR_INVALID_DATA or ERROR_FILE_NOT_FOUND\n", apiReturn); row.dwIndex = index; - apiReturn = pGetIfEntry(&row); + apiReturn = GetIfEntry(&row); ok(apiReturn == NO_ERROR, "GetIfEntry returned %d, expected NO_ERROR\n", apiReturn); - } } static void testGetIpAddrTable(void) { - if (pGetIpAddrTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetIpAddrTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIpAddrTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIpAddrTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetIpAddrTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetIpAddrTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn = GetIpAddrTable(NULL, NULL, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpAddrTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpAddrTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetIpAddrTable(NULL, &dwSize, FALSE); + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetIpAddrTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_IPADDRTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = GetIpAddrTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPADDRTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - - apiReturn = pGetIpAddrTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); - if (apiReturn == NO_ERROR && buf->dwNumEntries) + if (apiReturn == NO_ERROR && buf->dwNumEntries) + { + int i; + testGetIfEntry(buf->table[0].dwIndex); + for (i = 0; i < buf->dwNumEntries; i++) { - int i; - testGetIfEntry(buf->table[0].dwIndex); - for (i = 0; i < buf->dwNumEntries; i++) - { - ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); - trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, - ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - } + ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, + ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); } - HeapFree(GetProcessHeap(), 0, buf); } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetIfTable(void) { - if (pGetIfTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetIfTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIfTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIfTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetIfTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetIfTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn = GetIfTable(NULL, NULL, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIfTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIfTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetIfTable(NULL, &dwSize, FALSE); + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetIfTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_IFTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = GetIfTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IFTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = pGetIfTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", - apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i, j; + char name[MAX_INTERFACE_NAME_LEN]; - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - DWORD i, j; - char name[MAX_INTERFACE_NAME_LEN]; - - trace( "interface table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - { - MIB_IFROW *row = &buf->table[i]; - WideCharToMultiByte( CP_ACP, 0, row->wszName, -1, name, MAX_INTERFACE_NAME_LEN, NULL, NULL ); - trace( "%u: '%s' type %u mtu %u speed %u phys", - row->dwIndex, name, row->dwType, row->dwMtu, row->dwSpeed ); - for (j = 0; j < row->dwPhysAddrLen; j++) - printf( " %02x", row->bPhysAddr[j] ); - printf( "\n" ); - trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", - row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, - row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); - trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", - row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, - row->dwOutDiscards, row->dwOutErrors ); - } - } - HeapFree(GetProcessHeap(), 0, buf); + trace( "interface table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + { + MIB_IFROW *row = &buf->table[i]; + WideCharToMultiByte( CP_ACP, 0, row->wszName, -1, name, MAX_INTERFACE_NAME_LEN, NULL, NULL ); + trace( "%u: '%s' type %u mtu %u speed %u phys", + row->dwIndex, name, row->dwType, row->dwMtu, row->dwSpeed ); + for (j = 0; j < row->dwPhysAddrLen; j++) + printf( " %02x", row->bPhysAddr[j] ); + printf( "\n" ); + trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", + row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, + row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); + trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", + row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, + row->dwOutDiscards, row->dwOutErrors ); + } } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetIpForwardTable(void) { - if (pGetIpForwardTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetIpForwardTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIpForwardTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetIpForwardTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", - apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + apiReturn = GetIpForwardTable(NULL, NULL, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpForwardTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetIpForwardTable(NULL, &dwSize, FALSE); + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = pGetIpForwardTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); + apiReturn = GetIpForwardTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); - if (apiReturn == NO_ERROR) - { - DWORD i; + if (apiReturn == NO_ERROR) + { + DWORD i; - trace( "IP forward table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - { - if (!U1(buf->table[i]).dwForwardDest) /* Default route */ - { + trace( "IP forward table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + { + if (!U1(buf->table[i]).dwForwardDest) /* Default route */ + { todo_wine - ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT, - "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); - ok (U1(buf->table[i]).dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, - "Unexpected dwForwardType %d\n", U1(buf->table[i]).dwForwardType); - } - else - { - /* In general we should get MIB_IPPROTO_LOCAL but does not work - * for Vista, 2008 and 7. */ - ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_LOCAL || - broken(U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT), - "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); - /* The forward type varies depending on the address and gateway - * value so it is not worth testing in this case. */ - } - - trace( "%u: dest %s mask %s gw %s if %u type %u proto %u\n", i, - ntoa( buf->table[i].dwForwardDest ), ntoa( buf->table[i].dwForwardMask ), - ntoa( buf->table[i].dwForwardNextHop ), buf->table[i].dwForwardIfIndex, - U1(buf->table[i]).dwForwardType, U1(buf->table[i]).dwForwardProto ); - } - } - HeapFree(GetProcessHeap(), 0, buf); + ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT, + "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); + ok (U1(buf->table[i]).dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, + "Unexpected dwForwardType %d\n", U1(buf->table[i]).dwForwardType); + } + else + { + /* In general we should get MIB_IPPROTO_LOCAL but does not work + * for Vista, 2008 and 7. */ + ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_LOCAL || + broken(U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT), + "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); + /* The forward type varies depending on the address and gateway + * value so it is not worth testing in this case. */ + } + + trace( "%u: dest %s mask %s gw %s if %u type %u proto %u\n", i, + ntoa( buf->table[i].dwForwardDest ), ntoa( buf->table[i].dwForwardMask ), + ntoa( buf->table[i].dwForwardNextHop ), buf->table[i].dwForwardIfIndex, + U1(buf->table[i]).dwForwardType, U1(buf->table[i]).dwForwardProto ); + } } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetIpNetTable(void) { - if (pGetIpNetTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetIpNetTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIpNetTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIpNetTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetIpNetTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetIpNetTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_NO_DATA or ERROR_INSUFFICIENT_BUFFER\n", + apiReturn = GetIpNetTable(NULL, NULL, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpNetTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpNetTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetIpNetTable(NULL, &dwSize, FALSE); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetIpNetTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_NO_DATA or ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* empty ARP table's okay */ + else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = GetIpNetTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR || + apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ + "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == ERROR_NO_DATA) - ; /* empty ARP table's okay */ - else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - - apiReturn = pGetIpNetTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR || - apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ - "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); - - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - DWORD i, j; - - trace( "IP net table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - { - trace( "%u: idx %u type %u addr %s phys", - i, buf->table[i].dwIndex, U(buf->table[i]).dwType, ntoa( buf->table[i].dwAddr )); - for (j = 0; j < buf->table[i].dwPhysAddrLen; j++) - printf( " %02x", buf->table[i].bPhysAddr[j] ); - printf( "\n" ); - } - } - HeapFree(GetProcessHeap(), 0, buf); + + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i, j; + + trace( "IP net table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + { + trace( "%u: idx %u type %u addr %s phys", + i, buf->table[i].dwIndex, U(buf->table[i]).dwType, ntoa( buf->table[i].dwAddr )); + for (j = 0; j < buf->table[i].dwPhysAddrLen; j++) + printf( " %02x", buf->table[i].bPhysAddr[j] ); + printf( "\n" ); + } } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetIcmpStatistics(void) { - if (pGetIcmpStatistics) { - DWORD apiReturn; - MIB_ICMP stats; - - /* Crashes on Vista */ - if (0) { - apiReturn = pGetIcmpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) - return; - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIcmpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - } + DWORD apiReturn; + MIB_ICMP stats; - apiReturn = pGetIcmpStatistics(&stats); + /* Crashes on Vista */ + if (0) { + apiReturn = GetIcmpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) - { - skip("GetIcmpStatistics is not supported\n"); return; - } - ok(apiReturn == NO_ERROR, - "GetIcmpStatistics returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - trace( "ICMP stats: %8s %8s\n", "in", "out" ); - trace( " dwMsgs: %8u %8u\n", stats.stats.icmpInStats.dwMsgs, stats.stats.icmpOutStats.dwMsgs ); - trace( " dwErrors: %8u %8u\n", stats.stats.icmpInStats.dwErrors, stats.stats.icmpOutStats.dwErrors ); - trace( " dwDestUnreachs: %8u %8u\n", stats.stats.icmpInStats.dwDestUnreachs, stats.stats.icmpOutStats.dwDestUnreachs ); - trace( " dwTimeExcds: %8u %8u\n", stats.stats.icmpInStats.dwTimeExcds, stats.stats.icmpOutStats.dwTimeExcds ); - trace( " dwParmProbs: %8u %8u\n", stats.stats.icmpInStats.dwParmProbs, stats.stats.icmpOutStats.dwParmProbs ); - trace( " dwSrcQuenchs: %8u %8u\n", stats.stats.icmpInStats.dwSrcQuenchs, stats.stats.icmpOutStats.dwSrcQuenchs ); - trace( " dwRedirects: %8u %8u\n", stats.stats.icmpInStats.dwRedirects, stats.stats.icmpOutStats.dwRedirects ); - trace( " dwEchos: %8u %8u\n", stats.stats.icmpInStats.dwEchos, stats.stats.icmpOutStats.dwEchos ); - trace( " dwEchoReps: %8u %8u\n", stats.stats.icmpInStats.dwEchoReps, stats.stats.icmpOutStats.dwEchoReps ); - trace( " dwTimestamps: %8u %8u\n", stats.stats.icmpInStats.dwTimestamps, stats.stats.icmpOutStats.dwTimestamps ); - trace( " dwTimestampReps: %8u %8u\n", stats.stats.icmpInStats.dwTimestampReps, stats.stats.icmpOutStats.dwTimestampReps ); - trace( " dwAddrMasks: %8u %8u\n", stats.stats.icmpInStats.dwAddrMasks, stats.stats.icmpOutStats.dwAddrMasks ); - trace( " dwAddrMaskReps: %8u %8u\n", stats.stats.icmpInStats.dwAddrMaskReps, stats.stats.icmpOutStats.dwAddrMaskReps ); - } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIcmpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + } + + apiReturn = GetIcmpStatistics(&stats); + if (apiReturn == ERROR_NOT_SUPPORTED) + { + skip("GetIcmpStatistics is not supported\n"); + return; + } + ok(apiReturn == NO_ERROR, + "GetIcmpStatistics returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "ICMP stats: %8s %8s\n", "in", "out" ); + trace( " dwMsgs: %8u %8u\n", stats.stats.icmpInStats.dwMsgs, stats.stats.icmpOutStats.dwMsgs ); + trace( " dwErrors: %8u %8u\n", stats.stats.icmpInStats.dwErrors, stats.stats.icmpOutStats.dwErrors ); + trace( " dwDestUnreachs: %8u %8u\n", stats.stats.icmpInStats.dwDestUnreachs, stats.stats.icmpOutStats.dwDestUnreachs ); + trace( " dwTimeExcds: %8u %8u\n", stats.stats.icmpInStats.dwTimeExcds, stats.stats.icmpOutStats.dwTimeExcds ); + trace( " dwParmProbs: %8u %8u\n", stats.stats.icmpInStats.dwParmProbs, stats.stats.icmpOutStats.dwParmProbs ); + trace( " dwSrcQuenchs: %8u %8u\n", stats.stats.icmpInStats.dwSrcQuenchs, stats.stats.icmpOutStats.dwSrcQuenchs ); + trace( " dwRedirects: %8u %8u\n", stats.stats.icmpInStats.dwRedirects, stats.stats.icmpOutStats.dwRedirects ); + trace( " dwEchos: %8u %8u\n", stats.stats.icmpInStats.dwEchos, stats.stats.icmpOutStats.dwEchos ); + trace( " dwEchoReps: %8u %8u\n", stats.stats.icmpInStats.dwEchoReps, stats.stats.icmpOutStats.dwEchoReps ); + trace( " dwTimestamps: %8u %8u\n", stats.stats.icmpInStats.dwTimestamps, stats.stats.icmpOutStats.dwTimestamps ); + trace( " dwTimestampReps: %8u %8u\n", stats.stats.icmpInStats.dwTimestampReps, stats.stats.icmpOutStats.dwTimestampReps ); + trace( " dwAddrMasks: %8u %8u\n", stats.stats.icmpInStats.dwAddrMasks, stats.stats.icmpOutStats.dwAddrMasks ); + trace( " dwAddrMaskReps: %8u %8u\n", stats.stats.icmpInStats.dwAddrMaskReps, stats.stats.icmpOutStats.dwAddrMaskReps ); } } static void testGetIpStatistics(void) { - if (pGetIpStatistics) { - DWORD apiReturn; - MIB_IPSTATS stats; + DWORD apiReturn; + MIB_IPSTATS stats; - apiReturn = pGetIpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIpStatistics is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetIpStatistics(&stats); - ok(apiReturn == NO_ERROR, - "GetIpStatistics returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - trace( "IP stats:\n" ); - trace( " dwForwarding: %u\n", U(stats).dwForwarding ); - trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); - trace( " dwInReceives: %u\n", stats.dwInReceives ); - trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); - trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); - trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); - trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); - trace( " dwInDiscards: %u\n", stats.dwInDiscards ); - trace( " dwInDelivers: %u\n", stats.dwInDelivers ); - trace( " dwOutRequests: %u\n", stats.dwOutRequests ); - trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); - trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); - trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); - trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); - trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); - trace( " dwReasmOks: %u\n", stats.dwReasmOks ); - trace( " dwReasmFails: %u\n", stats.dwReasmFails ); - trace( " dwFragOks: %u\n", stats.dwFragOks ); - trace( " dwFragFails: %u\n", stats.dwFragFails ); - trace( " dwFragCreates: %u\n", stats.dwFragCreates ); - trace( " dwNumIf: %u\n", stats.dwNumIf ); - trace( " dwNumAddr: %u\n", stats.dwNumAddr ); - trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); - } + apiReturn = GetIpStatistics(NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetIpStatistics is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetIpStatistics(&stats); + ok(apiReturn == NO_ERROR, + "GetIpStatistics returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "IP stats:\n" ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); + trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); + trace( " dwInReceives: %u\n", stats.dwInReceives ); + trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); + trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); + trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); + trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); + trace( " dwInDiscards: %u\n", stats.dwInDiscards ); + trace( " dwInDelivers: %u\n", stats.dwInDelivers ); + trace( " dwOutRequests: %u\n", stats.dwOutRequests ); + trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); + trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); + trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); + trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); + trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); + trace( " dwReasmOks: %u\n", stats.dwReasmOks ); + trace( " dwReasmFails: %u\n", stats.dwReasmFails ); + trace( " dwFragOks: %u\n", stats.dwFragOks ); + trace( " dwFragFails: %u\n", stats.dwFragFails ); + trace( " dwFragCreates: %u\n", stats.dwFragCreates ); + trace( " dwNumIf: %u\n", stats.dwNumIf ); + trace( " dwNumAddr: %u\n", stats.dwNumAddr ); + trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); } } static void testGetTcpStatistics(void) { - if (pGetTcpStatistics) { - DWORD apiReturn; - MIB_TCPSTATS stats; + DWORD apiReturn; + MIB_TCPSTATS stats; - apiReturn = pGetTcpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetTcpStatistics is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetTcpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetTcpStatistics(&stats); - ok(apiReturn == NO_ERROR, - "GetTcpStatistics returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - trace( "TCP stats:\n" ); - trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); - trace( " dwRtoMin: %u\n", stats.dwRtoMin ); - trace( " dwRtoMax: %u\n", stats.dwRtoMax ); - trace( " dwMaxConn: %u\n", stats.dwMaxConn ); - trace( " dwActiveOpens: %u\n", stats.dwActiveOpens ); - trace( " dwPassiveOpens: %u\n", stats.dwPassiveOpens ); - trace( " dwAttemptFails: %u\n", stats.dwAttemptFails ); - trace( " dwEstabResets: %u\n", stats.dwEstabResets ); - trace( " dwCurrEstab: %u\n", stats.dwCurrEstab ); - trace( " dwInSegs: %u\n", stats.dwInSegs ); - trace( " dwOutSegs: %u\n", stats.dwOutSegs ); - trace( " dwRetransSegs: %u\n", stats.dwRetransSegs ); - trace( " dwInErrs: %u\n", stats.dwInErrs ); - trace( " dwOutRsts: %u\n", stats.dwOutRsts ); - trace( " dwNumConns: %u\n", stats.dwNumConns ); - } + apiReturn = GetTcpStatistics(NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetTcpStatistics is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetTcpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetTcpStatistics(&stats); + ok(apiReturn == NO_ERROR, + "GetTcpStatistics returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "TCP stats:\n" ); + trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); + trace( " dwRtoMin: %u\n", stats.dwRtoMin ); + trace( " dwRtoMax: %u\n", stats.dwRtoMax ); + trace( " dwMaxConn: %u\n", stats.dwMaxConn ); + trace( " dwActiveOpens: %u\n", stats.dwActiveOpens ); + trace( " dwPassiveOpens: %u\n", stats.dwPassiveOpens ); + trace( " dwAttemptFails: %u\n", stats.dwAttemptFails ); + trace( " dwEstabResets: %u\n", stats.dwEstabResets ); + trace( " dwCurrEstab: %u\n", stats.dwCurrEstab ); + trace( " dwInSegs: %u\n", stats.dwInSegs ); + trace( " dwOutSegs: %u\n", stats.dwOutSegs ); + trace( " dwRetransSegs: %u\n", stats.dwRetransSegs ); + trace( " dwInErrs: %u\n", stats.dwInErrs ); + trace( " dwOutRsts: %u\n", stats.dwOutRsts ); + trace( " dwNumConns: %u\n", stats.dwNumConns ); } } static void testGetUdpStatistics(void) { - if (pGetUdpStatistics) { - DWORD apiReturn; - MIB_UDPSTATS stats; + DWORD apiReturn; + MIB_UDPSTATS stats; - apiReturn = pGetUdpStatistics(NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetUdpStatistics is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetUdpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetUdpStatistics(&stats); - ok(apiReturn == NO_ERROR, - "GetUdpStatistics returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - trace( "UDP stats:\n" ); - trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); - trace( " dwNoPorts: %u\n", stats.dwNoPorts ); - trace( " dwInErrors: %u\n", stats.dwInErrors ); - trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); - trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); - } + apiReturn = GetUdpStatistics(NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdpStatistics is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetUdpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetUdpStatistics(&stats); + ok(apiReturn == NO_ERROR, + "GetUdpStatistics returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "UDP stats:\n" ); + trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); + trace( " dwNoPorts: %u\n", stats.dwNoPorts ); + trace( " dwInErrors: %u\n", stats.dwInErrors ); + trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); + trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); } } @@ -621,24 +548,18 @@ static void testGetIcmpStatisticsEx(void) DWORD apiReturn; MIB_ICMP_EX stats; - if (!pGetIcmpStatisticsEx) - { - win_skip( "GetIcmpStatisticsEx not available\n" ); - return; - } - /* Crashes on Vista */ if (1) { - apiReturn = pGetIcmpStatisticsEx(NULL, AF_INET); + apiReturn = GetIcmpStatisticsEx(NULL, AF_INET); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIcmpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); } - apiReturn = pGetIcmpStatisticsEx(&stats, AF_BAN); + apiReturn = GetIcmpStatisticsEx(&stats, AF_BAN); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIcmpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET); + apiReturn = GetIcmpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { @@ -650,7 +571,7 @@ static void testGetIcmpStatisticsEx(void) trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); } - apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET6); + apiReturn = GetIcmpStatisticsEx(&stats, AF_INET6); ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -669,21 +590,15 @@ static void testGetIpStatisticsEx(void) DWORD apiReturn; MIB_IPSTATS stats; - if (!pGetIpStatisticsEx) - { - win_skip( "GetIpStatisticsEx not available\n" ); - return; - } - - apiReturn = pGetIpStatisticsEx(NULL, AF_INET); + apiReturn = GetIpStatisticsEx(NULL, AF_INET); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetIpStatisticsEx(&stats, AF_BAN); + apiReturn = GetIpStatisticsEx(&stats, AF_BAN); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetIpStatisticsEx(&stats, AF_INET); + apiReturn = GetIpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { @@ -713,7 +628,7 @@ static void testGetIpStatisticsEx(void) trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); } - apiReturn = pGetIpStatisticsEx(&stats, AF_INET6); + apiReturn = GetIpStatisticsEx(&stats, AF_INET6); ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -750,21 +665,15 @@ static void testGetTcpStatisticsEx(void) DWORD apiReturn; MIB_TCPSTATS stats; - if (!pGetTcpStatisticsEx) - { - win_skip( "GetTcpStatisticsEx not available\n" ); - return; - } - - apiReturn = pGetTcpStatisticsEx(NULL, AF_INET); + apiReturn = GetTcpStatisticsEx(NULL, AF_INET); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetTcpStatisticsEx(&stats, AF_BAN); + apiReturn = GetTcpStatisticsEx(&stats, AF_BAN); ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, "GetTcpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetTcpStatisticsEx(&stats, AF_INET); + apiReturn = GetTcpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { @@ -786,7 +695,7 @@ static void testGetTcpStatisticsEx(void) trace( " dwNumConns: %u\n", stats.dwNumConns ); } - apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); + apiReturn = GetTcpStatisticsEx(&stats, AF_INET6); todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -815,21 +724,15 @@ static void testGetUdpStatisticsEx(void) DWORD apiReturn; MIB_UDPSTATS stats; - if (!pGetUdpStatisticsEx) - { - win_skip( "GetUdpStatisticsEx not available\n" ); - return; - } - - apiReturn = pGetUdpStatisticsEx(NULL, AF_INET); + apiReturn = GetUdpStatisticsEx(NULL, AF_INET); ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetUdpStatisticsEx(&stats, AF_BAN); + apiReturn = GetUdpStatisticsEx(&stats, AF_BAN); ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, "GetUdpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = pGetUdpStatisticsEx(&stats, AF_INET); + apiReturn = GetUdpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { @@ -841,7 +744,7 @@ static void testGetUdpStatisticsEx(void) trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); } - apiReturn = pGetUdpStatisticsEx(&stats, AF_INET6); + apiReturn = GetUdpStatisticsEx(&stats, AF_INET6); ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -857,76 +760,71 @@ static void testGetUdpStatisticsEx(void) static void testGetTcpTable(void) { - if (pGetTcpTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetTcpTable(NULL, &dwSize, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetTcpTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER || - broken(apiReturn == ERROR_NO_DATA), /* win95 */ - "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", - apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_TCPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + apiReturn = GetTcpTable(NULL, &dwSize, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetTcpTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_TCPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = pGetTcpTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetTcpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); + apiReturn = GetTcpTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetTcpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - DWORD i; - trace( "TCP table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - { - trace( "%u: local %s:%u remote %s:%u state %u\n", i, - ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort), - ntoa(buf->table[i].dwRemoteAddr), ntohs(buf->table[i].dwRemotePort), - U(buf->table[i]).dwState ); - } - } - HeapFree(GetProcessHeap(), 0, buf); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "TCP table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + { + trace( "%u: local %s:%u remote %s:%u state %u\n", i, + ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort), + ntoa(buf->table[i].dwRemoteAddr), ntohs(buf->table[i].dwRemotePort), + U(buf->table[i]).dwState ); + } } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetUdpTable(void) { - if (pGetUdpTable) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD apiReturn; + ULONG dwSize = 0; - apiReturn = pGetUdpTable(NULL, &dwSize, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetUdpTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetUdpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", - apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_UDPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + apiReturn = GetUdpTable(NULL, &dwSize, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdpTable is not supported\n"); + return; + } + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetUdpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_UDPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = pGetUdpTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetUdpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); + apiReturn = GetUdpTable(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetUdpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - DWORD i; - trace( "UDP table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - trace( "%u: %s:%u\n", - i, ntoa( buf->table[i].dwLocalAddr ), ntohs(buf->table[i].dwLocalPort) ); - } - HeapFree(GetProcessHeap(), 0, buf); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "UDP table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + trace( "%u: %s:%u\n", + i, ntoa( buf->table[i].dwLocalAddr ), ntohs(buf->table[i].dwLocalPort) ); } + HeapFree(GetProcessHeap(), 0, buf); } } @@ -938,11 +836,11 @@ static void testSetTcpEntry(void) memset(&row, 0, sizeof(row)); if(0) /* This test crashes in OS >= VISTA */ { - ret = pSetTcpEntry(NULL); + ret = SetTcpEntry(NULL); ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); } - ret = pSetTcpEntry(&row); + ret = SetTcpEntry(&row); if (ret == ERROR_NETWORK_ACCESS_DENIED) { win_skip("SetTcpEntry failed with access error. Skipping test.\n"); @@ -951,7 +849,7 @@ static void testSetTcpEntry(void) todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); U(row).dwState = MIB_TCP_STATE_DELETE_TCB; - ret = pSetTcpEntry(&row); + ret = SetTcpEntry(&row); todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); } @@ -965,23 +863,18 @@ static void testIcmpSendEcho(void) ICMP_ECHO_REPLY *reply; INT i; - if (!pIcmpSendEcho || !pIcmpCreateFile) - { - win_skip( "IcmpSendEcho or IcmpCreateFile not available\n" ); - return; - } memset(senddata, 0, sizeof(senddata)); address = htonl(INADDR_LOOPBACK); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); - icmp = pIcmpCreateFile(); + icmp = IcmpCreateFile(); if (icmp == INVALID_HANDLE_VALUE) { error = GetLastError(); @@ -995,7 +888,7 @@ static void testIcmpSendEcho(void) address = 0; SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_NETNAME @@ -1005,28 +898,28 @@ static void testIcmpSendEcho(void) address = htonl(INADDR_LOOPBACK); if (0) /* crashes in XP */ { - ret = pIcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); } SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER @@ -1034,7 +927,7 @@ static void testIcmpSendEcho(void) "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER @@ -1043,7 +936,7 @@ static void testIcmpSendEcho(void) SetLastError(0xdeadbeef); replysz = sizeof(replydata) - 1; - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE @@ -1052,19 +945,19 @@ static void testIcmpSendEcho(void) SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); - ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; - ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; - ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE @@ -1072,7 +965,7 @@ static void testIcmpSendEcho(void) "expected 11050, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); + ret = IcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE @@ -1082,19 +975,19 @@ static void testIcmpSendEcho(void) /* in windows >= vista the timeout can't be invalid */ SetLastError(0xdeadbeef); replysz = sizeof(replydata); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); error = GetLastError(); if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); error = GetLastError(); if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); /* real ping test */ SetLastError(0xdeadbeef); address = htonl(INADDR_LOOPBACK); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); if (ret) { @@ -1117,7 +1010,7 @@ static void testIcmpSendEcho(void) SetLastError(0xdeadbeef); address = htonl(INADDR_LOOPBACK); for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + ret = IcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); reply = (ICMP_ECHO_REPLY *)replydata; ok(ret, "IcmpSendEcho failed unexpectedly\n"); @@ -1166,101 +1059,95 @@ static void testWinNT4Functions(void) static void testGetInterfaceInfo(void) { - if (pGetInterfaceInfo) { - DWORD apiReturn; - ULONG len = 0; + DWORD apiReturn; + ULONG len = 0; - apiReturn = pGetInterfaceInfo(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetInterfaceInfo is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetInterfaceInfo returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetInterfaceInfo(NULL, &len); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetInterfaceInfo returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn = GetInterfaceInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetInterfaceInfo is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetInterfaceInfo returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetInterfaceInfo(NULL, &len); + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetInterfaceInfo returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PIP_INTERFACE_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); + + apiReturn = GetInterfaceInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PIP_INTERFACE_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - - apiReturn = pGetInterfaceInfo(buf, &len); - ok(apiReturn == NO_ERROR, - "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", - apiReturn); - HeapFree(GetProcessHeap(), 0, buf); - } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetAdaptersInfo(void) { - if (pGetAdaptersInfo) { - DWORD apiReturn; - ULONG len = 0; + DWORD apiReturn; + ULONG len = 0; - apiReturn = pGetAdaptersInfo(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetAdaptersInfo is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetAdaptersInfo(NULL, &len); - ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, - "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) { + PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == ERROR_NO_DATA) - ; /* no adapter's, that's okay */ - else if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); - - apiReturn = pGetAdaptersInfo(buf, &len); - ok(apiReturn == NO_ERROR, - "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", - apiReturn); - ptr = buf; - while (ptr) { - ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); - ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); - trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, - ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); - ptr = ptr->Next; - } - HeapFree(GetProcessHeap(), 0, buf); + ptr = buf; + while (ptr) { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + ptr = ptr->Next; } + HeapFree(GetProcessHeap(), 0, buf); } } static void testGetNetworkParams(void) { - if (pGetNetworkParams) { - DWORD apiReturn; - ULONG len = 0; + DWORD apiReturn; + ULONG len = 0; - apiReturn = pGetNetworkParams(NULL, NULL); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetNetworkParams is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetNetworkParams returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = pGetNetworkParams(NULL, &len); - ok(apiReturn == ERROR_BUFFER_OVERFLOW, - "GetNetworkParams returned %d, expected ERROR_BUFFER_OVERFLOW\n", + apiReturn = GetNetworkParams(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetNetworkParams is not supported\n"); + return; + } + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetNetworkParams returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + apiReturn = GetNetworkParams(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetNetworkParams returned %d, expected ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_BUFFER_OVERFLOW) { + PFIXED_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); + + apiReturn = GetNetworkParams(buf, &len); + ok(apiReturn == NO_ERROR, + "GetNetworkParams(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PFIXED_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - - apiReturn = pGetNetworkParams(buf, &len); - ok(apiReturn == NO_ERROR, - "GetNetworkParams(buf, &dwSize) returned %d, expected NO_ERROR\n", - apiReturn); - HeapFree(GetProcessHeap(), 0, buf); - } + HeapFree(GetProcessHeap(), 0, buf); } } @@ -1284,20 +1171,19 @@ static void testGetPerAdapterInfo(void) DWORD ret, needed; void *buffer; - if (!pGetPerAdapterInfo) return; - ret = pGetPerAdapterInfo(1, NULL, NULL); + ret = GetPerAdapterInfo(1, NULL, NULL); if (ret == ERROR_NOT_SUPPORTED) { skip("GetPerAdapterInfo is not supported\n"); return; } ok( ret == ERROR_INVALID_PARAMETER, "got %u instead of ERROR_INVALID_PARAMETER\n", ret ); needed = 0xdeadbeef; - ret = pGetPerAdapterInfo(1, NULL, &needed); + ret = GetPerAdapterInfo(1, NULL, &needed); if (ret == ERROR_NO_DATA) return; /* no such adapter */ ok( ret == ERROR_BUFFER_OVERFLOW, "got %u instead of ERROR_BUFFER_OVERFLOW\n", ret ); ok( needed != 0xdeadbeef, "needed not set\n" ); buffer = HeapAlloc( GetProcessHeap(), 0, needed ); - ret = pGetPerAdapterInfo(1, buffer, &needed); + ret = GetPerAdapterInfo(1, buffer, &needed); ok( ret == NO_ERROR, "got %u instead of NO_ERROR\n", ret ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -1309,46 +1195,30 @@ static void testNotifyAddrChange(void) HANDLE handle; BOOL success; - if (!pNotifyAddrChange) - { - win_skip("NotifyAddrChange not present\n"); - return; - } - if (!pCancelIPChangeNotify) - { - win_skip("CancelIPChangeNotify not present\n"); - return; - } - handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - ret = pNotifyAddrChange(&handle, &overlapped); - if (ret == ERROR_NOT_SUPPORTED) - { - win_skip("NotifyAddrChange is not supported\n"); - return; - } + ret = NotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); ret = GetLastError(); todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, expected ERROR_IO_PENDING\n", ret); - success = pCancelIPChangeNotify(&overlapped); + success = CancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); ZeroMemory(&overlapped, sizeof(overlapped)); - success = pCancelIPChangeNotify(&overlapped); + success = CancelIPChangeNotify(&overlapped); ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - ret = pNotifyAddrChange(&handle, &overlapped); + ret = NotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); - success = pCancelIPChangeNotify(&overlapped); + success = CancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); if (winetest_interactive) @@ -1358,7 +1228,7 @@ static void testNotifyAddrChange(void) overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); trace("Testing asynchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = pNotifyAddrChange(&handle, &overlapped); + ret = NotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); ok(success == TRUE, "GetOverlappedResult returned FALSE, expected TRUE\n"); @@ -1369,7 +1239,7 @@ static void testNotifyAddrChange(void) { trace("Testing synchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = pNotifyAddrChange(NULL, NULL); + ret = NotifyAddrChange(NULL, NULL); todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); } } @@ -1399,23 +1269,17 @@ static void test_GetAdaptersAddresses(void) IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; - if (!pGetAdaptersAddresses) - { - win_skip("GetAdaptersAddresses not present\n"); - return; - } - - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); /* size should be ignored and overwritten if buffer is NULL */ size = 0x7fffffff; - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; ptr = HeapAlloc(GetProcessHeap(), 0, size); - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); HeapFree(GetProcessHeap(), 0, ptr); @@ -1423,7 +1287,7 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); @@ -1733,11 +1597,11 @@ static DWORD get_interface_index(void) DWORD size = 0, ret = 0; IP_ADAPTER_ADDRESSES *buf, *aa; - if (pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) return 0; buf = HeapAlloc( GetProcessHeap(), 0, size ); - pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); + GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); for (aa = buf; aa; aa = aa->Next) { if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) @@ -2084,12 +1948,12 @@ static void test_GetUnicastIpAddressEntry(void) ret = pGetUnicastIpAddressEntry( &row ); ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); - ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; ptr = HeapAlloc(GetProcessHeap(), 0, size); - ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); for (aa = ptr; !ret && aa; aa = aa->Next) -- 2.25.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 Feb '20

11 Feb '20

1 0

[PATCH 1/2] kernelbase: Add SetThreadpoolStackInformation stub
by Alistair Leslie-Hughes 11 Feb '20

11 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 2 +- .../api-ms-win-core-threadpool-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec index 4f4580a293..db59501219 100644 --- a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -27,7 +27,7 @@ @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns @ stdcall SetEventWhenCallbackReturns(ptr long) kernel32.SetEventWhenCallbackReturns -@ stub SetThreadpoolStackInformation +@ stdcall SetThreadpoolStackInformation(ptr ptr) kernel32.SetThreadpoolStackInformation @ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum @ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum @ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec index dc110ef9ed..eb5ce3d246 100644 --- a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -21,7 +21,7 @@ @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns @ stdcall SetEventWhenCallbackReturns(ptr long) kernel32.SetEventWhenCallbackReturns -@ stub SetThreadpoolStackInformation +@ stdcall SetThreadpoolStackInformation(ptr ptr) kernel32.SetThreadpoolStackInformation @ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum @ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum @ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47c7d63761..bfbf034f12 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1462,7 +1462,7 @@ @ stdcall -import SetThreadStackGuarantee(ptr) # @ stub SetThreadToken @ stdcall -import SetThreadUILanguage(long) -# @ stub SetThreadpoolStackInformation +@ stdcall -import SetThreadpoolStackInformation(ptr ptr) @ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads @ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads @ stdcall SetThreadpoolTimer(ptr ptr long long) ntdll.TpSetTimer diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index caa6de1d51..5616465670 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1492,7 +1492,7 @@ @ stdcall SetThreadStackGuarantee(ptr) @ stdcall SetThreadToken(ptr ptr) @ stdcall SetThreadUILanguage(long) -@ stub SetThreadpoolStackInformation +@ stdcall SetThreadpoolStackInformation(ptr ptr) @ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads @ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads @ stdcall SetThreadpoolTimer(ptr ptr long long) ntdll.TpSetTimer diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 6af9ffa406..27dc089d8d 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1223,6 +1223,14 @@ PTP_WAIT WINAPI DECLSPEC_HOTPATCH CreateThreadpoolWait( PTP_WAIT_CALLBACK callba return wait; } +/*********************************************************************** + * SetThreadpoolStackInformation (kernelbase.@) + */ +BOOL WINAPI SetThreadpoolStackInformation(PTP_POOL pool, PTP_POOL_STACK_INFORMATION info) +{ + FIXME("%p, %p stub\n", pool, info); + return TRUE; +} /*********************************************************************** * CreateThreadpoolWork (kernelbase.@) -- 2.17.1

3 3

[PATCH 2/2] kernelbase: Add StartThreadpoolIo stub
by Alistair Leslie-Hughes 11 Feb '20

11 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 2 +- .../api-ms-win-core-threadpool-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec index db59501219..0640e5cc33 100644 --- a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -32,7 +32,7 @@ @ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum @ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer @ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait -@ stub StartThreadpoolIo +@ stdcall StartThreadpoolIo(ptr) kernel32.StartThreadpoolIo @ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork @ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback @ stdcall UnregisterWaitEx(long long) kernel32.UnregisterWaitEx diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec index eb5ce3d246..c2ea097445 100644 --- a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -28,7 +28,7 @@ @ stub SetThreadpoolTimerEx @ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait @ stub SetThreadpoolWaitEx -@ stub StartThreadpoolIo +@ stdcall StartThreadpoolIo(ptr) kernel32.StartThreadpoolIo @ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork @ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback @ stub WaitForThreadpoolIoCallbacks diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bfbf034f12..0a93f80291 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1490,7 +1490,7 @@ @ stdcall -import SleepEx(long long) # @ stub SortCloseHandle # @ stub SortGetHandle -# @ stub StartThreadpoolIo +@ stdcall -import StartThreadpoolIo(ptr) @ stdcall SubmitThreadpoolWork(ptr) ntdll.TpPostWork @ stdcall -import SuspendThread(long) @ stdcall -import SwitchToFiber(ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5616465670..5539b3078f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1515,7 +1515,7 @@ @ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stub SpecialMBToWC -@ stub StartThreadpoolIo +@ stdcall StartThreadpoolIo(ptr) # @ stub StmAlignSize # @ stub StmAllocateFlat # @ stub StmCoalesceChunks diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 27dc089d8d..c56a18da25 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1232,6 +1232,14 @@ BOOL WINAPI SetThreadpoolStackInformation(PTP_POOL pool, PTP_POOL_STACK_INFORMAT return TRUE; } +/*********************************************************************** + * StartThreadpoolIo (kernelbase.@) + */ +void StartThreadpoolIo(PTP_IO pio) +{ + FIXME("%p stub\n", pio); +} + /*********************************************************************** * CreateThreadpoolWork (kernelbase.@) */ -- 2.17.1

2 1

[PATCH 1/5] quartz/tests: Add some tests for IBasicVideo::GetCurrentImage().
by Zebediah Figura 11 Feb '20

11 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 76 ++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 101 ++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 98 +++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4e26a18f83..f0c84c60e3 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1071,6 +1071,81 @@ static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_current_image(IBaseFilter *filter, IMemInputPin *input, + IFilterGraph2 *graph, const BITMAPINFOHEADER *expect_bih) +{ + LONG buffer[(sizeof(BITMAPINFOHEADER) + 32 * 16 * 2) / 4]; + const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; + IMediaControl *control; + OAFilterState state; + IBasicVideo *video; + unsigned int i; + HANDLE thread; + HRESULT hr; + LONG size; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); + + hr = IBasicVideo_GetCurrentImage(video, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicVideo_GetCurrentImage(video, NULL, buffer); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IBasicVideo_GetCurrentImage(video, &size, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2, "Got size %d.\n", size); + + size = 0xdeadbeef; + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == VFW_E_NOT_PAUSED, "Got hr %#x.\n", hr); + ok(size == 0xdeadbeef, "Got size %d.\n", size); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(size == 0xdeadbeef, "Got size %d.\n", size); + + thread = send_frame(input); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1; + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == E_OUTOFMEMORY, "Got hr %#x.\n", hr); + todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1, "Got size %d.\n", size); + + size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2, "Got size %d.\n", size); + ok(!memcmp(bih, expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + for (i = 0; i < 32 * 16 * 2; ++i) + { + const unsigned char *data = (unsigned char *)buffer + sizeof(BITMAPINFOHEADER); + ok(data[i] == 0x55, "Got unexpected byte %02x at %u.\n", data[i], i); + } + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + join_thread(thread); + + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == VFW_E_NOT_PAUSED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IBasicVideo_Release(video); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1178,6 +1253,7 @@ static void test_connect_pin(void) test_flushing(pin, input, graph); test_sample_time(pin, input, graph); test_eos(pin, input, graph); + test_current_image(filter, input, graph, &vih.bmiHeader); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index bb793741e9..32b2ae7bef 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1223,6 +1223,106 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_current_image(IBaseFilter *filter, IMemInputPin *input, + IFilterGraph2 *graph, const BITMAPINFOHEADER *req_bih) +{ + LONG buffer[(sizeof(BITMAPINFOHEADER) + 32 * 16 * 4) / 4]; + const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; + const DWORD *data = (DWORD *)((char *)buffer + sizeof(BITMAPINFOHEADER)); + BITMAPINFOHEADER expect_bih = *req_bih; + IMemAllocator *allocator; + IMediaControl *control; + OAFilterState state; + IBasicVideo *video; + unsigned int i; + HANDLE thread; + HRESULT hr; + LONG size; + + /* Note that the bitmap returned by GetCurrentImage() has a bit depth of + * 32 regardless of the format used for pin connection. */ + expect_bih.biBitCount = 32; + expect_bih.biSizeImage = 32 * 16 * 4; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); + + hr = IBasicVideo_GetCurrentImage(video, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicVideo_GetCurrentImage(video, NULL, buffer); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IBasicVideo_GetCurrentImage(video, &size, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 4, "Got size %d.\n", size); + + size = sizeof(buffer); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + /* The contents seem to reflect the last frame rendered. */ + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + size = sizeof(buffer); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + /* The contents seem to reflect the last frame rendered. */ + + thread = send_frame(input); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = 1; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(size == 1, "Got size %d.\n", size); + + size = sizeof(buffer); + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + join_thread(thread); + + size = sizeof(buffer); + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + if (hr == S_OK) + { + ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); + } + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IBasicVideo_Release(video); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1361,6 +1461,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); + test_current_image(filter, input, graph, &vih.bmiHeader); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a800aaeb70..293cc6d959 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1227,6 +1227,103 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_current_image(IBaseFilter *filter, IMemInputPin *input, + IFilterGraph2 *graph, const BITMAPINFOHEADER *req_bih) +{ + LONG buffer[(sizeof(BITMAPINFOHEADER) + 32 * 16 * 4) / 4]; + const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; + const DWORD *data = (DWORD *)((char *)buffer + sizeof(BITMAPINFOHEADER)); + BITMAPINFOHEADER expect_bih = *req_bih; + IMemAllocator *allocator; + IMediaControl *control; + OAFilterState state; + IBasicVideo *video; + unsigned int i; + HANDLE thread; + HRESULT hr; + LONG size; + + expect_bih.biSizeImage = 32 * 16 * 4; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); + + hr = IBasicVideo_GetCurrentImage(video, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicVideo_GetCurrentImage(video, NULL, buffer); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IBasicVideo_GetCurrentImage(video, &size, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 4, "Got size %d.\n", size); + + size = sizeof(buffer); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + /* The contents seem to reflect the last frame rendered. */ + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + size = sizeof(buffer); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + /* The contents seem to reflect the last frame rendered. */ + + thread = send_frame(input); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = 1; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(size == 1, "Got size %d.\n", size); + + size = sizeof(buffer); + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + todo_wine ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + join_thread(thread); + + size = sizeof(buffer); + memset(buffer, 0xcc, sizeof(buffer)); + hr = IBasicVideo_GetCurrentImage(video, &size, buffer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == sizeof(buffer), "Got size %d.\n", size); + if (hr == S_OK) + { + ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); + } + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IBasicVideo_Release(video); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1364,6 +1461,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); + test_current_image(filter, input, graph, &vih.bmiHeader); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.25.0

2 9

[PATCH] include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum.
by Brendan Shanks 10 Feb '20

10 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/wingdi.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index bed2c70798..0a456f8230 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3409,24 +3409,24 @@ typedef enum typedef enum { - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = (int) -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = (int) 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = (int) 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = (int) 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = (int) 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = (int) 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = (int) 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = (int) 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = (int) 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = (int) 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = (int) 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = (int) 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = (int) 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = (int) 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = (int) 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = (int) 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = (int) 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; typedef struct DISPLAYCONFIG_2DREGION -- 2.24.1

1 0

[PATCH] winecrt0: Make __wine_(un)register_resources() cdecl.
by Zebediah Figura 10 Feb '20

10 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register CLSID_VideoProcessorMFT when run manually with regsvr32. The bug occurs because __wine_(un)register_resources() in winecrt0 is built with -mabi=ms and thus expects its first argument in %rcx, but winegstreamer passes it in %rdi. Fixes: d401837994a31277103042fbe091e364c2fa55ea Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I didn't test explicitly that d40183799 is the first broken commit, but unless something else broke this earlier, it logically should be. Based on e.g. 1f6681f47 and 60df3b14b I'm guessing this is the preferred fix. An alternative fix would of course be not to use MSVCRTFLAGS if we are not cross-compiling. I don't understand why that's not the preferred fix, given that MSVCRTFLAGS seems to append nothing that would make a difference if we were not cross-compiling (unless -fno-builtin makes a difference, but I can't tell why it would). dlls/winecrt0/register.c | 4 ++-- include/rpcproxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 8c15d1be721..cb5e7a50f76 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -94,7 +94,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } -HRESULT __wine_register_resources( HMODULE module ) +HRESULT __cdecl __wine_register_resources( HMODULE module ) { struct reg_info info; @@ -106,7 +106,7 @@ HRESULT __wine_register_resources( HMODULE module ) return info.result; } -HRESULT __wine_unregister_resources( HMODULE module ) +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) { struct reg_info info; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 4d2c63e62d6..5b184329bd4 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -203,8 +203,8 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); -HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; -HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ -- 2.25.0

1 0

[PATCH 1/3] user32: Move ChangeDisplaySettingsExW() common code to user32.
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 110 +++++++++++++++++++++++++++++++++++- dlls/winemac.drv/display.c | 36 ------------ dlls/winex11.drv/settings.c | 71 +---------------------- 3 files changed, 111 insertions(+), 106 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2ff5b2f909..2523df6bf2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3200,6 +3200,71 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h return ret; } +#define _X_FIELD(prefix, bits) \ + if ((fields) & prefix##_##bits) \ + { \ + p += sprintf(p, "%s%s", first ? "" : ",", #bits); \ + first = FALSE; \ + } + +static const CHAR *_CDS_flags(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(CDS, UPDATEREGISTRY) + _X_FIELD(CDS, TEST) + _X_FIELD(CDS, FULLSCREEN) + _X_FIELD(CDS, GLOBAL) + _X_FIELD(CDS, SET_PRIMARY) + _X_FIELD(CDS, RESET) + _X_FIELD(CDS, SETRECT) + _X_FIELD(CDS, NORESET) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +static const CHAR *_DM_fields(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(DM, BITSPERPEL) + _X_FIELD(DM, PELSWIDTH) + _X_FIELD(DM, PELSHEIGHT) + _X_FIELD(DM, DISPLAYFLAGS) + _X_FIELD(DM, DISPLAYFREQUENCY) + _X_FIELD(DM, POSITION) + _X_FIELD(DM, DISPLAYORIENTATION) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +#undef _X_FIELD + +static void trace_devmode(const DEVMODEW *devmode) +{ + TRACE("dmFields=%s ", _DM_fields(devmode->dmFields)); + if (devmode->dmFields & DM_BITSPERPEL) + TRACE("dmBitsPerPel=%u ", devmode->dmBitsPerPel); + if (devmode->dmFields & DM_PELSWIDTH) + TRACE("dmPelsWidth=%u ", devmode->dmPelsWidth); + if (devmode->dmFields & DM_PELSHEIGHT) + TRACE("dmPelsHeight=%u ", devmode->dmPelsHeight); + if (devmode->dmFields & DM_DISPLAYFREQUENCY) + TRACE("dmDisplayFrequency=%u ", devmode->dmDisplayFrequency); + if (devmode->dmFields & DM_POSITION) + TRACE("dmPosition=(%d,%d) ", devmode->u1.s2.dmPosition.x, devmode->u1.s2.dmPosition.y); + if (devmode->dmFields & DM_DISPLAYFLAGS) + TRACE("dmDisplayFlags=%#x ", devmode->u2.dmDisplayFlags); + if (devmode->dmFields & DM_DISPLAYORIENTATION) + TRACE("dmDisplayOrientation=%u ", devmode->u1.s2.dmDisplayOrientation); + TRACE("\n"); +} /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) @@ -3207,7 +3272,50 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam ); + BOOL def_mode = TRUE; + DEVMODEW dm; + + TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); + TRACE("flags=%s\n", _CDS_flags(flags)); + + if (devmode) + { + trace_devmode(devmode); + + /* This is the minimal dmSize that XP accepts */ + if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) + return DISP_CHANGE_FAILED; + + if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) + { + if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || + ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || + ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) + def_mode = FALSE; + } + } + + if (def_mode) + { + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) + { + ERR("Default mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + TRACE("Return to original display mode\n"); + devmode = &dm; + } + + if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + { + WARN("devmode doesn't specify the resolution: %#x\n", devmode->dmFields); + return DISP_CHANGE_BADMODE; + } + + return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b58a9d172b..4c610c4573 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -755,8 +755,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, { LONG ret = DISP_CHANGE_BADMODE; int bpp; - DEVMODEW dm; - BOOL def_mode = TRUE; struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; @@ -770,40 +768,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) - { - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || - ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || - ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || - ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) - def_mode = FALSE; - } - } - - if (def_mode) - { - if (!macdrv_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - - TRACE("Return to original display mode\n"); - devmode = &dm; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } - if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a4f172037c..24644db620 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -311,30 +311,6 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } -#define _X_FIELD(prefix, bits) if ((fields) & prefix##_##bits) {p+=sprintf(p, "%s%s", first ? "" : ",", #bits); first=FALSE;} -static const char * _CDS_flags(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(CDS,UPDATEREGISTRY);_X_FIELD(CDS,TEST);_X_FIELD(CDS,FULLSCREEN); - _X_FIELD(CDS,GLOBAL);_X_FIELD(CDS,SET_PRIMARY);_X_FIELD(CDS,RESET); - _X_FIELD(CDS,SETRECT);_X_FIELD(CDS,NORESET); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -static const char * _DM_fields(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(DM,BITSPERPEL);_X_FIELD(DM,PELSWIDTH);_X_FIELD(DM,PELSHEIGHT); - _X_FIELD(DM,DISPLAYFLAGS);_X_FIELD(DM,DISPLAYFREQUENCY);_X_FIELD(DM,POSITION); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -#undef _X_FIELD - /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -342,57 +318,14 @@ static const char * _DM_fields(DWORD fields) LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - DWORD i, dwBpp = 0; - DEVMODEW dm; - BOOL def_mode = TRUE; char bpp_buffer[16], freq_buffer[18]; - - TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); - TRACE("flags=%s\n",_CDS_flags(flags)); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); - TRACE("width=%d height=%d bpp=%d freq=%d (%s)\n", - devmode->dmPelsWidth,devmode->dmPelsHeight, - devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name); - - dwBpp = devmode->dmBitsPerPel; - if (devmode->dmFields & DM_BITSPERPEL) def_mode &= !dwBpp; - if (devmode->dmFields & DM_PELSWIDTH) def_mode &= !devmode->dmPelsWidth; - if (devmode->dmFields & DM_PELSHEIGHT) def_mode &= !devmode->dmPelsHeight; - if (devmode->dmFields & DM_DISPLAYFREQUENCY) def_mode &= !devmode->dmDisplayFrequency; - } - - if (def_mode || !dwBpp) - { - if (!X11DRV_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - if (def_mode) - { - TRACE("Return to original display mode (%s)\n", handler_name); - devmode = &dm; - } - dwBpp = dm.dmBitsPerPel; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } + DWORD i; for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) { - if (dwBpp != dd_modes[i].bpp) + if (devmode->dmBitsPerPel != dd_modes[i].bpp) continue; } if (devmode->dmFields & DM_PELSWIDTH) -- 2.20.1

3 2

[PATCH 1/5] setupapi/tests: Add some tests for COM self-registration.
by Zebediah Figura 10 Feb '20

10 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/setupapi/tests/Makefile.in | 6 ++- dlls/setupapi/tests/install.c | 90 ++++++++++++++++++++++++++++++++ dlls/setupapi/tests/selfreg.c | 50 ++++++++++++++++++ dlls/setupapi/tests/selfreg.spec | 2 + 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 dlls/setupapi/tests/selfreg.c create mode 100644 dlls/setupapi/tests/selfreg.spec diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 83f751c7dbd..df7c6687875 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = setupapi.dll -IMPORTS = advapi32 cabinet setupapi shell32 uuid user32 +IMPORTS = advapi32 cabinet ole32 setupapi shell32 uuid user32 + +selfreg_IMPORTS = uuid advapi32 ole32 SOURCES = \ coinst.c \ @@ -11,6 +13,8 @@ SOURCES = \ misc.c \ parser.c \ query.c \ + selfreg.c \ + selfreg.spec \ setupapi.rc \ setupcab.c \ stringtable.c diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fd10fd91332..b918bb21f60 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -54,6 +54,24 @@ static char CURR_DIR[MAX_PATH]; * Helpers */ +static void load_resource(const char *name, const char *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", filename, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; @@ -2040,6 +2058,77 @@ static void test_start_copy(void) delete_file("dst/"); } +static void test_register_dlls(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "RegisterDlls=register_section\n" + "UnregisterDlls=register_section\n" + "[register_section]\n" + "40000,,winetest_selfreg.dll,1\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + HRESULT hr; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + load_resource("selfreg.dll", "winetest_selfreg.dll"); + ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); + ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + todo_wine ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + CoUninitialize(); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); + ret = DeleteFileA("winetest_selfreg.dll"); + ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -2069,6 +2158,7 @@ START_TEST(install) test_close_queue(); test_install_file(); test_start_copy(); + test_register_dlls(); UnhookWindowsHookEx(hhook); diff --git a/dlls/setupapi/tests/selfreg.c b/dlls/setupapi/tests/selfreg.c new file mode 100644 index 00000000000..f687990f3bc --- /dev/null +++ b/dlls/setupapi/tests/selfreg.c @@ -0,0 +1,50 @@ +/* + * DLL for testing COM self-registration + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "msxml.h" + +HRESULT WINAPI DllRegisterServer(void) +{ + IUnknown *unk; + HKEY key; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegCreateKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + RegCloseKey(key); + IUnknown_Release(unk); + } + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + IUnknown *unk; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + IUnknown_Release(unk); + } + return S_OK; +} diff --git a/dlls/setupapi/tests/selfreg.spec b/dlls/setupapi/tests/selfreg.spec new file mode 100644 index 00000000000..0f9b07355f7 --- /dev/null +++ b/dlls/setupapi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.25.0

1 4

[PATCH 1/5] d3d9: Retrieve the vertex shader from the primary stateblock.
by Zebediah Figura 10 Feb '20

10 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d5bc77ed7..c95e1a003e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3524,7 +3524,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->vs)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; -- 2.25.0

4 10

[PATCH 1/4] hid: Add HidP_GetLinkCollectionNodes stub.
by Rémi Bernon 10 Feb '20

10 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 8 ++++++++ include/ddk/hidpi.h | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b50e04d197f..b8e29fef16a 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -22,7 +22,7 @@ @ stdcall HidP_GetCaps(ptr ptr) @ stdcall HidP_GetData(long ptr ptr ptr ptr long) @ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) @ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9d631912c85..5f18f57dd93 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -927,3 +927,11 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U return rc; } + +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, + ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + TRACE("stub (%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 042c84dd1c5..51d61ea8541 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -175,6 +175,19 @@ typedef struct _HIDP_DATA { } DUMMYUNIONNAME; } HIDP_DATA, *PHIDP_DATA; +typedef struct _HIDP_LINK_COLLECTION_NODE { + USAGE LinkUsage; + USAGE LinkUsagePage; + USHORT Parent; + USHORT NumberOfChildren; + USHORT NextSibling; + USHORT FirstChild; + ULONG CollectionType : 8; + ULONG IsAlias : 1; + ULONG Reserved : 23; + PVOID UserContext; +} HIDP_LINK_COLLECTION_NODE, *PHIDP_LINK_COLLECTION_NODE; + typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); @@ -196,6 +209,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE Usa NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11 -- 2.25.0

2 5

[PATCH] gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

This avoids printing walls of FIXMEs running many .net graphics applications. I've added quite a bit of tests for various bitmap formats associated with the graphics object (manually created and created from GDI bitmaps, with and without explicitly assigned palette, with different colors (with alpha 0-255)), and GdipGetNearestColor() always returns unmodified color. So, it's better to limit printing a FIXME only for graphics objects with an indexed bitmap. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/graphics.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c52fa65445..8f3272b281 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4775,7 +4775,7 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, /* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + TRACE("(%p, %p)\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -4783,6 +4783,13 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; + if (graphics->image->type == ImageTypeBitmap) + { + GpBitmap *bitmap = (GpBitmap *)graphics->image; + if (IsIndexedPixelFormat(bitmap->format)) + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + } + return Ok; } -- 2.20.1

2 1

[PATCH] libwine: Add WINEUSER environment variable
by Myah Caron 10 Feb '20

10 Feb '20

This environment variable is useful in a few cases: * If a user would rather not use their own username in the prefix. * If a user wants multiple users in a wine prefix (e.g. as separate profiles for programs). * If the prefix was created with proton, which replaces the username with steamuser, this allows the data under the home directory to be usable under vanilla wine without needing symlinks or renaming the directory. * Similarly, this allows prefixes created under a different username (e.g. transferred from a different system) to be used. Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- libs/wine/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 2a3314cbfd..d05f021267 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -263,14 +263,14 @@ static void init_paths(void) struct stat st; const char *home = getenv( "HOME" ); - const char *user = NULL; + const char *user = getenv( "WINEUSER" ); const char *prefix = getenv( "WINEPREFIX" ); char uid_str[32]; struct passwd *pwd = getpwuid( getuid() ); if (pwd) { - user = pwd->pw_name; + if (!user) user = pwd->pw_name; if (!home) home = pwd->pw_dir; } if (!user) -- 2.25.0

3 3

[PATCH] d3d9: Return a stub interface from Direct3DShaderValidatorCreate9().
by Henri Verbeet 10 Feb '20

10 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46735 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 178279. dlls/d3d9/d3d9_main.c | 124 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 66 +++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 21df2a34cd2..75e627dd765 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -75,18 +75,124 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E return D3D_OK; } -/******************************************************************* - * Direct3DShaderValidatorCreate9 (D3D9.@) +/* The callback is called on any error encountered during validation, including + * improper IDirect3DShaderValidator9 method calls. + * - "file" and "line" are passed through directly from Instruction(). "line" + * is provably 32-bit, as 64-bit values passed to Instruction() will be + * truncated. + * - "arg3" has been observed to be at least 0, 2, and 6. The integer size is + * not known. + * - "message_id" is a numeric error code. fxc.exe adds 5000 before printing + * it. The integer size is not known. + * - "context" is passed through directly from Begin(). * - * No documentation available for this function. - * SDK only says it is internal and shouldn't be used. - */ -void* WINAPI Direct3DShaderValidatorCreate9(void) + * Improper calls to IDirect3DShaderValidator9 methods, or other errors not + * generated by specific Instruction() calls, yield NULL as the file, and + * either 0 or -1 as the line. + * + * The callback return type is not known, but programs (fxc.exe, The Sims 2) + * seem to consistently return 0. + * + * The interface and method names below are derived from the messages that + * native d3d9 prints on said improper method calls. + * + * Calls to Begin(), Instruction(), End() have been observed to return S_OK and + * E_FAIL. E_FAIL is not always returned if an error message is handed to the + * callback. */ + +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +static HRESULT WINAPI shader_validator_QueryInterface(IDirect3DShaderValidator9 *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI shader_validator_AddRef(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 2; +} + +static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +/* The size and type of the third argument is not known. The Sims 2 passes 0; + * fxc.exe passes 1. */ +static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3) +{ + FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + + return S_OK; +} + +/* - "file" and "line" are passed directly through to the callback. + * - "tokens" comprises a single instruction; the caller must determine its + * length. + * - "token_count" is in DWORDs. */ +static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count) +{ + FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + iface, debugstr_a(file), line, tokens, token_count); + + return S_OK; +} + +static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) +{ + FIXME("iface %p, stub!\n", iface); + + return S_OK; +} + +static const struct IDirect3DShaderValidator9Vtbl shader_validator_vtbl = +{ + shader_validator_QueryInterface, + shader_validator_AddRef, + shader_validator_Release, + shader_validator_Begin, + shader_validator_Instruction, + shader_validator_End, +}; + +static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; + +IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - static int once; + TRACE("Returning validator %p.\n", &shader_validator); - if (!once++) FIXME("stub\n"); - return NULL; + return &shader_validator; } /*********************************************************************** diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 156cb188f05..8c1ebc1719c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -53,6 +53,8 @@ struct device_desc static DEVMODEW registry_mode; +static void *(WINAPI *Direct3DShaderValidatorCreate9)(void); + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ @@ -13447,8 +13449,69 @@ static void test_multi_adapter(void) IDirect3D9_Release(d3d); } +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, + DWORD_PTR message_id, const char *message, void *context) +{ + ok(0, "Unexpected call.\n"); + return S_OK; +} + +static void test_shader_validator(void) +{ + IDirect3DShaderValidator9 *validator; + ULONG refcount; + HRESULT hr; + + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, NULL, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[0], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[1], 3); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[4], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[8], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[12], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[16], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[20], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); WNDCLASSA wc = {0}; IDirect3D9 *d3d9; DEVMODEW current_mode; @@ -13476,6 +13539,8 @@ START_TEST(device) wc.lpszClassName = "d3d9_test_wc"; RegisterClassA(&wc); + Direct3DShaderValidatorCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DShaderValidatorCreate9"); + test_get_set_vertex_declaration(); test_get_declaration(); test_fvf_decl_conversion(); @@ -13575,6 +13640,7 @@ START_TEST(device) test_vertex_buffer_read_write(); test_get_display_mode(); test_multi_adapter(); + test_shader_validator(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

2 1

[PATCH 1/2] wined3d: Support AMD alpha to coverage state.
by Paul Gofman 10 Feb '20

10 Feb '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/state.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 859f3e5f1f..b4991d4e5e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27100,7 +27100,7 @@ static void test_alpha_to_coverage(void) colour = get_readback_color(&rb, 64, 64); /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cc7afe5165..d4bd0d25ca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12173,6 +12173,8 @@ static void glsl_vertex_pipe_pointsize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; + + state_alpha_to_coverage(context, state, state_id); } static void glsl_vertex_pipe_pointscale(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87e1ca4bac..97fab9cd40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1507,6 +1507,25 @@ static void state_psizemin_arb(struct wined3d_context *context, const struct win checkGLcall("glPointParameterfARB(...)"); } +void state_alpha_to_coverage(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + + if (!gl_info->supported[ARB_MULTISAMPLE]) + return; + + if (state->render_states[WINED3D_RS_POINTSIZE] == WINED3D_ALPHA_TO_COVERAGE_ENABLE) + { + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE)"); + } + else if (state->render_states[WINED3D_RS_POINTSIZE] == WINED3D_ALPHA_TO_COVERAGE_DISABLE) + { + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE)"); + } +} + static void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -1532,6 +1551,8 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glPointSize(max(pointsize, FLT_MIN)); checkGLcall("glPointSize(...);"); + + state_alpha_to_coverage(context, state, state_id); } static void state_debug_monitor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b9b342441..8e595db65d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -4608,6 +4611,8 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; +void state_alpha_to_coverage(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) DECLSPEC_HIDDEN; -- 2.24.1

2 4

[PATCH 1/5] wined3d: Initialise outputs in wined3d_init().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Place all outputs in struct wined3d so that D3D9 and older versions of D3D can index into outputs as adapters because older versions of D3D treat outputs as adapters. And put outputs to the adapters they belong to so that DXGI can find the outputs of an adapter as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 82 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 12 +++-- 3 files changed, 71 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7167f208e9..3d676f7e10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -26,6 +26,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -155,7 +156,6 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - wined3d_output_cleanup(&adapter->output); heap_free(adapter->formats); } @@ -168,6 +168,32 @@ ULONG CDECL wined3d_incref(struct wined3d *wined3d) return refcount; } +static void wined3d_cleanup(struct wined3d *wined3d) +{ + unsigned int i; + + if (wined3d->outputs) + { + for (i = 0; i < wined3d->output_count; ++i) + wined3d_output_cleanup(&wined3d->outputs[i]); + } + + if (wined3d->adapters) + { + for (i = 0; i < wined3d->adapter_count; ++i) + { + struct wined3d_adapter *adapter = wined3d->adapters[i]; + if (!adapter) + break; + + adapter->adapter_ops->adapter_destroy(adapter); + } + } + + heap_free(wined3d->outputs); + heap_free(wined3d->adapters); +} + ULONG CDECL wined3d_decref(struct wined3d *wined3d) { ULONG refcount = InterlockedDecrement(&wined3d->ref); @@ -176,14 +202,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) if (!refcount) { - unsigned int i; - - for (i = 0; i < wined3d->adapter_count; ++i) - { - struct wined3d_adapter *adapter = wined3d->adapters[i]; - - adapter->adapter_ops->adapter_destroy(adapter); - } + wined3d_cleanup(wined3d); heap_free(wined3d); } @@ -920,7 +939,7 @@ struct wined3d_output * CDECL wined3d_get_adapter_output(const struct wined3d *w if (adapter_idx >= wined3d->adapter_count) return NULL; - return &wined3d->adapters[adapter_idx]->output; + return &wined3d->adapters[adapter_idx]->outputs[0]; } /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes @@ -2811,7 +2830,6 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; - HRESULT hr; adapter->ordinal = ordinal; @@ -2819,16 +2837,10 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); - if (FAILED(hr = wined3d_output_init(&adapter->output, adapter->device_name))) - { - ERR("Failed to initialise output, hr %#x.\n", hr); - return FALSE; - } if (!AllocateLocallyUniqueId(&adapter->luid)) { ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - wined3d_output_cleanup(&adapter->output); return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter %p.\n", @@ -2863,17 +2875,45 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { + HRESULT hr = E_FAIL; + wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initialising adapters.\n"); + TRACE("Initialising adapters and outputs.\n"); + + wined3d->adapter_count = 1; + wined3d->output_count = 1; + + wined3d->adapters = heap_calloc(wined3d->adapter_count, sizeof(*wined3d->adapters)); + if (!wined3d->adapters) + goto fail; + + wined3d->outputs = heap_calloc(wined3d->output_count, sizeof(*wined3d->outputs)); + if (!wined3d->outputs) + goto fail; if (!(wined3d->adapters[0] = wined3d_adapter_create(0, flags))) { WARN("Failed to create adapter.\n"); - return E_FAIL; + goto fail; } - wined3d->adapter_count = 1; - return WINED3D_OK; + wined3d->adapters[0]->outputs = wined3d->outputs; + wined3d->adapters[0]->output_count = 1; + if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name))) + { + WARN("Failed to create output, hr %#x.\n", hr); + goto fail; + } + + TRACE("adapter count: %u, output count: %u.\n", wined3d->adapter_count, wined3d->output_count); + hr = WINED3D_OK; +fail: + if (FAILED(hr)) + { + ERR("Initialising wined3d failed!\n"); + wined3d_cleanup(wined3d); + } + return hr; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 05684aeb3b..3e20028b81 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -126,7 +126,7 @@ struct wined3d * CDECL wined3d_create(DWORD flags) struct wined3d *object; HRESULT hr; - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d, adapters[1])))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate wined3d object memory.\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52b..c7ace57324 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2893,6 +2893,7 @@ struct wined3d_adapter_ops struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; +/* The output structure, represents a video card output */ struct wined3d_output { D3DKMT_HANDLE kmt_adapter; @@ -2900,7 +2901,7 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; -/* The adapter structure */ +/* The adapter structure, represents a video card */ struct wined3d_adapter { unsigned int ordinal; @@ -2910,7 +2911,10 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - struct wined3d_output output; + + struct wined3d_output *outputs; /* Outputs in this adapter */ + unsigned int output_count; + UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; @@ -3117,7 +3121,9 @@ struct wined3d LONG ref; unsigned int flags; unsigned int adapter_count; - struct wined3d_adapter *adapters[1]; + struct wined3d_adapter **adapters; + unsigned int output_count; + struct wined3d_output *outputs; /* Outputs of all adapters, d3d8/9 treat outputs as adapters */ }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -- 2.20.1

2 2

[PATCH 9/9] oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in a few more places.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)

1 0

[PATCH 8/9] oleaut32: Return missing function custom data as VT_EMPTY.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 24 ++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++-------- 2 files changed, 27 insertions(+), 8 deletions(-)

1 0

[PATCH 7/9] oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in ITypeInfo2_fnGetFuncCustData.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH 6/9] oleaut32: Return function description as TLBFuncDesc from ITypeInfoImpl_GetInternalDispatchFuncDesc.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 5/9] oleaut32: Move TKIND_DISPATCH logic to ITypeInfoImpl_GetInternalFuncDesc.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 43 ++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-)

1 0

[PATCH 4/9] oleaut32: Fix handling resource IDs in paths when registering typelib helpdir.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH 3/9] oleaut32/tests: Add test of reference typelib caching.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/Makefile.in | 1 + dlls/oleaut32/tests/test_simple.idl | 34 ++++++++++++++++++ dlls/oleaut32/tests/tmarshal.rc | 3 ++ dlls/oleaut32/tests/typelib.c | 53 ++++++++++++++++++++++------- 4 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 dlls/oleaut32/tests/test_simple.idl

1 0

[PATCH 2/9] oleaut32: Search cache for requested typeinfo in GetRefTypeInfo.
by Jacek Caban 10 Feb '20

10 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-)

1 0

[PATCH 1/9] oleaut32/tests: Use Unicode strings for file names.
by Jacek Caban 10 Feb '20

10 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 58 ++++++++++++++--------------------- 1 file changed, 23 insertions(+), 35 deletions(-)

1 0

[PATCH v2] kernel32: Add semi-stub for LoadPackagedLibrary().
by Paul Gofman 10 Feb '20

10 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48229 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - added missing newline in win_skip(). dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 8 ++++++++ include/winbase.h | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47c7d63761..f07a2ee9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1048,6 +1048,7 @@ @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) @ stdcall -import LoadLibraryW(wstr) +@ stdcall -import LoadPackagedLibrary(wstr long) @ stdcall LoadModule(str ptr) @ stdcall -import LoadResource(long long) # @ stub LoadStringBaseExW diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6f143f5efd..1f6b3818dc 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static HMODULE (WINAPI *pLoadPackagedLibrary)(LPCWSTR lpwLibFileName, DWORD Reserved); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3917,6 +3918,22 @@ static void test_dll_file( const char *name ) #undef OK_FIELD } +static void test_LoadPackagedLibrary(void) +{ + static const WCHAR kernel32_nameW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + HMODULE h; + + if (!pLoadPackagedLibrary) + { + win_skip("LoadPackagedLibrary is not available.\n"); + return; + } + + h = pLoadPackagedLibrary(kernel32_nameW, 0); + ok(!h && GetLastError() == APPMODEL_ERROR_NO_PACKAGE, "Got unexpected handle %p, GetLastError() %u.\n", + h, GetLastError()); +} + START_TEST(loader) { int argc; @@ -3954,6 +3971,7 @@ START_TEST(loader) pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); + pLoadPackagedLibrary = (void *)GetProcAddress(kernel32, "LoadPackagedLibrary"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); GetSystemInfo( &si ); @@ -3993,4 +4011,5 @@ START_TEST(loader) test_dll_file( "user32.dll" ); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); + test_LoadPackagedLibrary(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index caa6de1d51..49fb4a7ff1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -926,7 +926,7 @@ @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) -# @ stub LoadPackagedLibrary +@ stdcall LoadPackagedLibrary(wstr long) @ stdcall LoadResource(long long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 456a9f2da4..0f114bb315 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -1209,3 +1209,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH ZombifyActCtx( HANDLE context ) { return set_ntstatus( RtlZombifyActivationContext( context )); } + +HMODULE WINAPI LoadPackagedLibrary( LPCWSTR name, DWORD reserved ) +{ + FIXME("semi-stub, name %s, reserved %#x.\n", debugstr_w(name), reserved); + + SetLastError(APPMODEL_ERROR_NO_PACKAGE); + return NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 3062d3b6ad..23a782a6dc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2417,6 +2417,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); WINBASEAPI HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); WINBASEAPI HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) +WINBASEAPI HMODULE WINAPI LoadPackagedLibrary(LPCWSTR,DWORD); WINBASEAPI DWORD WINAPI LoadModule(LPCSTR,LPVOID); WINBASEAPI HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); WINBASEAPI HLOCAL WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2); -- 2.24.1

2 1

[PATCH resend 1/3] ntdll/tests: Test updating TickCount in user_shared_data.
by Rémi Bernon 10 Feb '20

10 Feb '20

Patch from: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d..be6859fe3e1 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static ULONG (WINAPI *pNtGetTickCount)(void); static const int MonthLengths[2][12] = { @@ -153,12 +156,35 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static void test_NtGetTickCount(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + LONG diff; + int i; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount is not available\n"); + return; + } + + for (i = 0; i < 5; ++i) + { + diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; + diff = pNtGetTickCount() - diff; + todo_wine + ok(diff < 100, "NtGetTickCount - TickCountQuad too high, expected < 100 got %d\n", diff); + Sleep(50); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount"); pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = @@ -169,5 +195,6 @@ START_TEST(time) else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_NtGetTickCount(); test_RtlQueryTimeZoneInformation(); } -- 2.25.0

2 4

[PATCH] kernel32: Add semi-stub for LoadPackagedLibrary().
by Paul Gofman 10 Feb '20

10 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48229 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 8 ++++++++ include/winbase.h | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47c7d63761..f07a2ee9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1048,6 +1048,7 @@ @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) @ stdcall -import LoadLibraryW(wstr) +@ stdcall -import LoadPackagedLibrary(wstr long) @ stdcall LoadModule(str ptr) @ stdcall -import LoadResource(long long) # @ stub LoadStringBaseExW diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6f143f5efd..5eaee97a91 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static HMODULE (WINAPI *pLoadPackagedLibrary)(LPCWSTR lpwLibFileName, DWORD Reserved); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3917,6 +3918,22 @@ static void test_dll_file( const char *name ) #undef OK_FIELD } +static void test_LoadPackagedLibrary(void) +{ + static const WCHAR kernel32_nameW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + HANDLE h; + + if (!pLoadPackagedLibrary) + { + win_skip("LoadPackagedLibrary is not available."); + return; + } + + h = pLoadPackagedLibrary(kernel32_nameW, 0); + ok(!h && GetLastError() == APPMODEL_ERROR_NO_PACKAGE, "Got unexpected handle %p, GetLastError() %u.\n", + h, GetLastError()); +} + START_TEST(loader) { int argc; @@ -3954,6 +3971,7 @@ START_TEST(loader) pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); + pLoadPackagedLibrary = (void *)GetProcAddress(kernel32, "LoadPackagedLibrary"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); GetSystemInfo( &si ); @@ -3993,4 +4011,5 @@ START_TEST(loader) test_dll_file( "user32.dll" ); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); + test_LoadPackagedLibrary(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index caa6de1d51..49fb4a7ff1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -926,7 +926,7 @@ @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) -# @ stub LoadPackagedLibrary +@ stdcall LoadPackagedLibrary(wstr long) @ stdcall LoadResource(long long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 456a9f2da4..0f114bb315 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -1209,3 +1209,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH ZombifyActCtx( HANDLE context ) { return set_ntstatus( RtlZombifyActivationContext( context )); } + +HMODULE WINAPI LoadPackagedLibrary( LPCWSTR name, DWORD reserved ) +{ + FIXME("semi-stub, name %s, reserved %#x.\n", debugstr_w(name), reserved); + + SetLastError(APPMODEL_ERROR_NO_PACKAGE); + return NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 3062d3b6ad..23a782a6dc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2417,6 +2417,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); WINBASEAPI HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); WINBASEAPI HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) +WINBASEAPI HMODULE WINAPI LoadPackagedLibrary(LPCWSTR,DWORD); WINBASEAPI DWORD WINAPI LoadModule(LPCSTR,LPVOID); WINBASEAPI HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); WINBASEAPI HLOCAL WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2); -- 2.24.1

1 0

[PATCH 5/5] dxgi: Check NULL adapter and output pointers.
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/factory.c | 3 +++ dlls/dxgi/tests/dxgi.c | 9 +++++++++ 3 files changed, 15 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 329c67196c..ac80818152 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -129,6 +129,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + hr = wined3d_adapter_get_output_count(adapter->factory->wined3d, adapter->ordinal, &output_count); if (FAILED(hr) || output_idx >= output_count) { diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..cd007bfced 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,9 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -1171,6 +1174,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { @@ -4949,6 +4955,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

2 1

[PATCH 4/5] wined3d: Introduce wined3d_adapter_get_output_ordinal().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/output.c | 8 +++++--- dlls/wined3d/directx.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 ++ 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 477f19f3f4..329c67196c 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -136,7 +136,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return DXGI_ERROR_NOT_FOUND; } - if (FAILED(hr = dxgi_output_create(adapter, &output_object))) + if (FAILED(hr = dxgi_output_create(adapter, output_idx, &output_object))) { *output = NULL; return hr; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b93449834..5fd920b642 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -146,9 +146,10 @@ struct dxgi_output LONG refcount; struct wined3d_private_store private_store; struct dxgi_adapter *adapter; + UINT wined3d_output_ordinal; }; -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT ordinal, struct dxgi_output **output) DECLSPEC_HIDDEN; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; /* IDXGIAdapter */ diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a2331358e6..0f14dc75fc 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -581,20 +581,22 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); } -static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) +static void dxgi_output_init(struct dxgi_output *output, UINT ordinal, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; wined3d_private_store_init(&output->private_store); output->adapter = adapter; + wined3d_adapter_get_output_ordinal(adapter->factory->wined3d, + adapter->ordinal, ordinal, &output->wined3d_output_ordinal); IWineDXGIAdapter_AddRef(&output->adapter->IWineDXGIAdapter_iface); } -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT ordinal, struct dxgi_output **output) { if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; - dxgi_output_init(*output, adapter); + dxgi_output_init(*output, ordinal, adapter); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 10bbfa4c54..c828b1fce4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -63,6 +63,24 @@ const GLenum magLookup[] = GL_NEAREST, GL_NEAREST, GL_LINEAR, }; +/* Retrieve an ordinal to uniquely identify an output within a wined3d instance. + * output_idx here is the output index within an adapter, rather than in wined3d instance */ +HRESULT CDECL wined3d_adapter_get_output_ordinal(const struct wined3d *wined3d, + UINT adapter_idx, UINT output_idx, UINT *ordinal) +{ + struct wined3d_adapter *adapter; + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + adapter = wined3d->adapters[adapter_idx]; + if (output_idx >= adapter->output_count) + return WINED3DERR_INVALIDCALL; + + *ordinal = adapter->outputs[output_idx].ordinal; + return WINED3D_OK; +} + void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) { D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; @@ -117,13 +135,13 @@ static void wined3d_output_cleanup(const struct wined3d_output *output) D3DKMTCloseAdapter(&close_adapter_desc); } -static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name) +static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name, UINT ordinal) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; D3DKMT_CREATEDEVICE create_device_desc = {{0}}; D3DKMT_CLOSEADAPTER close_adapter_desc; - TRACE("output %p, device_name %s.\n", output, wine_dbgstr_w(device_name)); + TRACE("output %p, device_name %s, ordinal %u.\n", output, wine_dbgstr_w(device_name), ordinal); lstrcpyW(open_adapter_desc.DeviceName, device_name); if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) @@ -137,6 +155,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d return E_FAIL; } + output->ordinal = ordinal; output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -2920,7 +2939,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) wined3d->adapters[0]->outputs = wined3d->outputs; wined3d->adapters[0]->output_count = 1; - if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name))) + if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name, 0))) { WARN("Failed to create output, hr %#x.\n", hr); goto fail; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7e13e19891..dda8390bd2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -27,6 +27,7 @@ @ cdecl wined3d_unregister_windows(ptr) @ cdecl wined3d_adapter_get_output_count(ptr long ptr) +@ cdecl wined3d_adapter_get_output_ordinal(ptr long long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7ace57324..a0b3982cec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2896,6 +2896,8 @@ struct wined3d_adapter_ops /* The output structure, represents a video card output */ struct wined3d_output { + UINT ordinal; + D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f676871b25..3c9e72d210 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2284,6 +2284,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); HRESULT __cdecl wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count); +HRESULT __cdecl wined3d_adapter_get_output_ordinal(const struct wined3d *wined3d, UINT adapter_idx, UINT output_idx, + UINT *ordinal); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.20.1

2 1

[PATCH] include: Update winhttp.h.
by Hans Leidekker 10 Feb '20

10 Feb '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Here is the updated patch. `HTTP_STATUS_PERMANENT_REDIRECT` is present in 10.0.18362.0. v3: Add WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE to WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/winhttp.h | 230 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 227 insertions(+), 3 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index e873e7719e..33fc1f915d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -46,6 +46,8 @@ typedef INTERNET_PORT *LPINTERNET_PORT; typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ICU_ESCAPE 0x80000000 +#define ICU_ESCAPE_AUTHORITY 0x00002000 +#define ICU_REJECT_USERPWD 0x00004000 /* flags for WinHttpOpen */ #define WINHTTP_FLAG_ASYNC 0x10000000 @@ -62,6 +64,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 #define WINHTTP_ACCESS_TYPE_NO_PROXY 1 #define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 +#define WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY 4 #define WINHTTP_NO_PROXY_NAME NULL #define WINHTTP_NO_PROXY_BYPASS NULL @@ -108,6 +111,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_URL 34 #define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36 #define WINHTTP_OPTION_PROXY 38 +#define WINHTTP_OPTION_PROXY_RESULT_ENTRY 39 #define WINHTTP_OPTION_USER_AGENT 41 #define WINHTTP_OPTION_CONTEXT_VALUE 45 #define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47 @@ -141,7 +145,35 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99 #define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100 #define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101 -#define WINHTTP_LAST_OPTION WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS +#define WINHTTP_OPTION_RECEIVE_PROXY_CONNECT_RESPONSE 103 +#define WINHTTP_OPTION_IS_PROXY_CONNECT_RESPONSE 104 +#define WINHTTP_OPTION_SERVER_SPN_USED 106 +#define WINHTTP_OPTION_PROXY_SPN_USED 107 +#define WINHTTP_OPTION_SERVER_CBT 108 +#define WINHTTP_OPTION_UNSAFE_HEADER_PARSING 110 +#define WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS 111 +#define WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET 114 +#define WINHTTP_OPTION_WEB_SOCKET_CLOSE_TIMEOUT 115 +#define WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL 116 +#define WINHTTP_OPTION_DECOMPRESSION 118 +#define WINHTTP_OPTION_WEB_SOCKET_RECEIVE_BUFFER_SIZE 122 +#define WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE 123 +#define WINHTTP_OPTION_TCP_PRIORITY_HINT 128 +#define WINHTTP_OPTION_CONNECTION_FILTER 131 +#define WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL 133 +#define WINHTTP_OPTION_HTTP_PROTOCOL_USED 134 +#define WINHTTP_OPTION_KDC_PROXY_SETTINGS 136 +#define WINHTTP_OPTION_ENCODE_EXTRA 138 +#define WINHTTP_OPTION_DISABLE_STREAM_QUEUE 139 +#define WINHTTP_OPTION_IPV6_FAST_FALLBACK 140 +#define WINHTTP_OPTION_CONNECTION_STATS_V0 141 +#define WINHTTP_OPTION_REQUEST_TIMES 142 +#define WINHTTP_OPTION_EXPIRE_CONNECTION 143 +#define WINHTTP_OPTION_DISABLE_SECURE_PROTOCOL_FALLBACK 144 +#define WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED 145 +#define WINHTTP_OPTION_REQUEST_STATS 146 +#define WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT 147 +#define WINHTTP_LAST_OPTION WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT #define WINHTTP_OPTION_USERNAME 0x1000 #define WINHTTP_OPTION_PASSWORD 0x1001 #define WINHTTP_OPTION_PROXY_USERNAME 0x1002 @@ -149,6 +181,14 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CONNS_PER_SERVER_UNLIMITED 0xFFFFFFFF +#define WINHTTP_DECOMPRESSION_FLAG_GZIP 0x00000001 +#define WINHTTP_DECOMPRESSION_FLAG_DEFLATE 0x00000002 + +#define WINHTTP_DECOMPRESSION_FLAG_ALL ( WINHTTP_DECOMPRESSION_FLAG_GZIP | WINHTTP_DECOMPRESSION_FLAG_DEFLATE ) + +#define WINHTTP_PROTOCOL_FLAG_HTTP2 0x1 +#define WINHTTP_PROTOCOL_MASK WINHTTP_PROTOCOL_FLAG_HTTP2 + #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM 0 #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW 1 #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH 2 @@ -223,6 +263,8 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_SECURE_CERT_REVOKED (WINHTTP_ERROR_BASE + 170) #define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) #define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) +#define ERROR_WINHTTP_UNHANDLED_SCRIPT_TYPE (WINHTTP_ERROR_BASE + 176) +#define ERROR_WINHTTP_SCRIPT_EXECUTION_ERROR (WINHTTP_ERROR_BASE + 177) #define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) #define ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE (WINHTTP_ERROR_BASE + 179) #define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) @@ -232,7 +274,20 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW (WINHTTP_ERROR_BASE + 184) #define ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY (WINHTTP_ERROR_BASE + 185) #define ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY (WINHTTP_ERROR_BASE + 186) -#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 186) +#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED_PROXY (WINHTTP_ERROR_BASE + 187) +#define ERROR_WINHTTP_SECURE_FAILURE_PROXY (WINHTTP_ERROR_BASE + 188) +#define ERROR_WINHTTP_RESERVED_189 (WINHTTP_ERROR_BASE + 189) +#define ERROR_WINHTTP_HTTP_PROTOCOL_MISMATCH (WINHTTP_ERROR_BASE + 190) +#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 188) + +#define WINHTTP_RESET_STATE 0x00000001 +#define WINHTTP_RESET_SWPAD_CURRENT_NETWORK 0x00000002 +#define WINHTTP_RESET_SWPAD_ALL 0x00000004 +#define WINHTTP_RESET_SCRIPT_CACHE 0x00000008 +#define WINHTTP_RESET_ALL 0x0000FFFF +#define WINHTTP_RESET_NOTIFY_NETWORK_CHANGED 0x00010000 +#define WINHTTP_RESET_OUT_OF_PROC 0x00020000 +#define WINHTTP_RESET_DISCARD_RESOLVERS 0x00040000 /* WinHttp status codes */ #define HTTP_STATUS_CONTINUE 100 @@ -252,6 +307,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define HTTP_STATUS_NOT_MODIFIED 304 #define HTTP_STATUS_USE_PROXY 305 #define HTTP_STATUS_REDIRECT_KEEP_VERB 307 +#define HTTP_STATUS_PERMANENT_REDIRECT 308 #define HTTP_STATUS_BAD_REQUEST 400 #define HTTP_STATUS_DENIED 401 #define HTTP_STATUS_PAYMENT_REQ 402 @@ -375,6 +431,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_QUERY_FLAG_REQUEST_HEADERS 0x80000000 #define WINHTTP_QUERY_FLAG_SYSTEMTIME 0x40000000 #define WINHTTP_QUERY_FLAG_NUMBER 0x20000000 +#define WINHTTP_QUERY_FLAG_NUMBER64 0x08000000 /* Callback options */ #define WINHTTP_CALLBACK_STATUS_RESOLVING_NAME 0x00000001 @@ -399,6 +456,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE 0x00100000 #define WINHTTP_CALLBACK_STATUS_REQUEST_ERROR 0x00200000 #define WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE 0x00400000 +#define WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE 0x01000000 +#define WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE 0x02000000 +#define WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE 0x04000000 +#define WINHTTP_CALLBACK_STATUS_SETTINGS_WRITE_COMPLETE 0x10000000 +#define WINHTTP_CALLBACK_STATUS_SETTINGS_READ_COMPLETE 0x20000000 #define WINHTTP_CALLBACK_FLAG_RESOLVE_NAME (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) #define WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) #define WINHTTP_CALLBACK_FLAG_SEND_REQUEST (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) @@ -415,9 +477,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_FLAG_READ_COMPLETE WINHTTP_CALLBACK_STATUS_READ_COMPLETE #define WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE #define WINHTTP_CALLBACK_FLAG_REQUEST_ERROR WINHTTP_CALLBACK_STATUS_REQUEST_ERROR +#define WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE #define WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ - | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) + | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR \ + | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE) #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff #define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) @@ -426,6 +490,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define API_READ_DATA (3) #define API_WRITE_DATA (4) #define API_SEND_REQUEST (5) +#define API_GET_PROXY_FOR_URL (6) #define WINHTTP_HANDLE_TYPE_SESSION 1 #define WINHTTP_HANDLE_TYPE_CONNECT 2 @@ -445,6 +510,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200 #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3 0x00002000 #define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 |\ WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 |\ WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) @@ -517,14 +583,24 @@ typedef struct } WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); +typedef WINHTTP_STATUS_CALLBACK * LPWINHTTP_STATUS_CALLBACK; #define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 #define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 #define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001 #define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002 +#define WINHTTP_AUTOPROXY_HOST_KEEPCASE 0x00000004 +#define WINHTTP_AUTOPROXY_HOST_LOWERCASE 0x00000008 +#define WINHTTP_AUTOPROXY_ALLOW_AUTOCONFIG 0x00000100 +#define WINHTTP_AUTOPROXY_ALLOW_STATIC 0x00000200 +#define WINHTTP_AUTOPROXY_ALLOW_CM 0x00000400 #define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000 #define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000 +#define WINHTTP_AUTOPROXY_NO_DIRECTACCESS 0x00040000 +#define WINHTTP_AUTOPROXY_NO_CACHE_CLIENT 0x00080000 +#define WINHTTP_AUTOPROXY_NO_CACHE_SVC 0x00100000 +#define WINHTTP_AUTOPROXY_SORT_RESULTS 0x00400000 typedef struct { @@ -536,6 +612,56 @@ typedef struct BOOL fAutoLogonIfChallenged; } WINHTTP_AUTOPROXY_OPTIONS; +typedef struct _WINHTTP_PROXY_RESULT_ENTRY +{ + BOOL fProxy; + BOOL fBypass; + INTERNET_SCHEME ProxyScheme; + PWSTR pwszProxy; + INTERNET_PORT ProxyPort; +} WINHTTP_PROXY_RESULT_ENTRY; + +typedef struct _WINHTTP_PROXY_RESULT +{ + DWORD cEntries; + WINHTTP_PROXY_RESULT_ENTRY *pEntries; +} WINHTTP_PROXY_RESULT; + +typedef struct _WINHTTP_PROXY_RESULT_EX +{ + DWORD cEntries; + WINHTTP_PROXY_RESULT_ENTRY *pEntries; + HANDLE hProxyDetectionHandle; + DWORD dwProxyInterfaceAffinity; +} WINHTTP_PROXY_RESULT_EX; + +#define NETWORKING_KEY_BUFSIZE 128 + +typedef struct _WinHttpProxyNetworkKey +{ + unsigned char pbBuffer[NETWORKING_KEY_BUFSIZE]; +} WINHTTP_PROXY_NETWORKING_KEY, *PWINHTTP_PROXY_NETWORKING_KEY; + +typedef struct _WINHTTP_PROXY_SETTINGS +{ + DWORD dwStructSize; + DWORD dwFlags; + DWORD dwCurrentSettingsVersion; + PWSTR pwszConnectionName; + PWSTR pwszProxy; + PWSTR pwszProxyBypass; + PWSTR pwszAutoconfigUrl; + PWSTR pwszAutoconfigSecondaryUrl; + DWORD dwAutoDiscoveryFlags; + PWSTR pwszLastKnownGoodAutoConfigUrl; + DWORD dwAutoconfigReloadDelayMins; + FILETIME ftLastKnownDetectTime; + DWORD dwDetectedInterfaceIpCount; + PDWORD pdwDetectedInterfaceIp; + DWORD cNetworkKeys; + PWINHTTP_PROXY_NETWORKING_KEY pNetworkKeys; +} WINHTTP_PROXY_SETTINGS, *PWINHTTP_PROXY_SETTINGS; + typedef struct { DWORD dwMajorVersion; @@ -551,6 +677,91 @@ typedef struct } WINHTTP_CONNECTION_INFO; #endif +typedef enum _WINHTTP_REQUEST_TIME_ENTRY +{ + WinHttpProxyDetectionStart = 0, + WinHttpProxyDetectionEnd, + WinHttpConnectionAcquireStart, + WinHttpConnectionAcquireWaitEnd, + WinHttpConnectionAcquireEnd, + WinHttpNameResolutionStart, + WinHttpNameResolutionEnd, + WinHttpConnectionEstablishmentStart, + WinHttpConnectionEstablishmentEnd, + WinHttpTlsHandshakeClientLeg1Start, + WinHttpTlsHandshakeClientLeg1End, + WinHttpTlsHandshakeClientLeg2Start, + WinHttpTlsHandshakeClientLeg2End, + WinHttpTlsHandshakeClientLeg3Start, + WinHttpTlsHandshakeClientLeg3End, + WinHttpStreamWaitStart, + WinHttpStreamWaitEnd, + WinHttpSendRequestStart, + WinHttpSendRequestHeadersCompressionStart, + WinHttpSendRequestHeadersCompressionEnd, + WinHttpSendRequestHeadersEnd, + WinHttpSendRequestEnd, + WinHttpReceiveResponseStart, + WinHttpReceiveResponseHeadersDecompressionStart, + WinHttpReceiveResponseHeadersDecompressionEnd, + WinHttpReceiveResponseHeadersEnd, + WinHttpReceiveResponseBodyDecompressionDelta, + WinHttpReceiveResponseEnd, + WinHttpProxyTunnelStart, + WinHttpProxyTunnelEnd, + WinHttpProxyTlsHandshakeClientLeg1Start, + WinHttpProxyTlsHandshakeClientLeg1End, + WinHttpProxyTlsHandshakeClientLeg2Start, + WinHttpProxyTlsHandshakeClientLeg2End, + WinHttpProxyTlsHandshakeClientLeg3Start, + WinHttpProxyTlsHandshakeClientLeg3End, + WinHttpRequestTimeLast, + WinHttpRequestTimeMax = 64 +} WINHTTP_REQUEST_TIME_ENTRY; + +typedef struct _WINHTTP_REQUEST_TIMES +{ + ULONG cTimes; + ULONGLONG rgullTimes[WinHttpRequestTimeMax]; +} WINHTTP_REQUEST_TIMES, *PWINHTTP_REQUEST_TIMES; + +typedef enum _WINHTTP_REQUEST_STAT_ENTRY +{ + WinHttpConnectFailureCount = 0, + WinHttpProxyFailureCount, + WinHttpTlsHandshakeClientLeg1Size, + WinHttpTlsHandshakeServerLeg1Size, + WinHttpTlsHandshakeClientLeg2Size, + WinHttpTlsHandshakeServerLeg2Size, + WinHttpRequestHeadersSize, + WinHttpRequestHeadersCompressedSize, + WinHttpResponseHeadersSize, + WinHttpResponseHeadersCompressedSize, + WinHttpResponseBodySize, + WinHttpResponseBodyCompressedSize, + WinHttpProxyTlsHandshakeClientLeg1Size, + WinHttpProxyTlsHandshakeServerLeg1Size, + WinHttpProxyTlsHandshakeClientLeg2Size, + WinHttpProxyTlsHandshakeServerLeg2Size, + WinHttpRequestStatLast, + WinHttpRequestStatMax = 32 +} WINHTTP_REQUEST_STAT_ENTRY; + +#define WINHTTP_REQUEST_STAT_FLAG_TCP_FAST_OPEN 0x00000001 +#define WINHTTP_REQUEST_STAT_FLAG_TLS_SESSION_RESUMPTION 0x00000002 +#define WINHTTP_REQUEST_STAT_FLAG_TLS_FALSE_START 0x00000004 +#define WINHTTP_REQUEST_STAT_FLAG_PROXY_TLS_SESSION_RESUMPTION 0x00000008 +#define WINHTTP_REQUEST_STAT_FLAG_PROXY_TLS_FALSE_START 0x00000010 +#define WINHTTP_REQUEST_STAT_FLAG_FIRST_REQUEST 0x00000020 + +typedef struct _WINHTTP_REQUEST_STATS +{ + ULONGLONG ullFlags; + ULONG ulIndex; + ULONG cStats; + ULONGLONG rgullStats[WinHttpRequestStatMax]; +} WINHTTP_REQUEST_STATS, *PWINHTTP_REQUEST_STATS; + #ifdef __cplusplus extern "C" { #endif @@ -561,10 +772,20 @@ BOOL WINAPI WinHttpCheckPlatform(void); BOOL WINAPI WinHttpCloseHandle(HINTERNET); HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); +VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); +VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); +DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); +DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); +DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); +DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); +DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); @@ -573,7 +794,9 @@ BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); @@ -583,6 +806,7 @@ BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); #ifdef __cplusplus } -- 2.20.1

1 0

[PATCH 3/3] comctl32/tests: Add more tests for Static/SS_BITMAP control.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/static.c | 58 +++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0b990d6b39..4efb768579 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -134,7 +134,20 @@ static void test_set_text(void) DestroyWindow(hStatic); } -static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) +static void remove_alpha(HBITMAP hbitmap) +{ + BITMAP bm; + BYTE *ptr; + int i; + + GetObjectW(hbitmap, sizeof(bm), &bm); + ok(bm.bmBits != NULL, "bmBits is NULL\n"); + + for (i = 0, ptr = bm.bmBits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + ptr[3] = 0; +} + +static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alpha) { BITMAP bm; HDC hdc; @@ -153,9 +166,12 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); - else + else if (is_alpha) ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); } else ok(bm.bmBits == NULL, "bmBits is not NULL\n"); @@ -180,9 +196,12 @@ todo_wine todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); - else + else if (is_alpha) ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); } static void test_set_image(void) @@ -193,7 +212,7 @@ static void test_set_image(void) image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, 0); ok(image != NULL, "LoadImage failed\n"); - test_image(image, FALSE, FALSE); + test_image(image, FALSE, FALSE, TRUE); bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 == NULL, "got not NULL\n"); @@ -204,17 +223,42 @@ static void test_set_image(void) bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 != NULL, "got NULL\n"); ok(bmp1 != image, "bmp == image\n"); - test_image(bmp1, TRUE, TRUE); + test_image(bmp1, TRUE, TRUE, TRUE); bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); ok(bmp2 != NULL, "got NULL\n"); ok(bmp2 != image, "bmp == image\n"); ok(bmp1 == bmp2, "bmp1 != bmp2\n"); - test_image(bmp2, TRUE, TRUE); + test_image(bmp2, TRUE, TRUE, TRUE); + + DeleteObject(image); + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image, TRUE, FALSE, TRUE); + remove_alpha(image); + test_image(image, TRUE, FALSE, FALSE); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 != NULL, "got NULL\n"); + ok(bmp1 != image, "bmp == image\n"); + test_image(bmp1, TRUE, TRUE, TRUE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); + ok(bmp2 != image, "bmp == image\n"); + ok(bmp1 == bmp2, "bmp1 != bmp2\n"); + test_image(bmp1, TRUE, TRUE, FALSE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); + ok(bmp2 == image, "bmp1 != image\n"); + test_image(bmp2, TRUE, FALSE, FALSE); DestroyWindow(hwnd); - test_image(bmp2, TRUE, TRUE); + test_image(image, TRUE, FALSE, FALSE); DeleteObject(image); } -- 2.20.1

1 0

[PATCH 2/3] comctl32: Create an internal copy for 32-bpp bitmaps with an alpha channel for Static control.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 79 ++++++++++++++++++++++++++++++++++-- dlls/comctl32/tests/static.c | 7 +--- 2 files changed, 77 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d08710c06f..b3254e5761 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -60,6 +60,7 @@ struct static_extra_info HBITMAP hbitmap; HENHMETAFILE hemf; } image; + BOOL image_has_alpha; }; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -163,6 +164,52 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) return prevIcon; } +static HBITMAP create_alpha_bitmap( HBITMAP hbitmap ) +{ + BITMAP bm; + HBITMAP alpha; + BITMAPINFO info; + HDC hdc; + void *bits; + DWORD i; + BYTE *ptr; + BOOL has_alpha = FALSE; + + GetObjectW( hbitmap, sizeof(bm), &bm ); + if (bm.bmBitsPixel != 32) return 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = -bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + if ((alpha = CreateDIBSection( hdc, &info, DIB_RGB_COLORS, &bits, NULL, 0 ))) + { + GetDIBits( hdc, hbitmap, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS ); + + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + if ((has_alpha = (ptr[3] != 0))) break; + + if (!has_alpha) + { + DeleteObject( alpha ); + alpha = 0; + } + } + + DeleteDC( hdc ); + + return alpha; +} + /*********************************************************************** * STATIC_SetBitmap * @@ -170,7 +217,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) */ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { - HBITMAP hOldBitmap; + HBITMAP hOldBitmap, alpha; struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; @@ -185,10 +232,23 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) hOldBitmap = extra->image.hbitmap; extra->image.hbitmap = hBitmap; + extra->image_has_alpha = FALSE; + + if (hBitmap) + { + alpha = create_alpha_bitmap( hBitmap ); + if (alpha) + { + extra->image.hbitmap = alpha; + extra->image_has_alpha = TRUE; + } + } + if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); + /* Windows currently doesn't implement SS_RIGHTJUST */ /* if ((style & SS_RIGHTJUST) != 0) @@ -386,7 +446,12 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, if (style == SS_ICON) { struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); - heap_free( extra ); + if (extra) + { + if (extra->image_has_alpha) + DeleteObject( extra->image.hbitmap ); + heap_free( extra ); + } /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -765,6 +830,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) BITMAP bm; RECT rcClient; LOGBRUSH brush; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); @@ -785,7 +852,13 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) rcClient.right = rcClient.left + bm.bmWidth; rcClient.bottom = rcClient.top + bm.bmHeight; } - StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + + if (extra->image_has_alpha) + GdiAlphaBlend(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, blend); + else + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0e44c4ed7a..0b990d6b39 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -147,18 +147,15 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); if (is_dib) { -todo_wine ok(bm.bmBits != NULL, "bmBits is NULL\n"); -if (bm.bmBits) -{ memcpy(bits, bm.bmBits, 4); if (is_premult) +todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); -} } else ok(bm.bmBits == NULL, "bmBits is not NULL\n"); @@ -206,13 +203,11 @@ static void test_set_image(void) bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 != NULL, "got NULL\n"); -todo_wine ok(bmp1 != image, "bmp == image\n"); test_image(bmp1, TRUE, TRUE); bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); ok(bmp2 != NULL, "got NULL\n"); -todo_wine ok(bmp2 != image, "bmp == image\n"); ok(bmp1 == bmp2, "bmp1 != bmp2\n"); test_image(bmp2, TRUE, TRUE); -- 2.20.1

1 0

[PATCH 1/3] comctl32: Switch to using a structure for extra storage.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

These patches aim to fix the bug 47018. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 92 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 5cc02ced97..d08710c06f 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -36,6 +36,7 @@ #include "winuser.h" #include "commctrl.h" +#include "wine/heap.h" #include "wine/debug.h" #include "comctl32.h" @@ -50,10 +51,16 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -/* offsets for GetWindowLong for static private information */ -#define HFONT_GWL_OFFSET 0 -#define HICON_GWL_OFFSET (sizeof(HFONT)) -#define STATIC_EXTRA_BYTES (HICON_GWL_OFFSET + sizeof(HICON)) +struct static_extra_info +{ + HFONT hfont; + union + { + HICON hicon; + HBITMAP hbitmap; + HENHMETAFILE hemf; + } image; +}; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -80,6 +87,18 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; +static struct static_extra_info *get_extra_ptr( HWND hwnd, BOOL force ) +{ + struct static_extra_info *extra = (struct static_extra_info *)GetWindowLongPtrW( hwnd, 0 ); + if (!extra && force) + { + extra = heap_alloc_zero( sizeof(*extra) ); + if (extra) + SetWindowLongPtrW( hwnd, 0, (ULONG_PTR)extra ); + } + return extra; +} + static BOOL get_icon_size( HICON handle, SIZE *size ) { ICONINFO info; @@ -111,6 +130,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { HICON prevIcon; SIZE size; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) @@ -118,7 +138,12 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) WARN("hicon != 0, but invalid\n"); return 0; } - prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + prevIcon = extra->image.hicon; + extra->image.hicon = hicon; if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { /* Windows currently doesn't implement SS_RIGHTJUST */ @@ -146,6 +171,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { HBITMAP hOldBitmap; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) @@ -153,7 +179,12 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; } - hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + hOldBitmap = extra->image.hbitmap; + extra->image.hbitmap = hBitmap; if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; @@ -183,13 +214,23 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) */ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) { + HENHMETAFILE old_hemf; + struct static_extra_info *extra; + if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); return 0; } - return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + old_hemf = extra->image.hemf; + extra->image.hemf = hEnhMetaFile; + + return old_hemf; } /*********************************************************************** @@ -200,6 +241,8 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, */ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) { + struct static_extra_info *extra; + switch (style & SS_TYPEMASK) { case SS_ICON: @@ -215,7 +258,22 @@ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) default: return NULL; } - return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + + extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->image.hbitmap : 0; +} + +static void STATIC_SetFont( HWND hwnd, HFONT hfont ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, TRUE ); + if (extra) + extra->hfont = hfont; +} + +static HFONT STATIC_GetFont( HWND hwnd ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->hfont : 0; } /*********************************************************************** @@ -327,6 +385,8 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_NCDESTROY: if (style == SS_ICON) { + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + heap_free( extra ); /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -423,14 +483,14 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_SETFONT: if (hasTextStyle( full_style )) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); + STATIC_SetFont( hwnd, (HFONT)wParam ); if (LOWORD(lParam)) RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; case WM_GETFONT: - return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (LRESULT)STATIC_GetFont( hwnd ); case WM_NCHITTEST: if (full_style & SS_NOTIFY) @@ -508,7 +568,7 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); @@ -572,7 +632,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) format |= DT_SINGLELINE | DT_WORD_ELLIPSIS; } - if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) + if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned @@ -668,7 +728,7 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { FillRect(hdc, &rc, hbrush); @@ -698,7 +758,7 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) && (hMemDC = CreateCompatibleDC( hdc ))) { @@ -742,7 +802,7 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rc); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); - if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { /* The control's current font is not selected into the device context! */ @@ -779,7 +839,7 @@ void STATIC_Register(void) wndClass.style = CS_DBLCLKS | CS_PARENTDC | CS_GLOBALCLASS; wndClass.lpfnWndProc = STATIC_WindowProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = STATIC_EXTRA_BYTES; + wndClass.cbWndExtra = sizeof(struct static_extra_info *); wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = NULL; wndClass.lpszClassName = WC_STATICW; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Introduce wined3d_adapter_get_output_count().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 4 +++- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..477f19f3f4 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,11 +124,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + UINT output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); - if (output_idx > 0) + hr = wined3d_adapter_get_output_count(adapter->factory->wined3d, adapter->ordinal, &output_count); + if (FAILED(hr) || output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e6abd139d0..10bbfa4c54 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -899,6 +899,18 @@ UINT CDECL wined3d_get_output_count(const struct wined3d *wined3d) return wined3d->output_count; } +HRESULT CDECL wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count) +{ + TRACE("wined3d %p, adapter_idx %u, count %p.\n", wined3d, adapter_idx, count); + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + *count = wined3d->adapters[adapter_idx]->output_count; + TRACE("reporting %u outputs for adapter %u.\n", *count, adapter_idx); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2cd66ec215..7e13e19891 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr long ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 925d4111d9..f676871b25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2283,6 +2283,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +HRESULT __cdecl wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -- 2.20.1

1 0

[PATCH 2/5] wined3d: Introduce wined3d_get_output_count().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

For D3D9 and older, adapters are actually outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12..256fcf4e29 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -98,7 +98,7 @@ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + count = wined3d_get_output_count(d3d8->wined3d); wined3d_mutex_unlock(); return count; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910..9a48b5c7c2 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -113,7 +113,7 @@ static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + ret = wined3d_get_output_count(d3d9->wined3d); wined3d_mutex_unlock(); return ret; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3d676f7e10..e6abd139d0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -892,6 +892,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +UINT CDECL wined3d_get_output_count(const struct wined3d *wined3d) +{ + TRACE("wined3d %p, reporting %u outputs.\n", wined3d, wined3d->output_count); + + return wined3d->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8ef442c72..2cd66ec215 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -18,6 +18,7 @@ @ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) +@ cdecl wined3d_get_output_count(ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec8..925d4111d9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2272,6 +2272,7 @@ HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); +UINT __cdecl wined3d_get_output_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); -- 2.20.1

1 0

[PATCH] iphlpapi/tests: Build rotating buffers into ntoa and ntoa6
by Alex Henrie 10 Feb '20

10 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 42 ++++++++++++++-------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1b0bc9383a..a1fdf2716b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -169,28 +169,25 @@ static void freeIPHlpApi(void) /* replacement for inet_ntoa */ static const char *ntoa( DWORD ip ) { - static char buffer[40]; + static char buffers[4][16]; + static int i = -1; ip = htonl(ip); - sprintf( buffer, "%u.%u.%u.%u", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff ); - return buffer; + i = (i + 1) % ARRAY_SIZE(buffers); + sprintf( buffers[i], "%u.%u.%u.%u", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff ); + return buffers[i]; } static const char *ntoa6( IN6_ADDR *ip ) { - static char buffer[40]; - char *buf = buffer; + static char buffers[4][40]; + static int i = -1; unsigned short *p = ip->u.Word; - unsigned int i = 0; - while (i < 8) - { - if (i > 0) - *buf++ = ':'; - buf += sprintf( buf, "%x", htons(p[i]) ); - i++; - } - return buffer; + i = (i + 1) % ARRAY_SIZE(buffers); + sprintf( buffers[i], "%x:%x:%x:%x:%x:%x:%x:%x", + htons(p[0]), htons(p[1]), htons(p[2]), htons(p[3]), htons(p[4]), htons(p[5]), htons(p[6]), htons(p[7]) ); + return buffers[i]; } /* @@ -382,8 +379,6 @@ static void testGetIpForwardTable(void) trace( "IP forward table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[100]; - if (!U1(buf->table[i]).dwForwardDest) /* Default route */ { todo_wine @@ -403,9 +398,8 @@ todo_wine * value so it is not worth testing in this case. */ } - sprintf( buffer, "dest %s", ntoa( buf->table[i].dwForwardDest )); - sprintf( buffer + strlen(buffer), " mask %s", ntoa( buf->table[i].dwForwardMask )); - trace( "%u: %s gw %s if %u type %u proto %u\n", i, buffer, + trace( "%u: dest %s mask %s gw %s if %u type %u proto %u\n", i, + ntoa( buf->table[i].dwForwardDest ), ntoa( buf->table[i].dwForwardMask ), ntoa( buf->table[i].dwForwardNextHop ), buf->table[i].dwForwardIfIndex, U1(buf->table[i]).dwForwardType, U1(buf->table[i]).dwForwardProto ); } @@ -890,12 +884,10 @@ static void testGetTcpTable(void) trace( "TCP table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[40]; - sprintf( buffer, "local %s:%u", - ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort) ); - trace( "%u: %s remote %s:%u state %u\n", - i, buffer, ntoa( buf->table[i].dwRemoteAddr ), - ntohs(buf->table[i].dwRemotePort), U(buf->table[i]).dwState ); + trace( "%u: local %s:%u remote %s:%u state %u\n", i, + ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort), + ntoa(buf->table[i].dwRemoteAddr), ntohs(buf->table[i].dwRemotePort), + U(buf->table[i]).dwState ); } } HeapFree(GetProcessHeap(), 0, buf); -- 2.25.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel