February 2017 - Wine-Commits

Sebastian Lackner : user32: Implement SetCoalescableTimer and add basic tests.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: f00598a5522e549864d187343c5d11948428b2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00598a5522e549864d187343… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 12:34:53 2016 +0200 user32: Implement SetCoalescableTimer and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57b7a9937deb3f01960fc426f6cedf2b79fd7885) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 13 +++++++++++-- dlls/user32/tests/msg.c | 16 ++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 7 +++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c538161..400e94e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4436,9 +4436,9 @@ BOOL WINAPI MessageBeep( UINT i ) /*********************************************************************** - * SetTimer (USER32.@) + * SetCoalescableTimer (USER32.@) */ -UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) +UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) { UINT_PTR ret; WNDPROC winproc = 0; @@ -4468,6 +4468,15 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) } +/****************************************************************** + * SetTimer (USER32.@) + */ +UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) +{ + return SetCoalescableTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); +} + + /*********************************************************************** * SetSystemTimer (USER32.@) */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d44aca4..8e42d0d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1713,6 +1713,7 @@ static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); static UINT_PTR (WINAPI *pSetSystemTimer)(HWND, UINT_PTR, UINT, TIMERPROC); static UINT_PTR (WINAPI *pKillSystemTimer)(HWND, UINT_PTR); +static UINT_PTR (WINAPI *pSetCoalescableTimer)(HWND, UINT_PTR, UINT, TIMERPROC, ULONG); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1739,6 +1740,7 @@ static void init_procs(void) GET_PROC(user32, UpdateLayeredWindow) GET_PROC(user32, SetSystemTimer) GET_PROC(user32, KillSystemTimer) + GET_PROC(user32, SetCoalescableTimer) GET_PROC(kernel32, GetCPInfoExA) @@ -8667,6 +8669,20 @@ static void test_timers_no_wnd(void) KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ + if (pSetCoalescableTimer) + { + count = 0; + id = pSetCoalescableTimer(NULL, 0, 0, callback_count, 0); + ok(id != 0, "SetCoalescableTimer failed with %u.\n", GetLastError()); + start = GetTickCount(); + while (GetTickCount()-start < 100 && GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(count > 1, "expected count > 1, got %d.\n", count); + KillTimer(NULL, id); + } + else + win_skip("SetCoalescableTimer not available.\n"); + /* Check what happens when we're running out of timers */ for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9b409df..163ae46 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -620,6 +620,7 @@ @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) +@ stdcall SetCoalescableTimer(long long long ptr long) # @ stub SetConsoleReserveKeys @ stdcall SetCursor(long) @ stub SetCursorContents diff --git a/include/winuser.h b/include/winuser.h index 8b1302c..2f917ee 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2546,6 +2546,12 @@ typedef struct tagMINIMIZEDMETRICS { #define USER_TIMER_MINIMUM 0x0000000A #define USER_TIMER_MAXIMUM 0x7FFFFFFF +/* SetCoalescableTimer() tolerances */ +#define TIMERV_DEFAULT_COALESCING 0 +#define TIMERV_NO_COALESCING 0xFFFFFFFF +#define TIMERV_COALESCING_MIN 1 +#define TIMERV_COALESCING_MAX 0x7FFFFFF5 + /* AnimateWindow() flags */ #define AW_SLIDE 0x00040000 #define AW_ACTIVATE 0x00020000 @@ -3927,6 +3933,7 @@ WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrW(HWND,INT,LONG_PTR); WINUSERAPI WORD WINAPI SetClassWord(HWND,INT,WORD); WINUSERAPI HANDLE WINAPI SetClipboardData(UINT,HANDLE); WINUSERAPI HWND WINAPI SetClipboardViewer(HWND); +WINUSERAPI UINT_PTR WINAPI SetCoalescableTimer(HWND,UINT_PTR,UINT,TIMERPROC,ULONG); WINUSERAPI HCURSOR WINAPI SetCursor(HCURSOR); WINUSERAPI BOOL WINAPI SetCursorPos(INT,INT); WINUSERAPI VOID WINAPI SetDebugErrorLevel(DWORD);

1 0

Piotr Caban : user32: Test error returned in out of timers case.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 55f0d15d45d2b43777196fc7d62ae9c3f91b9abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f0d15d45d2b43777196fc7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 09:59:57 2016 +0100 user32: Test error returned in out of timers case. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b3c7af8134506479498df8ef343e67fd2e9d919) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c51cb68..d44aca4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8627,9 +8627,11 @@ static void test_timers(void) static void test_timers_no_wnd(void) { + static UINT_PTR ids[0xffff]; UINT_PTR id, id2; DWORD start; MSG msg; + int i; count = 0; id = SetTimer(NULL, 0, 100, callback_count); @@ -8664,6 +8666,18 @@ static void test_timers_no_wnd(void) count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ + + /* Check what happens when we're running out of timers */ + for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++) + { + SetLastError(0xdeadbeef); + ids[i] = SetTimer(NULL, 0, USER_TIMER_MAXIMUM, tfunc); + if (!ids[i]) break; + } + ok(i != sizeof(ids)/sizeof(ids[0]), "all timers were created successfully\n"); + ok(GetLastError()==ERROR_NO_MORE_USER_HANDLES || broken(GetLastError()==0xdeadbeef), + "GetLastError() = %d\n", GetLastError()); + while (i > 0) KillTimer(NULL, ids[--i]); } static void test_timers_exception(DWORD code)

1 0

Henri Verbeet : wine.inf: Add Dynamic DST data for Asia/Tehran.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 4220f8daa72fe1a60ab13455010c921fa05f10b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4220f8daa72fe1a60ab134550… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 19:37:35 2017 +0330 wine.inf: Add Dynamic DST data for Asia/Tehran. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19ce2b77bdf39cdf2ae15268e3e55996da194925) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4220f8daa72fe1a60ab13…

1 0

Józef Kucia : d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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);

1 0

Jacek Caban : secur32: Don' t change input buffer in InitializeSecurityContext.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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 */

1 0

Józef Kucia : d3d8/tests: Add more tests for UnlockRect().
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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);

1 0

Stefan Dösinger : d3d8/tests: Test invalid locks with textures.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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…

1 0

Nikolay Sivov : comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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];

1 0

Henri Verbeet : wined3d: Add GPU information for AMD TONGA.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 3719a543cb95a75ba3ae7e75b5511f832990e7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3719a543cb95a75ba3ae7e75b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 13:48:35 2017 +0100 wined3d: Add GPU information for AMD TONGA. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 332a6ff9169a852a1b5cc432dabba4bd98783a4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97db8a0..ed8fead 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1356,7 +1356,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -2104,8 +2105,10 @@ cards_amd_mesa[] = /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, + /* Volcanic Islands */ + {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ - {"HAWAII", CARD_AMD_RADEON_R9 }, + {"HAWAII", CARD_AMD_RADEON_R9_290}, {"KAVERI", CARD_AMD_RADEON_R7 }, {"KABINI", CARD_AMD_RADEON_R3 }, {"BONAIRE", CARD_AMD_RADEON_HD8770}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7f9823..d4c320d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1535,7 +1535,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD8770 = 0x665c, CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, - CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_R9_285 = 0x6939, + CARD_AMD_RADEON_R9_290 = 0x67b1, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Can Taşan : documentation: Update Turkish translation.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: d0ae2eb217fcef86f0cab7c60097990d021165c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ae2eb217fcef86f0cab7c60… Author: Can Taşan <betax34(a)hotmail.com> Date: Tue Jan 24 20:05:46 2017 +0100 documentation: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6dcb6a8bfc349e15197f57471c09fbc4bf0f74cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.tr | 196 +++++++++++++++++++----------------------------- 1 file changed, 77 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0ae2eb217fcef86f0cab…

1 0