wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Zebediah Figura : include: Use ioctl access bits for console driver ioctls.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 947fe11e02f0cb227f571a26625ef4cbddf93030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=947fe11e02f0cb227f571a26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 17:49:13 2020 -0500 include: Use ioctl access bits for console driver ioctls. ioctls can only specify FILE_READ_ACCESS and FILE_WRITE_ACCESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 2e6c5c689f..7bc5e7f15b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,31 +25,31 @@ #include "wincon.h" /* common console input and output ioctls */ -#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console output ioctls */ -#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_DATA) -#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console renderer ioctls */ -#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_ACCESS) /* ioctls used for communication between driver and host */ #define IOCTL_CONDRV_INIT_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 90, METHOD_BUFFERED, 0)

1 0

Zebediah Figura : server: Use GENERIC_READ | GENERIC_WRITE in inherit_console().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: c4ae13e31264616757200cd97700724ffe37e602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ae13e31264616757200cd9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 17:49:12 2020 -0500 server: Use GENERIC_READ | GENERIC_WRITE in inherit_console(). The inherited console must have at least FILE_READ_DATA | FILE_WRITE_DATA. This also matches the access rights in AllocConsole(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 3ea8a0fe53..6a4a0b60d5 100644 --- a/server/console.c +++ b/server/console.c @@ -784,7 +784,7 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, process->console = console; console->num_proc++; return alloc_handle( process, process->console, - SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); + SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); } struct thread *console_get_renderer( struct console_input *console )

1 0

Chao Long : ntdll: Fix a memory leak (Valgrind).
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: d0946955ec21e4da57aaec92459f81f131b27a49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0946955ec21e4da57aaec92… Author: Chao Long <longchao(a)uniontech.com> Date: Wed Sep 9 14:04:39 2020 +0800 ntdll: Fix a memory leak (Valgrind). Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 625cffcca8..7e18544cda 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2265,7 +2265,11 @@ static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loade { parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); /* store the newly found identity for later loading */ - if (ai.arch && !wcscmp(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); + if (ai.arch && !wcscmp(ai.arch, wildcardW)) + { + RtlFreeHeap( GetProcessHeap(), 0, ai.arch ); + ai.arch = strdupW( current_archW ); + } TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf );

1 0

Ziqing Hui : windowscodecs: Correctly set output frame size for WriteSource().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e8a45561c8da94f0d626f30b77ba4b994b70a3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a45561c8da94f0d626f30b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 9 14:14:31 2020 +0800 windowscodecs: Correctly set output frame size for WriteSource(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/main.c | 23 +++++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 94d6640782..7e03112a63 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -125,10 +125,29 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, INT width, INT height, double xres, double yres) { + UINT src_width, src_height; HRESULT hr = S_OK; - if (width == 0 || height == 0) - return WINCODEC_ERR_WRONGSTATE; + if (width == 0 && height == 0) + { + if (prc) + { + if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG; + width = prc->Width; + height = prc->Height; + } + else + { + hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); + if (FAILED(hr)) return hr; + if (src_width == 0 || src_height == 0) return E_INVALIDARG; + width = src_width; + height = src_height; + } + hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height); + if (FAILED(hr)) return hr; + } + if (width == 0 || height == 0) return E_INVALIDARG; if (!format) { diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 852f677482..87f68207c6 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1401,13 +1401,13 @@ static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID } hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); - todo_wine_if(!set_size) { if (rc && (rc->Width <= 0 || rc->Height <= 0)) { /* WriteSource fails but WriteSource_Proxy succeeds. */ ok(hr == E_INVALIDARG, "WriteSource should fail, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); if (!set_size && rc->Width < 0) + todo_wine ok(hr == WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS, "WriteSource_Proxy(%dx%d) got unexpected hr %x (%s)\n", rc->Width, rc->Height, hr, name); else @@ -1423,12 +1423,12 @@ static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID ok(hr == S_OK, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } - } if (SUCCEEDED(hr)) { hr = IWICBitmapFrameEncode_Commit(frameencode); if (!set_size && rc && rc->Height < 0) + todo_wine ok(hr == WINCODEC_ERR_UNEXPECTEDSIZE, "Commit got unexpected hr %x (%s)\n", hr, name); else ok(hr == S_OK, "Commit failed, hr=%x (%s)\n", hr, name);

1 0

Ziqing Hui : windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 0ceb07b75bedcf073e8995efc22cbe38fac4e137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ceb07b75bedcf073e8995ef… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 9 14:14:19 2020 +0800 windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 48 ++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 7936c5e653..852f677482 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1241,9 +1241,9 @@ todo_wine IWICComponentFactory_Release(factory); } -static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, +static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID* clsid_encoder, const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, - const struct setting *settings, const char *name, IWICPalette *palette) + const struct setting *settings, const char *name, IWICPalette *palette, BOOL set_size) { const GUID *container_format = NULL; HRESULT hr; @@ -1385,49 +1385,53 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); - hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); - ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + if (set_size) + { + hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); + ok(hr == S_OK, "SetSize failed, hr=%x\n", hr); + } if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) test_set_frame_palette(frameencode); if (palette) { - WICColor colors[256]; - hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); ok(SUCCEEDED(hr), "SetPalette failed, hr=%x (%s)\n", hr, name); - - /* trash the assigned palette */ - memset(colors, 0, sizeof(colors)); - hr = IWICPalette_InitializeCustom(palette, colors, 256); - ok(hr == S_OK, "InitializeCustom error %#x\n", hr); } hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); + todo_wine_if(!set_size) { if (rc && (rc->Width <= 0 || rc->Height <= 0)) { /* WriteSource fails but WriteSource_Proxy succeeds. */ ok(hr == E_INVALIDARG, "WriteSource should fail, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); - ok(SUCCEEDED(hr), "WriteSource_Proxy failed, %dx%d, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); + if (!set_size && rc->Width < 0) + ok(hr == WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS, + "WriteSource_Proxy(%dx%d) got unexpected hr %x (%s)\n", rc->Width, rc->Height, hr, name); + else + ok(hr == S_OK, "WriteSource_Proxy failed, %dx%d, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); } else { if (rc) ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else - ok(hr == S_OK || - (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) /* XP */ || - (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) /* XP */ || - broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, - "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); + todo_wine_if((IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || + (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2)) + ok(hr == S_OK, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); + + } } if (SUCCEEDED(hr)) { hr = IWICBitmapFrameEncode_Commit(frameencode); - ok(SUCCEEDED(hr), "Commit failed, hr=%x (%s)\n", hr, name); + if (!set_size && rc && rc->Height < 0) + ok(hr == WINCODEC_ERR_UNEXPECTEDSIZE, "Commit got unexpected hr %x (%s)\n", hr, name); + else + ok(hr == S_OK, "Commit failed, hr=%x (%s)\n", hr, name); } IWICBitmapFrameEncode_Release(frameencode); @@ -1602,6 +1606,14 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } +static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, + const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, + const struct setting *settings, const char *name, IWICPalette *palette) +{ + test_multi_encoder_impl(srcs, clsid_encoder, dsts, clsid_decoder, rc, settings, name, palette, TRUE); + test_multi_encoder_impl(srcs, clsid_encoder, dsts, clsid_decoder, rc, settings, name, palette, FALSE); +} + static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, const struct bitmap_data *dst, const CLSID *clsid_decoder, const char *name) {

1 0

Nikolay Sivov : ole32/tests: Fix test crash on recent Windows 10.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: efe4d24feab64d5a550dbb294d9cf09fcf03dfa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe4d24feab64d5a550dbb29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:31 2020 +0300 ole32/tests: Fix test crash on recent Windows 10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index a6811b9d24..891df59c54 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3529,13 +3529,17 @@ static void test_client_security(void) hr = IClassFactory_QueryInterface(pProxy, &IID_IUnknown, (LPVOID*)&pUnknown1); ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); - hr = IClassFactory_QueryInterface(pProxy, &IID_IRemUnknown, (LPVOID*)&pProxy2); - ok_ole_success(hr, "IUnknown_QueryInterface IID_IStream"); + /* Does not work on Windows 10 19xx+ */ + if (SUCCEEDED(IClassFactory_QueryInterface(pProxy, &IID_IRemUnknown, (void **)&pProxy2))) + { + hr = IUnknown_QueryInterface(pProxy2, &IID_IUnknown, (void **)&pUnknown2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IUnknown_QueryInterface(pProxy2, &IID_IUnknown, (LPVOID*)&pUnknown2); - ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); + ok(pUnknown1 == pUnknown2, "both proxy's IUnknowns should be the same - %p, %p\n", pUnknown1, pUnknown2); + IUnknown_Release(pUnknown2); - ok(pUnknown1 == pUnknown2, "both proxy's IUnknowns should be the same - %p, %p\n", pUnknown1, pUnknown2); + IUnknown_Release(pProxy2); + } hr = IClassFactory_QueryInterface(pProxy, &IID_IMarshal, (LPVOID*)&pMarshal); ok_ole_success(hr, "IUnknown_QueryInterface IID_IMarshal"); @@ -3572,9 +3576,7 @@ static void test_client_security(void) CoTaskMemFree(pServerPrincName); IClassFactory_Release(pProxy); - IUnknown_Release(pProxy2); IUnknown_Release(pUnknown1); - IUnknown_Release(pUnknown2); IMarshal_Release(pMarshal); IClientSecurity_Release(pCliSec);

1 0

Nikolay Sivov : ole32/tests: Link to storage API directly.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 0562c64dd241c34b5653260904f407f4763a2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0562c64dd241c34b56532609… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:30 2020 +0300 ole32/tests: Link to storage API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/stg_prop.c | 95 +++++++++++--------------------------------- dlls/ole32/tests/storage32.c | 19 +-------- 2 files changed, 26 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0562c64dd241c34b5653…

1 0

Nikolay Sivov : ole32/tests: Use treat-as-class functions directly.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: a4f27c3c7776dfaf574a72f659ffcdca26aff2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f27c3c7776dfaf574a72f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:29 2020 +0300 ole32/tests: Use treat-as-class functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 98b3ef642b..e627521fa5 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -72,8 +72,6 @@ DEFINE_EXPECT(PostUninitialize); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); -static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); -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); @@ -2190,21 +2188,15 @@ static void test_TreatAsClass(void) HKEY clsidkey, deadbeefkey; LONG lr; - if (!pCoGetTreatAsClass) - { - win_skip("CoGetTreatAsClass not present\n"); - return; - } - - hr = pCoGetTreatAsClass(&deadbeef,&out); + hr = CoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); - hr = pCoGetTreatAsClass(NULL, &out); + hr = CoGetTreatAsClass(NULL, &out); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected no change to the clsid\n"); - hr = pCoGetTreatAsClass(&deadbeef, NULL); + hr = CoGetTreatAsClass(&deadbeef, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); @@ -2217,17 +2209,17 @@ static void test_TreatAsClass(void) return; } - hr = pCoTreatAsClass(&deadbeef, &deadbeef); + hr = CoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); - hr = pCoTreatAsClass(&deadbeef, &CLSID_FileProtocol); + hr = CoTreatAsClass(&deadbeef, &CLSID_FileProtocol); if(hr == REGDB_E_WRITEREGDB){ win_skip("Insufficient privileges to use CoTreatAsClass\n"); goto exit; } ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); - hr = pCoGetTreatAsClass(&deadbeef, &out); + hr = CoGetTreatAsClass(&deadbeef, &out); ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); @@ -2263,10 +2255,10 @@ static void test_TreatAsClass(void) IUnknown_Release(pIP); } - hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); + hr = CoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); - hr = pCoGetTreatAsClass(&deadbeef, &out); + hr = CoGetTreatAsClass(&deadbeef, &out); ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); @@ -3956,8 +3948,6 @@ static void init_funcs(void) pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); - pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); - pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage");

1 0

Nikolay Sivov : combase: Implement CoCreateInstanceFromApp().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 76b50a01a0907e1212ece8e644a356af80598187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b50a01a0907e1212ece8e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:28 2020 +0300 combase: Implement CoCreateInstanceFromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.c | 110 +++++++++++-------- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 1 + dlls/ole32/tests/compobj.c | 122 +++++++++++++++++++++ include/objbase.h | 2 + include/wtypes.idl | 41 ++++--- 8 files changed, 217 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b50a01a0907e1212ec…

1 0

Alexandre Julliard : advapi32: Build with msvcrt.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: c487f21b6b95f1fda2f80920135e8481dc86e4a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c487f21b6b95f1fda2f80920… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 15:37:49 2020 +0200 advapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 ++ dlls/advapi32/advapi.c | 1 - dlls/advapi32/cred.c | 57 ++++++++++++++++++++++---------------------- dlls/advapi32/crypt.c | 46 ++++++++++------------------------- dlls/advapi32/eventlog.c | 1 - dlls/advapi32/lsa.c | 21 ++++++++-------- dlls/advapi32/registry.c | 5 ++-- dlls/advapi32/security.c | 51 +++++++++++++++++++-------------------- dlls/advapi32/service.c | 13 +++++----- dlls/advapi32/wmi.c | 1 - dlls/kernel32/tests/loader.c | 2 +- 11 files changed, 86 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c487f21b6b95f1fda2f8…

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
71
Older →

Jump to page:

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-commits September 2020