April 2016 - Wine-commits - list.winehq.org

Francois Gouget : msvcp110/tests: A spelling fix and rewording for an msvcp110 ok() message.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 23e8d083fa91041cf79c529e33e31ce352b0233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e8d083fa91041cf79c529e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:17 2016 +0200 msvcp110/tests: A spelling fix and rewording for an msvcp110 ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index 58db584..500d3cb 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -95,7 +95,7 @@ static void test_tr2_sys__Last_write_time(void) newtime = last_write_time + 222222; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); ok(last_write_time != p_tr2_sys__Last_write_time("tr2_test_dir/f1"), - "last_write_time before modfied should not equal to last_write_time %s\n", + "last_write_time should have changed: %s\n", debugstr_longlong(last_write_time)); /* test the formula */

1 0

Francois Gouget : msvcp120/tests: CreateSymbolicLinkA() may be missing so dynamically load it.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 556f384ad95efdb8641a0c47e78c99261c5ab7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=556f384ad95efdb8641a0c47e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 10:33:45 2016 +0200 msvcp120/tests: CreateSymbolicLinkA() may be missing so dynamically load it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 86162bc..7c94906 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -276,12 +276,14 @@ static _Pad* (__thiscall *p__Pad_op_assign)(_Pad*, const _Pad*); static void (__thiscall *p__Pad__Launch)(_Pad*, _Thrd_t*); static void (__thiscall *p__Pad__Release)(_Pad*); +static BOOLEAN (WINAPI *pCreateSymbolicLinkA)(LPCSTR,LPCSTR,DWORD); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HANDLE msvcr; + HANDLE hdll; msvcp = LoadLibraryA("msvcp120.dll"); if(!msvcp) @@ -512,10 +514,13 @@ static BOOL init(void) SET(p__Cnd_signal, "_Cnd_signal"); - msvcr = GetModuleHandleA("msvcr120.dll"); - p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); - p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); - p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); + hdll = GetModuleHandleA("msvcr120.dll"); + p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); + p__setmbcp = (void*)GetProcAddress(hdll, "_setmbcp"); + p_isleadbyte = (void*)GetProcAddress(hdll, "isleadbyte"); + + hdll = GetModuleHandleA("kernel32.dll"); + pCreateSymbolicLinkA = (void*)GetProcAddress(hdll, "CreateSymbolicLinkA"); init_thiscall_thunk(); return TRUE; @@ -1277,13 +1282,13 @@ static void test_tr2_sys__Stat(void) ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); ok(CloseHandle(file), "CloseHandle\n"); SetLastError(0xdeadbeef); - ret = CreateSymbolicLinkA("tr2_test_dir/f1_link", "tr2_test_dir/f1", 0); - if(!ret && (GetLastError()==ERROR_PRIVILEGE_NOT_HELD||GetLastError()==ERROR_INVALID_FUNCTION)) { + ret = pCreateSymbolicLinkA ? pCreateSymbolicLinkA("tr2_test_dir/f1_link", "tr2_test_dir/f1", 0) : FALSE; + if(!ret && (!pCreateSymbolicLinkA || GetLastError()==ERROR_PRIVILEGE_NOT_HELD||GetLastError()==ERROR_INVALID_FUNCTION)) { tests[5].ret = tests[6].ret = file_not_found; win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); }else { ok(ret, "CreateSymbolicLinkA failed\n"); - ok(CreateSymbolicLinkA("tr2_test_dir/dir_link", "tr2_test_dir", 1), "CreateSymbolicLinkA failed\n"); + ok(pCreateSymbolicLinkA("tr2_test_dir/dir_link", "tr2_test_dir", 1), "CreateSymbolicLinkA failed\n"); } file = CreateNamedPipeA("\\\\.\\PiPe\\tests_pipe.c",

1 0

Sebastian Lackner : services: Change scmdatabase_remove_service to a void function.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 72ae095d75d11c6402c384eae2c434d0247f4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ae095d75d11c6402c384eae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 20 10:14:34 2016 +0200 services: Change scmdatabase_remove_service to a void function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 234c0ac..ab80812 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -282,18 +282,11 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *serv return ERROR_SUCCESS; } -static DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) +static void scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) { - int err; - - err = RegDeleteTreeW(db->root_key, service->name); - - if (err != 0) - return err; - + RegDeleteTreeW(db->root_key, service->name); list_remove(&service->entry); service->entry.next = service->entry.prev = NULL; - return ERROR_SUCCESS; } static void scmdatabase_autostart_services(struct scmdatabase *db)

1 0

Michael Stefaniuc : oleaut32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 21db79044e866f2ef9bac7511e1e5087921267cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21db79044e866f2ef9bac7511… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:35:14 2016 +0200 oleaut32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b67563d..96c109a 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -636,8 +636,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); if(prcWBounds) - TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, - prcWBounds->right, prcWBounds->bottom); + TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); if(cx == 0 || cy == 0 || cxSrc == 0 || cySrc == 0){ return CTL_E_INVALIDPROPERTYVALUE;

1 0

Michael Stefaniuc : msi: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 148d0e4576265d1527416d40607876d29e855745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148d0e4576265d1527416d406… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:37:32 2016 +0200 msi: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b0f0e5d..fc9c24c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3609,7 +3609,7 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP dialog->size.cx = sz.cx; dialog->size.cy = sz.cy; - TRACE("%u %u %u %u\n", pos->left, pos->top, pos->right, pos->bottom); + TRACE("%s\n", wine_dbgstr_rect(pos)); style = GetWindowLongPtrW( dialog->hwnd, GWL_STYLE ); AdjustWindowRect( pos, style, FALSE );

1 0

Michael Stefaniuc : include: Remove unused wine_dbgstr_size().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 9182b24b81e861a12d9d93cf15a133fe09f3c09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9182b24b81e861a12d9d93cf1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:39:18 2016 +0200 include: Remove unused wine_dbgstr_size(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index af5483c..5409d70 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -199,12 +199,6 @@ static inline const char *wine_dbgstr_point( const POINT *pt ) return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); } -static inline const char *wine_dbgstr_size( const SIZE *size ) -{ - if (!size) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); -} - static inline const char *wine_dbgstr_rect( const RECT *rect ) { if (!rect) return "(null)";

1 0

Alexander Lakhin : user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 35ab5f4499185f8df0504b95a99613fa4e30440a URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ab5f4499185f8df0504b95a… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:14:49 2016 +0200 user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9c52147..efd74f9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -389,13 +389,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); GetClientRect(hWnd, &client); rc = client;

1 0

Sebastian Lackner : user32/tests: Add tests for button WM_CTLCOLOR* messages.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 2c180741e154a73a502c3aff1a15f9e990c2aac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c180741e154a73a502c3aff1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 22:15:05 2016 +0200 user32/tests: Add tests for button WM_CTLCOLOR* messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b2630ce..046cfae 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5540,6 +5540,35 @@ static const struct message WmSetFontStaticSeq[] = { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; +static const struct message WmSetTextButtonSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|parent|optional }, + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; +static const struct message WmSetTextStaticSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetTextGroupSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { 0 } +}; +static const struct message WmSetTextInvisibleSeq[] = +{ + { WM_SETTEXT, sent }, + { 0 } +}; static const struct message WmSetStyleButtonSeq[] = { { BM_SETSTYLE, sent }, @@ -5709,51 +5738,63 @@ static void test_button_messages(void) const struct message *lbuttondown; const struct message *lbuttonup; const struct message *setfont; + const struct message *settext; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextGroupSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5887,6 +5928,30 @@ static void test_button_messages(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(button[i].setcheck, "BM_SETCHECK on a button", FALSE); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 1"); + sprintf(desc, "button[%i]: WM_SETTEXT on a visible button", i); + ok_sequence(button[i].settext, desc, FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(hwnd, SW_SHOW); + ShowWindow(parent, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(parent, SW_SHOW); + flush_events(); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON ||

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_set_compatible_renderbuffer( ).
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 7be5ccb21e7c679bc2aa86b5f7ea8bf1405bcfee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be5ccb21e7c679bc2aa86b5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:02 2016 +0200 wined3d: Use the texture dimension helpers in surface_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc6c2f7..92ff442 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1243,17 +1243,17 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const if (rt && rt->container->resource.format->id != WINED3DFMT_NULL) { - width = rt->pow2Width; - height = rt->pow2Height; + width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); + height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); } else { - width = surface->pow2Width; - height = surface->pow2Height; + width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); + height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); } - src_width = surface->pow2Width; - src_height = surface->pow2Height; + src_width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); + src_height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 58f309b491d37288653bbff29c830550a5883346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f309b491d37288653bbff29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:03 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92ff442..4babf33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1980,13 +1980,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_width, src_height, src_pow2_width, src_pow2_height; struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ const struct wined3d_gl_info *gl_info; - unsigned int src_width, src_height; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; @@ -2006,6 +2006,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st offscreen_buffer = context_get_offscreen_gl_buffer(context); src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_surface->texture_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_surface->texture_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; @@ -2096,11 +2098,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glGenTextures(1, &src)"); context_bind_texture(context, GL_TEXTURE_2D, src); - /* TODO: Only copy the part that will be read. Use src_rect->left, src_rect->bottom as origin, but with the width watch - * out for power of 2 sizes - */ - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_surface->pow2Width, - src_surface->pow2Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + /* TODO: Only copy the part that will be read. Use src_rect->left, + * src_rect->bottom as origin, but with the width watch out for power + * of 2 sizes. */ + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_pow2_width, + src_pow2_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); checkGLcall("glTexImage2D"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, src_width, src_height); @@ -2137,10 +2139,10 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - left /= src_surface->pow2Width; - right /= src_surface->pow2Width; - top /= src_surface->pow2Height; - bottom /= src_surface->pow2Height; + left /= src_pow2_width; + right /= src_pow2_width; + top /= src_pow2_height; + bottom /= src_pow2_height; } /* draw the source texture stretched and upside down. The correct surface is bound already */ @@ -2215,16 +2217,16 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glVertex2i(0, src_height); /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_pow2_height); gl_info->gl_ops.gl.p_glVertex2i(0, 0); /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, - (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_pow2_width, + (float)src_height / (float)src_pow2_height); gl_info->gl_ops.gl.p_glVertex2i(src_width, 0); /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, 0.0f); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_pow2_width, 0.0f); gl_info->gl_ops.gl.p_glVertex2i(src_width, src_height); gl_info->gl_ops.gl.p_glEnd(); }

1 0