wine-commits February 2017

2 participants
838 discussions

Józef Kucia : wined3d: Filter messages for fullscreen mode changes.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 67a83e5d919930fa5ddeded32d9ace9ddc80a483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a83e5d919930fa5ddeded32… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 13 13:10:38 2016 +0100 wined3d: Filter messages for fullscreen mode changes. This fixes a regression introduced by commit d9f8cba50f4c2fc9f138d35c73ba5afc30d15866. 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> (cherry picked from commit e2e0c747a82bd9f8c095366b4457dda5a0cbc1f1) Conflicts: dlls/wined3d/swapchain.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 +- dlls/wined3d/device.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 072fbcb..5c40587 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4132,7 +4132,7 @@ static void test_reset_fullscreen(void) ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n"); flush_events(); - todo_wine ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); + ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); cleanup: if (device) IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9ab347..305479b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4648,6 +4648,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { if (swapchain->desc.windowed) { + /* Switch from windowed to fullscreen */ HWND focus_window = device->create_parms.focus_window; if (!focus_window) focus_window = swapchain_desc->device_window; @@ -4657,7 +4658,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return hr; } - /* switch from windowed to fs */ wined3d_device_setup_fullscreen_window(device, swapchain->device_window, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); @@ -4665,10 +4665,15 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, else { /* Fullscreen -> fullscreen mode change */ + BOOL filter_messages = device->filter_messages; + device->filter_messages = TRUE; + MoveWindow(swapchain->device_window, 0, 0, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height, TRUE); + + device->filter_messages = filter_messages; } swapchain->d3d_mode = m; }

7 years, 2 months

Józef Kucia : d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 6e853bf9fcfddc4ca77159b83548c9e8a30785d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e853bf9fcfddc4ca77159b83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 13 13:10:37 2016 +0100 d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change. 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> (cherry picked from commit 37daa3573760c7f4564830c4bfc808095c150357) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/device.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16723df..072fbcb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3187,7 +3187,7 @@ struct message static const struct message *expect_messages; static HWND device_window, focus_window; -static LONG windowposchanged_received, syscommand_received; +static LONG windowposchanged_received, syscommand_received, wm_size_received; struct wndproc_thread_param { @@ -3243,6 +3243,8 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM InterlockedIncrement(&windowposchanged_received); else if (message == WM_SYSCOMMAND) InterlockedIncrement(&syscommand_received); + else if (message == WM_SIZE) + InterlockedIncrement(&wm_size_received); return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -4046,11 +4048,14 @@ done: static void test_reset_fullscreen(void) { + struct device_desc device_desc; + D3DDISPLAYMODE d3ddm, d3ddm2; + unsigned int mode_count, i; + IDirect3DDevice9 *device; WNDCLASSEXA wc = {0}; - IDirect3DDevice9 *device = NULL; IDirect3D9 *d3d; + HRESULT hr; ATOM atom; - struct device_desc device_desc; static const struct message messages[] = { /* Windows usually sends wparam = TRUE, except on the testbot, @@ -4101,6 +4106,34 @@ static void test_reset_fullscreen(void) ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message); expect_messages = NULL; + IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm); + mode_count = IDirect3D9_GetAdapterModeCount(d3d, D3DADAPTER_DEFAULT, d3ddm.Format); + for (i = 0; i < mode_count; ++i) + { + hr = IDirect3D9_EnumAdapterModes(d3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm2.Width != d3ddm.Width || d3ddm2.Height != d3ddm.Height) + break; + } + if (i == mode_count) + { + skip("Could not find a suitable display mode.\n"); + goto cleanup; + } + + wm_size_received = 0; + + /* Fullscreen mode change. */ + device_desc.width = d3ddm2.Width; + device_desc.height = d3ddm2.Height; + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n"); + + flush_events(); + todo_wine ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); + cleanup: if (device) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

7 years, 2 months

Austin English : ntoskrnl.exe: Forward RtlUnwindEx to ntdll.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 89487b6315766e3b437f0abc9d902c135244ae22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89487b6315766e3b437f0abc9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:47:09 2017 -0600 ntoskrnl.exe: Forward RtlUnwindEx to ntdll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72a431e0efd67e89da16b8b470375ba09d84e803) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4bbac51..be88363 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1182,6 +1182,7 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) ntdll.RtlUnicodeToOemN @ stub RtlUnlockBootStatusData @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx @ stdcall RtlUpcaseUnicodeChar(long) ntdll.RtlUpcaseUnicodeChar @ stdcall RtlUpcaseUnicodeString(ptr ptr long) ntdll.RtlUpcaseUnicodeString @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) ntdll.RtlUpcaseUnicodeStringToAnsiString

7 years, 2 months

Jacek Caban : secur32: Don' t change input buffer in InitializeSecurityContext.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 98c513ff3811d170cf70d6b4f78dd9ed485f0c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c513ff3811d170cf70d6b4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 13 19:57:48 2017 +0100 secur32: Don't change input buffer in InitializeSecurityContext. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1f055d8dfda4cb4349db319a9e8734022d74895) Conflicts: dlls/secur32/tests/schannel.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c6cc4d1..71f219c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -732,7 +732,14 @@ schan_imp_session schan_session_for_transport(struct schan_transport* t) return t->ctx->session; } -static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) +{ + if (s->current_buffer_idx != -1) + return -1; + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); +} + +static int schan_init_sec_ctx_get_next_output_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx == -1) { @@ -884,9 +891,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; transport.ctx = ctx; - init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); transport.in.limit = expected_size; - init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); schan_imp_set_session_transport(ctx->session, &transport); /* Perform the TLS handshake */

7 years, 2 months

Jarkko Korpi : winex11.drv: Add 640x400 mode to virtual desktop.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: d404ce8a8e47db4dc9198bc1f86da24a818395ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d404ce8a8e47db4dc9198bc1f… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Tue Jan 17 18:06:39 2017 +0200 winex11.drv: Add 640x400 mode to virtual desktop. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit be139063e4d20f90971432f0e8970fa54d00bff9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 8db1ed0..6b610d6 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 320, 400, 512, 640, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 240, 300, 384, 400, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

7 years, 2 months

Józef Kucia : d3d8: Return D3D_OK from UnlockRect() for not locked textures.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 72dc44f8a3de83fb034a423802506cd23e9261fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=72dc44f8a3de83fb034a42380… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:46 2017 +0100 d3d8: Return D3D_OK from UnlockRect() for not locked textures. 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> (cherry picked from commit 8f8c2a8ade8d8b2c61c5f1614aa477900d6ab449) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/surface.c | 11 ++++++++--- dlls/d3d8/tests/device.c | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index ec263b1..5348841 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,11 +273,16 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); - switch(hr) + if (hr == WINEDDERR_NOTLOCKED) { - case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; - default: return hr; + D3DRESOURCETYPE type; + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + hr = type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; } + return hr; } static const IDirect3DSurface8Vtbl d3d8_surface_vtbl = diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7b14068..0d85d3e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4712,7 +4712,6 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; hr = IDirect3DSurface8_UnlockRect(surface); - todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) @@ -4858,7 +4857,7 @@ static void test_lockrect_invalid(void) hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); + ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d], type %s.\n",

7 years, 2 months

Józef Kucia : d3d8/tests: Add more tests for UnlockRect().

by Alexandre Julliard

Module: wine Branch: oldstable Commit: abfcb496ad9ffa1b785a3ea9248b70da3dcabc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfcb496ad9ffa1b785a3ea92… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:44 2017 +0100 d3d8/tests: Add more tests for UnlockRect(). 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> (cherry picked from commit 16df0ea08afeb3970729d82176b51c0795559f48) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 18ea559..7b14068 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4637,12 +4637,12 @@ static void test_lockrect_invalid(void) IDirect3DCubeTexture8 *cube_texture; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; + HRESULT hr, expected_hr; IDirect3D8 *d3d8; unsigned int i, r; ULONG refcount; HWND window; BYTE *base; - HRESULT hr; unsigned int offset, expected_offset; static const struct { @@ -4704,11 +4704,16 @@ static void test_lockrect_invalid(void) default: break; } + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, type %s.\n", hr, resources[r].name); base = locked_rect.pBits; hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); + expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; + hr = IDirect3DSurface8_UnlockRect(surface); + todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) + ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) { @@ -4852,6 +4857,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DTexture8_UnlockRect(texture, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d], type %s.\n", @@ -4887,6 +4894,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_LockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0, &locked_rect, &valid[0], 0);

7 years, 2 months

Stefan Dösinger : d3d8/tests: Test invalid locks with textures.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 875901e54e62626723a1530b680bf2001a5048c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875901e54e62626723a1530b6… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:06 2016 +0000 d3d8/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e6cf8ba609f33a528f7fddbcb6e1ad681e69feca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 300 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 245 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875901e54e62626723a15…

7 years, 2 months

Nikolay Sivov : comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 0a7e342d0370df6be26c4ec12c92bba8e5ca9612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7e342d0370df6be26c4ec12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 13 14:25:54 2017 +0300 comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d404ddac6e4f789b7ee417f4bedd3cb49e411e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/tests/propsheet.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ed5f7d4..05cbc8a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -639,7 +639,7 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) */ resSize = SizeofResource(COMCTL32_hModule, hRes); - temp = Alloc(resSize); + temp = Alloc(2 * resSize); if (!temp) return -1; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 6594298..592ad15 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -55,6 +55,21 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) { + case PSCB_PRECREATE: + { + HMODULE module = GetModuleHandleA("comctl32.dll"); + DWORD size, buffer_size; + HRSRC hrsrc; + + hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), + (LPSTR)RT_DIALOG); + size = SizeofResource(module, hrsrc); + ok(size != 0, "Failed to get size of propsheet dialog resource\n"); + buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); + ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", + buffer_size, size); + break; + } case PSCB_INITIALIZED: { char caption[256];

7 years, 2 months

Michael Cronenworth : wined3d: Add Iris Haswell PCI ids and descriptions.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: b2b35a686a6fc91bdc039fb0e4d755a1fe1cc06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b35a686a6fc91bdc039fb0e… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Fri Jan 13 07:06:45 2017 -0600 wined3d: Add Iris Haswell PCI ids and descriptions. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58056728cdf5697e2bbbe8636b498f001131cfe4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97b2a4f..a89709a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1402,6 +1402,15 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_4, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_1, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_2, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_3, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_4, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_5, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, @@ -2050,6 +2059,8 @@ cards_intel[] = {"Iris 6100", CARD_INTEL_I6100}, {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ + {"Iris Pro 5200", CARD_INTEL_IP5200_1}, + {"Iris 5100", CARD_INTEL_I5100_1}, {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5967a60..86f5480 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1699,6 +1699,15 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_I5100_1 = 0x0a22, + CARD_INTEL_I5100_2 = 0x0a2a, + CARD_INTEL_I5100_3 = 0x0a2b, + CARD_INTEL_I5100_4 = 0x0a2e, + CARD_INTEL_IP5200_1 = 0x0d22, + CARD_INTEL_IP5200_2 = 0x0d26, + CARD_INTEL_IP5200_3 = 0x0d2a, + CARD_INTEL_IP5200_4 = 0x0d2b, + CARD_INTEL_IP5200_5 = 0x0d2e, CARD_INTEL_HD5300 = 0x161e, CARD_INTEL_HD5500 = 0x1616, CARD_INTEL_HD5600 = 0x1612,

7 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
84
Older →

Jump to page:

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 February 2017