March 2018 - Wine-commits - list.winehq.org

Józef Kucia : d3d8: Validate presentation interval.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 93e7878cb41a29530ee49246f7c5332b4a8d93a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e7878cb41a29530ee49246… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:49 2018 +0100 d3d8: Validate presentation interval. 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/d3d8/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5624d76..17e02a3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -304,6 +304,20 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); return FALSE; } + switch (present_parameters->FullScreen_PresentationInterval) + { + case D3DPRESENT_INTERVAL_DEFAULT: + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + case D3DPRESENT_INTERVAL_IMMEDIATE: + break; + default: + WARN("Invalid presentation interval %#x.\n", + present_parameters->FullScreen_PresentationInterval); + return FALSE; + } swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;

1 0

Józef Kucia : d3d9: Validate presentation interval.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 9d62b50cafc845dfa06b911ac745b8569a3ba46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d62b50cafc845dfa06b911a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:50 2018 +0100 d3d9: Validate presentation interval. 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/d3d9/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 28c96c4..8c74494 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -331,6 +331,19 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); return FALSE; } + switch (present_parameters->PresentationInterval) + { + case D3DPRESENT_INTERVAL_DEFAULT: + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + case D3DPRESENT_INTERVAL_IMMEDIATE: + break; + default: + WARN("Invalid presentation interval %#x.\n", present_parameters->PresentationInterval); + return FALSE; + } swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;

1 0

Józef Kucia : d3d8/tests: Add test for presentation intervals.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 643d2b06d709789312fb9bad1300da71d9dbfcbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=643d2b06d709789312fb9bad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:51 2018 +0100 d3d8/tests: Add test for presentation intervals. 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/d3d8/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6ae1782..851de3f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7865,11 +7865,12 @@ static void test_resource_priority(void) static void test_swapchain_parameters(void) { + IDirect3DSurface8 *backbuffer; IDirect3DDevice8 *device; + HRESULT hr, expected_hr; IDirect3D8 *d3d; - IDirect3DSurface8 *backbuffer; + D3DCAPS8 caps; HWND window; - HRESULT hr; unsigned int i, j; D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}; static const struct @@ -7933,6 +7934,8 @@ static void test_swapchain_parameters(void) DestroyWindow(window); return; } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); IDirect3DDevice8_Release(device); present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; @@ -8012,6 +8015,42 @@ static void test_swapchain_parameters(void) IDirect3DDevice8_Release(device); } + for (i = 0; i < 10; ++i) + { + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = FALSE; + present_parameters.BackBufferCount = 2; + + present_parameters.FullScreen_PresentationInterval = i; + switch (present_parameters.FullScreen_PresentationInterval) + { + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + if (!(caps.PresentationIntervals & present_parameters.FullScreen_PresentationInterval)) + continue; + /* Fall through */ + case D3DPRESENT_INTERVAL_DEFAULT: + expected_hr = D3D_OK; + break; + default: + expected_hr = D3DERR_INVALIDCALL; + break; + } + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + if (SUCCEEDED(hr)) + IDirect3DDevice8_Release(device); + } + IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Józef Kucia : d3d9/tests: Add test for presentation intervals.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 6429187307ffc9834e69616650f6c31d80f86e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6429187307ffc9834e696166… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:52 2018 +0100 d3d9/tests: Add test for presentation intervals. 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/d3d9/tests/device.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9fa6a7e..547e0d0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11424,9 +11424,10 @@ static void test_resource_priority(void) static void test_swapchain_parameters(void) { IDirect3DDevice9 *device; + HRESULT hr, expected_hr; IDirect3D9 *d3d; + D3DCAPS9 caps; HWND window; - HRESULT hr; unsigned int i; D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}, present_parameters2; IDirect3DSwapChain9 *swapchain; @@ -11490,6 +11491,9 @@ static void test_swapchain_parameters(void) DestroyWindow(window); return; } + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); IDirect3DDevice9_Release(device); present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; @@ -11560,6 +11564,54 @@ static void test_swapchain_parameters(void) IDirect3DDevice9_Release(device); } + for (i = 0; i < 10; ++i) + { + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = FALSE; + present_parameters.BackBufferCount = 2; + + present_parameters.PresentationInterval = i; + switch (present_parameters.PresentationInterval) + { + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + if (!(caps.PresentationIntervals & present_parameters.PresentationInterval)) + continue; + /* Fall through */ + case D3DPRESENT_INTERVAL_DEFAULT: + expected_hr = D3D_OK; + break; + default: + expected_hr = D3DERR_INVALIDCALL; + break; + } + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + if (FAILED(hr)) + continue; + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x, test %u.\n", hr, i); + + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); + ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x, test %u.\n", hr, i); + ok(present_parameters2.PresentationInterval == i, + "Got presentation interval %#x, expected %#x.\n", + present_parameters2.PresentationInterval, i); + + IDirect3DSwapChain9_Release(swapchain); + IDirect3DDevice9_Release(device); + } + IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Nikolay Sivov : wincodecs/tests: Move gif decoder test to appropriate file.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: e21b74c2efff9654409824d27b6008db2975c568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e21b74c2efff9654409824d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 12 17:57:50 2018 +0300 wincodecs/tests: Move gif decoder test to appropriate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bmpformat.c | 75 ------------------------------------ dlls/windowscodecs/tests/gifformat.c | 75 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 48985b9..8bac7a3 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1058,80 +1058,6 @@ static void test_createfromstream(void) IWICImagingFactory_Release(factory); } -/* 1x1 pixel gif, missing trailer */ -static unsigned char gifimage_notrailer[] = { -0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x71,0xff,0xff,0xff, -0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, -0x01,0x00 -}; - -static void test_gif_notrailer(void) -{ - IWICBitmapDecoder *decoder; - IWICImagingFactory *factory; - HRESULT hr; - IWICStream *gifstream; - IWICBitmapFrameDecode *framedecode; - double dpiX = 0.0, dpiY = 0.0; - UINT framecount; - - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - - hr = IWICImagingFactory_CreateStream(factory, &gifstream); - ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, - sizeof(gifimage_notrailer)); - ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)&decoder); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - } - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, - WICDecodeMetadataCacheOnDemand); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); - ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); - ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); - ok(dpiX == 48.0, "expected dpiX=48.0, got %f\n", dpiX); - ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); - - IWICBitmapFrameDecode_Release(framedecode); - } - } - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); - ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); - ok(framecount == 1, "framecount=%u\n", framecount); - } - - IWICBitmapDecoder_Release(decoder); - } - - IWICStream_Release(gifstream); - } - - IWICImagingFactory_Release(factory); -} - static void test_create_decoder(void) { IWICBitmapDecoder *decoder; @@ -1170,7 +1096,6 @@ START_TEST(bmpformat) test_decode_rle4(); test_componentinfo(); test_createfromstream(); - test_gif_notrailer(); test_create_decoder(); CoUninitialize(); diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 53b4e47..05affad 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -490,6 +490,80 @@ static void test_truncated_gif(void) IStream_Release(stream); } +/* 1x1 pixel gif, missing trailer */ +static unsigned char gifimage_notrailer[] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x71,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00 +}; + +static void test_gif_notrailer(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *gifstream; + IWICBitmapFrameDecode *framedecode; + double dpiX = 0.0, dpiY = 0.0; + UINT framecount; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &gifstream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, + sizeof(gifimage_notrailer)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(dpiX == 48.0, "expected dpiX=48.0, got %f\n", dpiX); + ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + + IWICBitmapFrameDecode_Release(framedecode); + } + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); + ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok(framecount == 1, "framecount=%u\n", framecount); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(gifstream); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(gifformat) { HRESULT hr; @@ -504,6 +578,7 @@ START_TEST(gifformat) test_global_gif_palette_2frames(); test_local_gif_palette(); test_gif_frame_sizes(); + test_gif_notrailer(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Piotr Caban : concrt140: Add _Runtime_object exports.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 2a70d840fec35d31a201092a6185e16f9c30f534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a70d840fec35d31a201092a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 09:31:39 2018 -0600 concrt140: Add _Runtime_object exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index c8483d6..f0a2cd1 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -30,10 +30,10 @@ @ stub -arch=win64 ??0_ReentrantLock(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_ReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_ReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_ReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_ReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z -@ stub -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z -@ stub -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ +@ thiscall -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z(ptr long) msvcp120.??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z +@ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z(ptr long) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z +@ thiscall -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z @ stub -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z

1 0

Andrey Gusev : ext-ms-win-ntuser-draw-l1-1-0: Add dll.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 99a18a893fe067d505396296079132d304deef1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a18a893fe067d505396296… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:35:50 2018 +0200 ext-ms-win-ntuser-draw-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-draw-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index e6e1d68..345c602 100755 --- a/configure +++ b/configure @@ -1248,6 +1248,7 @@ enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 +enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 @@ -18600,6 +18601,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_dr wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index e16cc3a..55e8e45 100644 --- a/configure.ac +++ b/configure.ac @@ -3245,6 +3245,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..2685115 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec b/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec new file mode 100644 index 0000000..d21195b --- /dev/null +++ b/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec @@ -0,0 +1,15 @@ +@ stdcall BeginPaint(long ptr) user32.BeginPaint +@ stdcall DrawFocusRect(long ptr) user32.DrawFocusRect +@ stdcall EndPaint(long ptr) user32.EndPaint +@ stdcall GetUpdateRect(long ptr long) user32.GetUpdateRect +@ stdcall GetUpdateRgn(long long long) user32.GetUpdateRgn +@ stdcall GetWindowDC(long) user32.GetWindowDC +@ stdcall GetWindowRgnBox(long ptr) user32.GetWindowRgnBox +@ stub GetWindowRgnEx +@ stdcall InvalidateRect(long ptr long) user32.InvalidateRect +@ stdcall InvalidateRgn(long long long) user32.InvalidateRgn +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow +@ stdcall SetWindowRgn(long long long) user32.SetWindowRgn +@ stdcall UpdateWindow(long) user32.UpdateWindow +@ stdcall ValidateRect(long ptr) user32.ValidateRect +@ stdcall ValidateRgn(long long) user32.ValidateRgn diff --git a/tools/make_specfiles b/tools/make_specfiles index 31d2f20..96ca63e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -350,6 +350,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 2136ec7e7f70626bf890eeb4470652dbeaa1ce29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2136ec7e7f70626bf890eeb4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:36:21 2018 +0200 ext-ms-win-ntuser-mouse-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-mouse-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 345c602..86f3a78 100755 --- a/configure +++ b/configure @@ -1250,6 +1250,7 @@ enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 @@ -18603,6 +18604,7 @@ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_e wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index 55e8e45..e1a1a5b 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in new file mode 100644 index 0000000..c408dbb --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-mouse-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec new file mode 100644 index 0000000..22128a2 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall GetCapture() user32.GetCapture +@ stdcall GetDoubleClickTime() user32.GetDoubleClickTime +@ stdcall ReleaseCapture() user32.ReleaseCapture +@ stdcall SetCapture(long) user32.SetCapture +@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 96ca63e..d25e970 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-oleacc-l1-1-0: Add dll.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 3e21e25cd957e5407d5265ed0a579fb06dc3f1e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e21e25cd957e5407d5265ed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:36:43 2018 +0200 ext-ms-win-oleacc-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec | 1 + tools/make_specfiles | 4 ++++ 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 86f3a78..1de40bf 100755 --- a/configure +++ b/configure @@ -1256,6 +1256,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +enable_ext_ms_win_oleacc_l1_1_0 enable_ext_ms_win_ras_rasapi32_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 @@ -18610,6 +18611,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_m wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 diff --git a/configure.ac b/configure.ac index e1a1a5b..664a73e 100644 --- a/configure.ac +++ b/configure.ac @@ -3253,6 +3253,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) diff --git a/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in b/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in new file mode 100644 index 0000000..1205dd7 --- /dev/null +++ b/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-oleacc-l1-1-0.dll diff --git a/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec b/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec new file mode 100644 index 0000000..bf21cc4 --- /dev/null +++ b/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) oleacc.AccessibleObjectFromWindow diff --git a/tools/make_specfiles b/tools/make_specfiles index d25e970..09351a5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -318,6 +318,10 @@ my @dll_groups = "iprop", ], [ + "oleacc", + "ext-ms-win-oleacc-l1-1-0", + ], + [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-rtcore-gdi-devcaps-l1-1-0: Add dll.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: fe6670eb7897ae547b7b74bd622f742d3005fbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6670eb7897ae547b7b74bd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:37:03 2018 +0200 ext-ms-win-rtcore-gdi-devcaps-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 1de40bf..1547862 100755 --- a/configure +++ b/configure @@ -1258,6 +1258,7 @@ enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 enable_ext_ms_win_oleacc_l1_1_0 enable_ext_ms_win_ras_rasapi32_l1_1_0 +enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 @@ -18613,6 +18614,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_n wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0 enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index 664a73e..2adcaf9 100644 --- a/configure.ac +++ b/configure.ac @@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in new file mode 100644 index 0000000..8284a69 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-devcaps-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec new file mode 100644 index 0000000..25416ef --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall GetDeviceCaps(long long) gdi32.GetDeviceCaps diff --git a/tools/make_specfiles b/tools/make_specfiles index 09351a5..53a4fec 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -401,6 +401,7 @@ my @dll_groups = "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", + "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0", "ext-ms-win-rtcore-gdi-rgn-l1-1-0", ],

1 0