April 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetExtendModeX().
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: b940f2fd9ef5b1abd41ec6dbaf18ed629b4675b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b940f2fd9ef5b1abd41ec6dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:33 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetExtendModeX(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b6702c0..575675e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -594,9 +594,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - return D2D1_EXTEND_MODE_CLAMP; + TRACE("iface %p.\n", iface); + + return brush->u.bitmap.extend_mode_x; } static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface)

1 0

Jacek Caban : ws2_32: Use get_rcvsnd_timeo helper in getsockopt.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: edb780e87f212a8d4a6528eaea7285c8f8cb3c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb780e87f212a8d4a6528eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:01:15 2015 +0200 ws2_32: Use get_rcvsnd_timeo helper in getsockopt. --- dlls/ws2_32/socket.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f904252..52b5394 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3619,16 +3619,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } return ret ? 0 : SOCKET_ERROR; } -#ifdef SO_RCVTIMEO case WS_SO_RCVTIMEO: -#endif -#ifdef SO_SNDTIMEO case WS_SO_SNDTIMEO: -#endif -#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) { - struct timeval tv; - socklen_t len = sizeof(struct timeval); + INT64 timeout; if (!optlen || *optlen < sizeof(int)|| !optval) { @@ -3638,22 +3632,12 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, &tv, &len) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - *(int *)optval = tv.tv_sec * 1000 + tv.tv_usec / 1000; - *optlen = sizeof(int); - } + timeout = get_rcvsnd_timeo(fd, optname == WS_SO_RCVTIMEO); + *(int *)optval = timeout <= UINT32_MAX ? timeout : UINT32_MAX; release_sock_fd( s, fd ); return ret; } -#endif case WS_SO_TYPE: { if (!optlen || *optlen < sizeof(int) || !optval)

1 0

Jacek Caban : ws2_32: Call get_rcvsnd_timeo directly.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 6a80fe9e6bdfe28f4600dee41367e95e9e23b7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a80fe9e6bdfe28f4600dee41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:00:57 2015 +0200 ws2_32: Call get_rcvsnd_timeo directly. --- dlls/ws2_32/socket.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d6bfa94..f904252 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1252,29 +1252,31 @@ static char *strdup_lower(const char *str) /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds * or 0 if there is an infinite time out */ -static inline INT64 get_rcvsnd_timeo( int fd, int optname) +static inline INT64 get_rcvsnd_timeo( int fd, BOOL is_recv) { struct timeval tv; socklen_t len = sizeof(tv); - int res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); - if (res < 0) - return 0; - return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; -} + int optname, res; -/* macro wrappers for portability */ + if (is_recv) #ifdef SO_RCVTIMEO -#define GET_RCVTIMEO(fd) get_rcvsnd_timeo( (fd), SO_RCVTIMEO) + optname = SO_RCVTIMEO; #else -#define GET_RCVTIMEO(fd) (0) + return 0; #endif - + else #ifdef SO_SNDTIMEO -#define GET_SNDTIMEO(fd) get_rcvsnd_timeo( (fd), SO_SNDTIMEO) + optname = SO_SNDTIMEO; #else -#define GET_SNDTIMEO(fd) (0) + return 0; #endif + res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); + if (res < 0) + return 0; + return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; +} + /* utility: given an fd, will block until one of the events occurs */ static inline int do_block( int fd, int events, int timeout ) { @@ -5075,7 +5077,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { struct pollfd pfd; int poll_timeout = -1; - INT64 timeout = GET_SNDTIMEO(fd); + INT64 timeout = get_rcvsnd_timeo(fd, FALSE); if (timeout) { @@ -7131,7 +7133,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { struct pollfd pfd; int poll_timeout = -1; - INT64 timeout = GET_RCVTIMEO(fd); + INT64 timeout = get_rcvsnd_timeo(fd, TRUE); if (timeout) {

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetExtendModeX().
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 21a4a1087970c23c008485e7413c45f29f70b101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a4a1087970c23c008485e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:32 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetExtendModeX(). --- dlls/d2d1/brush.c | 35 +++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f2cb99e..b6702c0 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -555,7 +555,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *if static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.extend_mode_x = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) @@ -646,9 +655,15 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); if (bitmap_brush_desc) + { + brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX; brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + } else + { + brush->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; + } return S_OK; } @@ -663,6 +678,22 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } +static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTEND_MODE mode) +{ + switch (mode) + { + case D2D1_EXTEND_MODE_CLAMP: + return D3D10_TEXTURE_ADDRESS_CLAMP; + case D2D1_EXTEND_MODE_WRAP: + return D3D10_TEXTURE_ADDRESS_WRAP; + case D2D1_EXTEND_MODE_MIRROR: + return D3D10_TEXTURE_ADDRESS_MIRROR; + default: + FIXME("Unhandled extend mode %#x.\n", mode); + return D3D10_TEXTURE_ADDRESS_CLAMP; + } +} + void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { HRESULT hr; @@ -678,7 +709,7 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 285c422..b5820d0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_EXTEND_MODE extend_mode_x; D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetExtendModeY().
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: abc84588d2ab3596db15c883b35c81ce9409d264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc84588d2ab3596db15c883b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetExtendModeY(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 309d234..cd5476a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -612,9 +612,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1B static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - return D2D1_EXTEND_MODE_CLAMP; + TRACE("iface %p.\n", iface); + + return brush->u.bitmap.extend_mode_y; } static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface)

1 0

André Hentschel : Add WWN 389
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: faddebbcbb9098285736afc8c4469643ea456309 URL: http://source.winehq.org/git/website.git/?a=commit;h=faddebbcbb9098285736af… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:32:14 2015 +0200 Add WWN 389 --- news/de/2015042501.xml | 10 + news/en/2015042501.xml | 10 + wwn/en/wn20150425_389.xml | 986 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1006 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=faddebbcbb90982857…

1 0

Frédéric Delanoy : French translation for release 1.7.41
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 7cedd393a0d4455a54c07ea5a6ef4b41ad272ecb URL: http://source.winehq.org/git/website.git/?a=commit;h=7cedd393a0d4455a54c07e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 26 21:58:52 2015 +0200 French translation for release 1.7.41 --- news/fr/2015041701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015041701.xml b/news/fr/2015041701.xml new file mode 100644 index 0000000..64e76ea --- /dev/null +++ b/news/fr/2015041701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 avril 2015</date> +<title>Sortie de Wine 1.7.41</title> +<body> + La version de développement 1.7.41 de Wine est disponible. + <a href="{$root}/announce/1.7.41">Nouveautés</a> de cette version : +<ul> + <li>Dossiers spéciaux supplémentaires pris en charge dans le shell.</li> + <li>Prise en charge complémentaire des objets tâches du noyau.</li> + <li>Améliorations dans la prise en charge des patchs MSI.</li> + <li>Quelques correctifs dans la gestion des thèmes.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.41
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 852023262cc9e8bdff38047e46a223daf1d2b8ba URL: http://source.winehq.org/git/website.git/?a=commit;h=852023262cc9e8bdff3804… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:44:52 2015 +0200 German translation for release 1.7.41 --- news/de/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015041701.xml b/news/de/2015041701.xml new file mode 100644 index 0000000..d261540 --- /dev/null +++ b/news/de/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. April 2015</date> +<title>Wine 1.7.41 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.41 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.41">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr bekannte Ordner unterstützt in der Shell.</li> + <li>Ein wenig mehr Unterstützung für Kernel-Job-Objekte.</li> + <li>Mehr Verbesserungen an MSI-Patches.</li> + <li>Einige Korrekturen für grafische Themen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.40
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 9b502eda4fc14b045fba328c4ece625e127decf2 URL: http://source.winehq.org/git/website.git/?a=commit;h=9b502eda4fc14b045fba32… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:36:11 2015 +0200 German translation for release 1.7.40 --- news/de/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2015040301.xml b/news/de/2015040301.xml new file mode 100644 index 0000000..a007e6b --- /dev/null +++ b/news/de/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>3. April 2015</date> +<title>Wine 1.7.40 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.40 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.40">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Kernel-Job-Objekte.</li> + <li>Diverse Korrekturen am ListView-Steuerelement.</li> + <li>Bessere Unterstützung von OOB-Daten in Windows Sockets.</li> + <li>Unterstützung von DIB-Bildern im OLE-Datencache.</li> + <li>Verbesserte Unterstützung für MSI-Patches.</li> + <li>Einige Korrekturen an ACL-Dateiberechtigungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alistair Leslie-Hughes : packager: Mark DllCanUnloadNow, DllGetClassObject , DllRegisterServer, DllUnregisterServer as private.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: d15ca4edb9c3823a698c4bb6137c8777e1ad08dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15ca4edb9c3823a698c4bb61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 27 09:21:54 2015 +1000 packager: Mark DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer as private. --- dlls/packager/packager.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/packager/packager.spec b/dlls/packager/packager.spec index 5baed04..b16365d 100644 --- a/dlls/packager/packager.spec +++ b/dlls/packager/packager.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Aric Stewart : comctl32: TTM_SETTOOLINFO does not change subclassing flags.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: aba3b131bc6ab9f74e9ffcaaad0019253cb3f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba3b131bc6ab9f74e9ffcaaa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 24 07:34:59 2015 -0500 comctl32: TTM_SETTOOLINFO does not change subclassing flags. --- dlls/comctl32/tests/tooltips.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 24 ++++--- 2 files changed, 162 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index a07a054..3382fce 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -839,6 +839,154 @@ static void test_track(void) DestroyWindow(parent); } +static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0; +} + +static void test_setinfo(void) +{ + WNDCLASSA wc; + LRESULT lResult; + HWND parent, parent2, hwndTip, hwndTip2; + TTTOOLINFOA toolInfo = { 0 }; + TTTOOLINFOA toolInfo2 = { 0 }; + WNDPROC wndProc; + + /* Create a class to use the custom draw wndproc */ + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "SetInfoClass"; + wc.lpfnWndProc = info_wnd_proc; + RegisterClassA(&wc); + + /* Create a main window */ + parent = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent != NULL, "Creation of main window failed\n"); + + parent2 = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent2 != NULL, "Creation of main window failed\n"); + + /* Make it show */ + ShowWindow(parent2, SW_SHOWNORMAL); + flush_events(100); + + /* Create Tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + + hwndTip2 = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip2 != NULL, "Creation of tooltip window failed\n"); + + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + /* Create a tool */ + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = TTF_SUBCLASS; + toolInfo.uId = 0x1234ABCD; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent2; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = 0; + toolInfo.uId = 0x1234ABCE; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + /* Try to Remove Subclass */ + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent; + toolInfo2.uId = 0x1234ABCD; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags &= ~TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + /* Try to Add Subclass */ + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip2, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent2; + toolInfo2.uId = 0x1234ABCE; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags |= TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + /* Clean up */ + DestroyWindow(hwndTip); + DestroyWindow(hwndTip2); + DestroyWindow(parent); + DestroyWindow(parent2); +} + START_TEST(tooltips) { InitCommonControls(); @@ -850,4 +998,5 @@ START_TEST(tooltips) test_longtextA(); test_longtextW(); test_track(); + test_setinfo(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5423ca5..8bf6919 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -111,6 +111,7 @@ static HICON hTooltipIcons[TTI_ERROR+1]; typedef struct { UINT uFlags; + UINT uInternalFlags; HWND hwnd; BOOL bNotifyUnicode; UINT_PTR uId; @@ -1057,11 +1058,12 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) infoPtr->uNumTools++; /* copy tool data */ - toolPtr->uFlags = ti->uFlags; - toolPtr->hwnd = ti->hwnd; - toolPtr->uId = ti->uId; - toolPtr->rect = ti->rect; - toolPtr->hinst = ti->hinst; + toolPtr->uFlags = ti->uFlags; + toolPtr->uInternalFlags = (ti->uFlags & (TTF_SUBCLASS | TTF_IDISHWND)); + toolPtr->hwnd = ti->hwnd; + toolPtr->uId = ti->uId; + toolPtr->rect = ti->rect; + toolPtr->hinst = ti->hinst; if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) { if (IS_INTRESOURCE(ti->lpszText)) { @@ -1092,8 +1094,8 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lParam = ti->lParam; /* install subclassing hook */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { SetWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1, (DWORD_PTR)infoPtr->hwndSelf); } @@ -1152,8 +1154,8 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else { @@ -1918,8 +1920,8 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else {

1 0

Henri Verbeet : wined3d: Also free the input signature in shader_cleanup() (Valgrind).
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 4b86f13adef659dea80618afc5359bdeb5124e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b86f13adef659dea80618afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:39 2015 +0200 wined3d: Also free the input signature in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a2cf3a..d9ff768 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1862,6 +1862,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf);

1 0

Nikolay Sivov : dwrite: Implement ApplyCharacterSpacing().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 14158a71db73c4bfb4c293f67277fc2e79d310cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=14158a71db73c4bfb4c293f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:20:32 2015 +0300 dwrite: Implement ApplyCharacterSpacing(). --- dlls/dwrite/analyzer.c | 219 ++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 162 ++++++++++++++++++++++++++++++++ 2 files changed, 379 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14158a71db73c4bfb4c29…

1 0

Gerald Pfeifer : urlmon: Simplify a (redundant) expression in parse_canonicalize.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 2cfdaaef557c1e2cb6b7454695e2c4ca3e381fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfdaaef557c1e2cb6b745469… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 25 21:18:18 2015 +0200 urlmon: Simplify a (redundant) expression in parse_canonicalize. --- dlls/urlmon/uri.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e43d372..48b485b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6842,8 +6842,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, ptr = uri->canon_uri+uri->scheme_start+uri->scheme_len+1; pptr = &ptr; } - reduce_path = !(flags & URL_NO_META) && - !(flags & URL_DONT_SIMPLIFY) && + reduce_path = !(flags & URL_DONT_SIMPLIFY) && ptr && check_hierarchical(pptr); for(ptr = uri->canon_uri; ptr < uri->canon_uri+uri->canon_len; ++ptr) {

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 7929155e55e1f25a09eb1174293ca9d098768657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929155e55e1f25a09eb11742… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 09:52:46 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 10 +++++----- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ab6bf36..839b2b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5612,11 +5612,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, &light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 11248f5..42f65bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6587,11 +6587,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport2_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aedc11c..ddb7a1d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3938,11 +3938,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 1.0f; - U2(U(light_desc).dcvColor).g = 1.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 1.0f; + U2(light_desc.dcvColor).g = 1.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light);

1 0

Stefan Dösinger : wined3d: Move the ARB_texture_rectangle check to init_format_texture_info.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 0152b0dad33ee356f1dfeb7f3c0535de7c6aa1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0152b0dad33ee356f1dfeb7f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:12 2015 +0200 wined3d: Move the ARB_texture_rectangle check to init_format_texture_info. --- dlls/wined3d/texture.c | 53 ++++++++++++++++++++++++++++++++------------------ dlls/wined3d/utils.c | 3 ++- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 589f8bf..916bcb2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1076,6 +1076,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 UINT pow2_width, pow2_height; unsigned int i; HRESULT hr; + enum wined3d_gl_resource_type gl_type; + unsigned int required_flags = 0, ds_flags = WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL; + const struct wined3d_format *format; /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ @@ -1084,6 +1087,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture); return WINED3DERR_INVALIDCALL; } + format = wined3d_get_format(gl_info, desc->format); /* Non-power2 support. */ if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) @@ -1134,6 +1138,23 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } } + if (desc->usage & WINED3DUSAGE_TEXTURE) + required_flags |= WINED3DFMT_FLAG_TEXTURE; + if (desc->usage & WINED3DUSAGE_RENDERTARGET) + required_flags |= WINED3DFMT_FLAG_RENDERTARGET; + /* WINED3DUSAGE_DEPTHSTENCIL needs WINED3DFMT_FLAG_DEPTH or WINED3DFMT_FLAG_STENCIL, not both. */ + + if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & ds_flags)) + && (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || (desc->width == pow2_width && desc->height == pow2_height))) + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; + else if ((format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & ds_flags))) + gl_type = WINED3D_GL_RES_TYPE_TEX_RECT; + else + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; /* No error, may be SCRATCH pool or emulated conditional np2. */ + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, surface_flags, WINED3D_GL_RES_TYPE_TEX_2D, device, parent, parent_ops, &texture_resource_ops))) { @@ -1142,18 +1163,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } /* Precalculated scaling for 'faked' non power of two texture coords. */ - if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] - && (desc->width != pow2_width || desc->height != pow2_height)) - { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_COND_NP2; - } - else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] - && (desc->width != pow2_width || desc->height != pow2_height)) + if (gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; @@ -1165,21 +1175,26 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } else { - if ((desc->width != pow2_width) || (desc->height != pow2_height)) + texture->target = GL_TEXTURE_2D; + if (desc->width == pow2_width && desc->height == pow2_height) { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->pow2_matrix[0] = 1.0f; + texture->pow2_matrix[5] = 1.0f; } - else + else if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->pow2_matrix[0] = 1.0f; texture->pow2_matrix[5] = 1.0f; + texture->flags |= WINED3D_TEXTURE_COND_NP2; + } + else + { + texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); + texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } - texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 405a79c..8a7075d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1861,7 +1861,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2])

1 0

Henri Verbeet : wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d () (Valgrind).
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 79f4ca9ec4dd6642c09f8f597449074a6d1c1415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f4ca9ec4dd6642c09f8f597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:38 2015 +0200 wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d() (Valgrind). --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4954d00..0822f61 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1086,6 +1086,12 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); + /* Release the context again as soon as possible. In particular, + * releasing the render target views below may release the last reference + * to the swapchain associated with this context, which in turn will + * destroy the context. */ + context_release(context); + /* Release the buffers (with sanity checks)*/ if (device->onscreen_depth_stencil) { @@ -1123,8 +1129,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->back_buffer_view = NULL; } - context_release(context); - for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Henri Verbeet : d2d1/tests: Add a test for bitmap brushes.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 61a40b0d9c5645d74d62d176e68e811d754cfcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a40b0d9c5645d74d62d176e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:37 2015 +0200 d2d1/tests: Add a test for bitmap brushes. --- dlls/d2d1/tests/d2d1.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3285acb..357a518 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -46,6 +46,12 @@ static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) color->a = a; } +static void set_size_u(D2D1_SIZE_U *size, unsigned int w, unsigned int h) +{ + size->width = w; + size->height = h; +} + static void set_matrix_identity(D2D1_MATRIX_3X2_F *matrix) { matrix->_11 = 1.0f; @@ -685,9 +691,143 @@ static void test_color_brush(void) DestroyWindow(window); } +static void test_bitmap_brush(void) +{ + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; + D2D1_MATRIX_3X2_F matrix, tmp_matrix; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *tmp_bitmap; + D2D1_RECT_F src_rect, dst_rect; + D2D1_EXTEND_MODE extend_mode; + IDXGISwapChain *swapchain; + ID2D1BitmapBrush *brush; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_COLOR_F color; + D2D1_SIZE_U size; + ULONG refcount; + float opacity; + HWND window; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on + * Windows 7+. */ + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1BitmapBrush_GetBitmap(brush, &tmp_bitmap); + ok(tmp_bitmap == bitmap, "Got unexpected bitmap %p, expected %p.\n", tmp_bitmap, bitmap); + ID2D1Bitmap_Release(tmp_bitmap); + opacity = ID2D1BitmapBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity); + set_matrix_identity(&matrix); + ID2D1BitmapBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + extend_mode = ID2D1BitmapBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + interpolation_mode = ID2D1BitmapBrush_GetInterpolationMode(brush); + ok(interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + "Got unexpected interpolation mode %#x.\n", interpolation_mode); + ID2D1BitmapBrush_Release(brush); + + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetInterpolationMode(brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 2.0f); + translate_matrix(&matrix, 320.0f, 240.0f); + rotate_matrix(&matrix, M_PI / 4.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, -80.0f, -60.0f); + scale_matrix(&matrix, 40.0f, 30.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetOpacity(brush, 0.75f); + set_rect(&dst_rect, -80.0f, -60.0f, 80.0f, 60.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, -4.0f, 12.0f, -8.0f, 8.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 0.75f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, 0.0f, 8.0f, 4.0f, 12.0f); + set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + + ID2D1BitmapBrush_Release(brush); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %u references left.\n", refcount); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); test_color_brush(); + test_bitmap_brush(); }

1 0

Alexandre Julliard : server: Return a valid position also in posted messages.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 247275aec3ca9fbc8aa8b554319610ba57bb4f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247275aec3ca9fbc8aa8b5543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 17:24:15 2015 +0900 server: Return a valid position also in posted messages. --- dlls/user32/message.c | 14 ++++------ dlls/user32/tests/win.c | 12 ++++---- include/wine/server_protocol.h | 6 ++-- server/protocol.def | 4 +-- server/queue.c | 63 ++++++++++++++++++++++++++++-------------- server/request.h | 10 ++++--- server/trace.c | 2 ++ 7 files changed, 67 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=247275aec3ca9fbc8aa8b…

1 0

Nikolay Sivov : dmime: No need to allocate description separately for IDirectMusicGraph.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: b508c85c666932a31d866049e92e364e06cad30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b508c85c666932a31d866049e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:53:47 2015 +0300 dmime: No need to allocate description separately for IDirectMusicGraph. --- dlls/dmime/graph.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index a784007..9e9c2fb 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -29,7 +29,7 @@ struct IDirectMusicGraphImpl { LONG ref; /* IDirectMusicGraphImpl fields */ - LPDMUS_OBJECTDESC pDesc; + DMUS_OBJECTDESC desc; WORD num_tools; struct list Tools; }; @@ -218,8 +218,7 @@ static HRESULT WINAPI DirectMusicObject_GetDescriptor(IDirectMusicObject *iface, { IDirectMusicGraphImpl *This = impl_from_IDirectMusicObject(iface); TRACE("(%p, %p)\n", This, desc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ - memcpy(desc, This->pDesc, This->pDesc->dwSize); + *desc = This->desc; return S_OK; } @@ -231,31 +230,31 @@ static HRESULT WINAPI DirectMusicObject_SetDescriptor(IDirectMusicObject *iface, /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - This->pDesc->guidObject = pDesc->guidObject; + This->desc.guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + This->desc.guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) - lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); + lstrcpynW (This->desc.wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - lstrcpynW (This->pDesc->wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); + lstrcpynW (This->desc.wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); + lstrcpynW (This->desc.wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - This->pDesc->vVersion = pDesc->vVersion; + This->desc.vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - This->pDesc->ftDate = pDesc->ftDate; + This->desc.ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - This->pDesc->llMemLength = pDesc->llMemLength; - memcpy(This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); + This->desc.llMemLength = pDesc->llMemLength; + memcpy(This->desc.pbMemData, pDesc->pbMemData, pDesc->llMemLength); } /* according to MSDN, we copy the stream */ if (pDesc->dwValidData & DMUS_OBJ_STREAM) - IStream_Clone(pDesc->pStream, &This->pDesc->pStream); + IStream_Clone(pDesc->pStream, &This->desc.pStream); /* add new flags */ - This->pDesc->dwValidData |= pDesc->dwValidData; + This->desc.dwValidData |= pDesc->dwValidData; return S_OK; } @@ -479,20 +478,20 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -514,8 +513,8 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -639,10 +638,9 @@ HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) obj->IDirectMusicGraph_iface.lpVtbl = &DirectMusicGraphVtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicObjectVtbl; obj->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; - obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(obj->pDesc); - obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicGraph; + DM_STRUCT_INIT(&obj->desc); + obj->desc.dwValidData |= DMUS_OBJ_CLASS; + obj->desc.guidClass = CLSID_DirectMusicGraph; obj->ref = 1; list_init(&obj->Tools);

1 0

Nikolay Sivov : dmime/tests: Fix some failures on Win2k VMs.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 494c67402849566e425231eb7912a90cc8fed370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494c67402849566e425231eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:45:00 2015 +0300 dmime/tests: Fix some failures on Win2k VMs. --- dlls/dmime/tests/dmime.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f833a10..18586fd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,9 +421,10 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), - "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); @@ -452,9 +453,10 @@ static void test_segment(void) hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), - "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps);

1 0

Nikolay Sivov : dmime: Implement GetClassID() for IDirectMusicGraph.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: c6bc5f1a1ce5fb1a952ec443481505cd6ec85bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bc5f1a1ce5fb1a952ec4434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:42:54 2015 +0300 dmime: Implement GetClassID() for IDirectMusicGraph. --- dlls/dmime/graph.c | 5 +++-- dlls/dmime/tests/dmime.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7975a4f..a784007 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -439,8 +439,9 @@ static ULONG WINAPI PersistStream_Release(IPersistStream *iface) static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *clsid) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p: stub\n", This, clsid); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, clsid); + *clsid = CLSID_DirectMusicGraph; + return S_OK; } static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f7c018f..f833a10 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,8 +421,8 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Mark Harmstone : include: Add buffered paint functions to uxtheme.h.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 85d6a5b9c97dc3fbdab15f868a44e163380d3355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6a5b9c97dc3fbdab15f868… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:46 2015 +0100 include: Add buffered paint functions to uxtheme.h. --- include/uxtheme.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 4a43154..fa0d3cb 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,4 +206,11 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC, const RECT *, BP_BUFFERFORMAT, HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER, BOOL); +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER, const RECT *); +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER, const RECT *, BYTE); +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER, RGBQUAD **, int *); +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); + #endif

1 0

Francois Gouget : ole32; Fix some storage32 comments and standardize some virtual table names.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 770385262730eb88b27916aceadd620c329cc396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770385262730eb88b27916ace… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:28 2015 +0200 ole32; Fix some storage32 comments and standardize some virtual table names. --- dlls/ole32/storage32.c | 86 +++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=770385262730eb88b2791…

1 0

Stefan Dösinger : wined3d: Move volume DXTn handling to apply_format_fixups.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 7109bebd024ee68ec2b3ef0a6b29e72ded08abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7109bebd024ee68ec2b3ef0a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:10 2015 +0200 wined3d: Move volume DXTn handling to apply_format_fixups. --- dlls/d3d8/tests/device.c | 24 ++++-------------------- dlls/d3d9/tests/device.c | 24 ++++-------------------- dlls/d3dx9_36/tests/texture.c | 15 +++++++++++++-- dlls/wined3d/directx.c | 19 ------------------- dlls/wined3d/utils.c | 16 ++++++++++++++++ 5 files changed, 37 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7109bebd024ee68ec2b3e…

1 0