February 2019 - Wine-Commits

Andrey Gusev : mscoree: Fix condition in CorDebug_Release().
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 1e4c1730fb7a2bcb469815f7a756eb1fdf58b7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e4c1730fb7a2bcb469815f7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 19:16:06 2019 +0200 mscoree: Fix condition in CorDebug_Release(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/cordebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 22424c6..15e7fad 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -581,7 +581,7 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) if(This->runtimehost) ICLRRuntimeHost_Release(This->runtimehost); - if(This->pCallback) + if(This->pCallback2) ICorDebugManagedCallback2_Release(This->pCallback2); if(This->pCallback)

1 0

Alexandre Julliard : dinput: Add error check to silence a compiler warning.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 6925fb0bb6e9dfdc641295908cc6ed68f69f2e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6925fb0bb6e9dfdc64129590… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 19:38:36 2019 +0100 dinput: Add error check to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 885f1f4..db5878b 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -298,10 +298,11 @@ static void assign_action(HWND dialog) int obj = lv_get_cur_item(dialog); int old_action = lv_get_item_data(dialog, obj); int used_obj; - - DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + DWORD type; if (old_action == action) return; + if (obj < 0) return; + type = device->ddo[obj].dwType; /* Clear old action */ if (old_action != -1) @@ -320,7 +321,7 @@ static void assign_action(HWND dialog) lv_set_action(dialog, used_obj, -1, lpdiaf); /* Set new action */ - lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].dwObjID = type; lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG;

1 0

Alistair Leslie-Hughes : dsound: IDirectSoundNotify is only available when DSBCAPS_CTRLPOSITIONNOTIFY is specified.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 9a258c5dd7e45fb37e15a6ba69734544318303f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a258c5dd7e45fb37e15a6ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 13 01:56:16 2019 +0000 dsound: IDirectSoundNotify is only available when DSBCAPS_CTRLPOSITIONNOTIFY is specified. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45473 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 9 +++++++-- dlls/dsound/tests/dsound.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5262628..2a328ed 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -923,11 +923,16 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 return S_OK; } - if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if(This->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY) { IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); *ppobj = &This->IDirectSoundNotify_iface; return S_OK; - } + } + + TRACE( "App requested IDirectSoundNotify without DSBCAPS_CTRLPOSITIONNOTIFY flag.\n"); + return E_NOINTERFACE; + } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { if(This->dsbd.dwFlags & DSBCAPS_CTRL3D){ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 89f0aa0..41818de 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1563,6 +1563,19 @@ static void test_notifications(LPGUID lpGuid) ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08x\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + IDirectSoundBuffer_Release(buf); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY; bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ bufdesc.lpwfxFormat = &wfx;

1 0

Józef Kucia : wined3d: Mark dcl_input_ps_{siv, sgv} shader instructions as implemented.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 71ddc97b919b4a008b26605fd2c5aa670c2b4abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ddc97b919b4a008b26605f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 13 11:15:12 2019 +0100 wined3d: Mark dcl_input_ps_{siv, sgv} shader instructions as implemented. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 49bfe39..78eed3e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11415,8 +11415,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS */ shader_glsl_nop, - /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, - /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, + /* WINED3DSIH_DCL_INPUT_PS_SGV */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_PS_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INTERFACE */ NULL,

1 0

Michael Stefaniuc : d3d11/tests: Remove useless casts to self.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: f9eb08b45aac60929ffbe7c556a4b938bb1676cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9eb08b45aac60929ffbe7c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:33 2019 +0100 d3d11/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 27b0775..90488ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2198,7 +2198,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture1D_Release(texture); @@ -2572,7 +2572,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); todo_wine_if(todo) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x (format %#x).\n", @@ -2845,7 +2845,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, (ID3D11Texture3D **)&texture); + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -8536,8 +8536,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D11DeviceContext_UpdateSubresource(context, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); } expected_result.y = expected_result.z = 0.0f; @@ -21344,7 +21344,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); @@ -21380,7 +21380,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr);

1 0

Piotr Caban : kernel32/tests: Add file mapping tests on readonly file.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 43a4401ebd3e7f2184123c4f4980e65fa0b8b7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4401ebd3e7f2184123c4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 13 11:43:12 2019 +0100 kernel32/tests: Add file mapping tests on readonly file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a343fa4..01c698d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3889,7 +3889,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) return addr; } -static void test_mapping( HANDLE hfile, DWORD sec_flags ) +static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) { static const DWORD page_prot[] = { @@ -3940,12 +3940,26 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) MEMORY_BASIC_INFORMATION info, nt_info; BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - trace( "testing %s mapping flags %08x\n", anon_mapping ? "anonymous" : "file", sec_flags ); + trace( "testing %s mapping flags %08x %s\n", anon_mapping ? "anonymous" : "file", + sec_flags, readonly ? "readonly file" : "" ); for (i = 0; i < ARRAY_SIZE(page_prot); i++) { SetLastError(0xdeadbeef); hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); + if (readonly && (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READ + || page_prot[i] == PAGE_EXECUTE_READWRITE || page_prot[i] == PAGE_EXECUTE_WRITECOPY)) + { + todo_wine_if(page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_WRITECOPY) + { + ok(!hmap, "%d: CreateFileMapping(%04x) should fail\n", i, page_prot[i]); + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == ERROR_INVALID_PARAMETER), + "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + if (hmap) CloseHandle(hmap); + continue; + } + if (page_prot[i] == PAGE_NOACCESS) { HANDLE hmap2; @@ -3958,7 +3972,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (sec_flags & SEC_IMAGE) hmap = CreateFileMappingW(hfile, NULL, PAGE_WRITECOPY | sec_flags, 0, si.dwPageSize, NULL); else - hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | sec_flags, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, PAGE_READONLY | sec_flags, 0, si.dwPageSize, NULL); ok(hmap != 0, "CreateFileMapping(PAGE_READWRITE) error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), hmap, GetCurrentProcess(), &hmap2, 0, FALSE, 0); @@ -3968,7 +3982,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) } if (page_prot[i] == PAGE_EXECUTE) { - ok(!hmap, "CreateFileMapping(PAGE_NOACCESS) should fail\n"); + ok(!hmap, "CreateFileMapping(PAGE_EXECUTE) should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); continue; @@ -4101,12 +4115,15 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) continue; } + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); prev_prot = actual_prot; ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(info.Protect == actual_prot, "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); @@ -4161,6 +4178,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) { ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); if (ret) *(DWORD*)base = 0xdeadbeef; ret = VirtualQuery(base, &info, sizeof(info)); @@ -4187,7 +4205,9 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) continue; } + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); ret = VirtualQuery(base, &info, sizeof(info)); @@ -4226,7 +4246,14 @@ static void test_mappings(void) SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); - test_mapping( hfile, SEC_COMMIT ); + test_mapping( hfile, SEC_COMMIT, FALSE ); + + CloseHandle( hfile ); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + + test_mapping( hfile, SEC_COMMIT, TRUE ); CloseHandle( hfile ); DeleteFileA( file_name ); @@ -4238,12 +4265,12 @@ static void test_mappings(void) hfile = CreateFileA( file_name, GENERIC_READ|GENERIC_EXECUTE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - test_mapping( hfile, SEC_IMAGE ); + test_mapping( hfile, SEC_IMAGE, FALSE ); CloseHandle( hfile ); /* now anonymous mappings */ - test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT ); + test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT, FALSE ); } static void test_shared_memory(BOOL is_child)

1 0

Dmitry Timoshkov : wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 7338641e8944403bb39b0cc0b2ad3da3e8e9928b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7338641e8944403bb39b0cc0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 13 11:40:29 2019 +0000 wineps.drv: Add stubs for escapes required by Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97..82cf200 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18..44d790b 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput);

1 0

Jacek Caban : kernel32: Support MUI_LANGUAGE_ID flag in EnumUILanguages.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 5bb421239771d759d3a2ce1e584def62a4abdaee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb421239771d759d3a2ce1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:47:58 2019 +0100 kernel32: Support MUI_LANGUAGE_ID flag in EnumUILanguages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/locale.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9f539dd..eedb0be 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4814,7 +4814,7 @@ BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA pUILangEnumProc, DWORD dwFlags SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if(dwFlags) { + if(dwFlags & ~MUI_LANGUAGE_ID) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4843,7 +4843,7 @@ BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW pUILangEnumProc, DWORD dwFlags SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if(dwFlags) { + if(dwFlags & ~MUI_LANGUAGE_ID) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0c05311..126b08c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3762,6 +3762,14 @@ static void test_EnumUILanguageA(void) SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(luilocale_proc2A, 0, 0); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(enumCount == 1, "enumCount = %u\n", enumCount); + + enumCount = 0; + SetLastError(ERROR_SUCCESS); + ret = pEnumUILanguagesA(luilocale_proc2A, MUI_LANGUAGE_ID, 0); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS), /* winxp */ + "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + if (ret) ok(enumCount == 1, "enumCount = %u\n", enumCount); SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(NULL, 0, 0);

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting ECC public keys.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 5c2ac77ab77772e7d588ccef920a6fe91772d8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c2ac77ab77772e7d588ccef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:16 2019 +0100 bcrypt: Add support for importing and exporting ECC public keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 16 +++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c41c409..0d504b8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -813,6 +813,14 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) + { + *size = key->u.a.pubkey_len; + if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; + + memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; @@ -1012,6 +1020,11 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP switch (alg->id) { + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + break; + case ALG_ID_ECDSA_P256: key_size = 32; magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; @@ -1028,7 +1041,8 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP } if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; - if (ecc_blob->cbKey != key_size) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) + return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7274516..819c1dc 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1659,9 +1659,12 @@ static void test_RSA(void) static void test_ECDH(void) { + BYTE *buf; + BCRYPT_ECCKEY_BLOB *ecckey; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key; NTSTATUS status; + ULONG size; status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDH_P256_ALGORITHM, NULL, 0); if (status) @@ -1678,6 +1681,25 @@ static void test_ECDH(void) status = pBCryptFinalizeKeyPair(key, 0); ok(status == STATUS_SUCCESS, "got %08x\n", status); + size = 0; + SetLastError(0xdeadbeef); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, NULL, 0, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(size, "size not set\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buf, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ecckey = (BCRYPT_ECCKEY_BLOB *)buf; + ok(ecckey->dwMagic == BCRYPT_ECDH_PUBLIC_P256_MAGIC, "got %08x\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %u\n", size); + pBCryptDestroyKey(key); + + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + HeapFree(GetProcessHeap(), 0, buf); + pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); }

1 0

Hans Leidekker : bcrypt: Implement BCryptGenerate/ FinalizeKeyPair for ECDH P256.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 73b695f059740715ebd3ea0ce3ce88477977e628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b695f059740715ebd3ea0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:15 2019 +0100 bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46564 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_internal.h | 7 +- dlls/bcrypt/bcrypt_main.c | 55 +++++++++++++- dlls/bcrypt/gnutls.c | 164 +++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/macos.c | 6 ++ dlls/bcrypt/tests/bcrypt.c | 87 ++++++++++++++-------- dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 12 +++- 8 files changed, 290 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73b695f059740715ebd3…

1 0