September 2008 - Wine-commits

Hans Leidekker : winhttp: Option WINHTTP_OPTION_SERVER_CERT_CONTEXT must return a pointer.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 6e6ffab63f1a44da02c817074c2cf009bfdd6a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6ffab63f1a44da02c817074… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 8 22:01:39 2008 +0200 winhttp: Option WINHTTP_OPTION_SERVER_CERT_CONTEXT must return a pointer. --- dlls/winhttp/session.c | 2 +- dlls/winhttp/tests/winhttp.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4e22896..927c347 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -271,7 +271,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf request_t *request = (request_t *)hdr; if (!(cert = netconn_get_certificate( &request->netconn ))) return FALSE; - memcpy( buffer, cert, sizeof(CERT_CONTEXT) ); + *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; *buflen = sizeof(cert); return TRUE; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 71e4efa..7914805 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -23,6 +23,7 @@ #include <windef.h> #include <winbase.h> #include <winhttp.h> +#include <wincrypt.h> #include "wine/test.h" @@ -556,8 +557,9 @@ static void test_secure_connection(void) static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; HANDLE ses, con, req; - DWORD size, status, policy; + DWORD size, status, policy, bitness; BOOL ret; + CERT_CONTEXT *cert; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -591,6 +593,14 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); + size = sizeof(cert); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); + ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + + size = sizeof(bitness); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); + ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Hans Leidekker : winhttp: WinHttpQueryDataAvailable should do a blocking read if more data is expected .
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 01e7d128483cf4bec401dee3fc8a479109d7a072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e7d128483cf4bec401dee3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 8 22:02:01 2008 +0200 winhttp: WinHttpQueryDataAvailable should do a blocking read if more data is expected. Spotted by Henri Verbeet. --- dlls/winhttp/net.c | 6 +----- dlls/winhttp/request.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1abfbdd..450366b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -464,11 +464,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } #ifdef FIONREAD - if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) - { - TRACE("%d bytes of queued, but unread data\n", unread); - *available += unread; - } + if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) *available = unread; #endif return TRUE; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d1fc005..46c6d6d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1238,7 +1238,26 @@ static BOOL query_data( request_t *request, LPDWORD available, BOOL async ) BOOL ret; DWORD num_bytes; - ret = netconn_query_data_available( &request->netconn, &num_bytes ); + if ((ret = netconn_query_data_available( &request->netconn, &num_bytes ))) + { + if (request->content_read < request->content_length) + { + if (!num_bytes) + { + char buffer[4096]; + size_t to_read = min( sizeof(buffer), request->content_length - request->content_read ); + + ret = netconn_recv( &request->netconn, buffer, to_read, MSG_PEEK, (int *)&num_bytes ); + if (ret && !num_bytes) WARN("expected more data to be available\n"); + } + } + else if (num_bytes) + { + WARN("extra data available %u\n", num_bytes); + ret = FALSE; + } + } + TRACE("%u bytes available\n", num_bytes); if (async) {

1 0

Alexandre Julliard : winex11: Moved the X11DRV_WindowMessage function to window.c.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 370368aace67b0bad2ce7813e800f668eaa8c027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370368aace67b0bad2ce7813e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 8 15:42:24 2008 +0200 winex11: Moved the X11DRV_WindowMessage function to window.c. --- dlls/winex11.drv/event.c | 23 ----------------------- dlls/winex11.drv/window.c | 27 +++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e431786..32befa4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1354,29 +1354,6 @@ static void X11DRV_ClientMessage( HWND hwnd, XEvent *xev ) } -/********************************************************************** - * X11DRV_WindowMessage (X11DRV.@) - */ -LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) -{ - switch(msg) - { - case WM_X11DRV_ACQUIRE_SELECTION: - return X11DRV_AcquireClipboard( hwnd ); - case WM_X11DRV_DELETE_WINDOW: - return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); - case WM_X11DRV_SET_WIN_FORMAT: - return X11DRV_set_win_format( hwnd, (XID)wp ); - case WM_X11DRV_RESIZE_DESKTOP: - X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); - return 0; - default: - FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); - return 0; - } -} - - /*********************************************************************** * X11DRV_SendInput (X11DRV.@) */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2bf41a6..4e9c779 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -412,9 +412,9 @@ static void sync_window_text( Display *display, Window win, const WCHAR *text ) /*********************************************************************** - * X11DRV_set_win_format + * set_win_format */ -BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) +static BOOL set_win_format( HWND hwnd, XID fbconfig_id ) { struct x11drv_win_data *data; XVisualInfo *vis; @@ -2153,6 +2153,29 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) } +/********************************************************************** + * X11DRV_WindowMessage (X11DRV.@) + */ +LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch(msg) + { + case WM_X11DRV_ACQUIRE_SELECTION: + return X11DRV_AcquireClipboard( hwnd ); + case WM_X11DRV_DELETE_WINDOW: + return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); + case WM_X11DRV_SET_WIN_FORMAT: + return set_win_format( hwnd, (XID)wp ); + case WM_X11DRV_RESIZE_DESKTOP: + X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); + return 0; + default: + FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); + return 0; + } +} + + /*********************************************************************** * is_netwm_supported */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f5c828..a9d1abd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -715,7 +715,6 @@ extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); extern Window X11DRV_get_whole_window( HWND hwnd ); extern Window X11DRV_get_client_window( HWND hwnd ); extern XIC X11DRV_get_ic( HWND hwnd ); -extern BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig ); extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id );

1 0

Alexandre Julliard : winex11: Support setting the window region on windows belonging to other threads.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 9d45cfde33f49339956167206a10da7229608df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d45cfde33f49339956167206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 8 15:51:08 2008 +0200 winex11: Support setting the window region on windows belonging to other threads. --- dlls/winex11.drv/window.c | 35 +++++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e9c779..e03bbb6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -336,12 +336,24 @@ static void sync_window_style( Display *display, struct x11drv_win_data *data ) * * Update the X11 window region. */ -static void sync_window_region( Display *display, struct x11drv_win_data *data, HRGN hrgn ) +static void sync_window_region( Display *display, struct x11drv_win_data *data, HRGN win_region ) { #ifdef HAVE_LIBXSHAPE + HRGN hrgn = win_region; + if (!data->whole_window) return; data->shaped = FALSE; + if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ + { + if (!(hrgn = CreateRectRgn( 0, 0, 0, 0 ))) return; + if (GetWindowRgn( data->hwnd, hrgn ) == ERROR) + { + DeleteObject( hrgn ); + hrgn = 0; + } + } + if (!hrgn) { wine_tsx11_lock(); @@ -364,6 +376,7 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, data->shaped = TRUE; } } + if (hrgn && hrgn != win_region) DeleteObject( hrgn ); #endif /* HAVE_LIBXSHAPE */ } @@ -1327,7 +1340,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat int cx, cy, mask; XSetWindowAttributes attr; WCHAR text[1024]; - HRGN hrgn; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; @@ -1375,11 +1387,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat sync_window_text( display, data->whole_window, text ); /* set the window region */ - if ((hrgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - if (GetWindowRgn( data->hwnd, hrgn ) != ERROR) sync_window_region( display, data, hrgn ); - DeleteObject( hrgn ); - } + sync_window_region( display, data, (HRGN)1 ); + wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); @@ -2142,13 +2151,10 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { sync_window_region( thread_display(), data, hrgn ); } - else if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) + else if (X11DRV_get_whole_window( hwnd )) { - FIXME( "not supported on other thread window %p\n", hwnd ); - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; + SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; } @@ -2158,6 +2164,8 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) */ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { + struct x11drv_win_data *data; + switch(msg) { case WM_X11DRV_ACQUIRE_SELECTION: @@ -2166,6 +2174,9 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); case WM_X11DRV_SET_WIN_FORMAT: return set_win_format( hwnd, (XID)wp ); + case WM_X11DRV_SET_WIN_REGION: + if ((data = X11DRV_get_win_data( hwnd ))) sync_window_region( thread_display(), data, (HRGN)1 ); + return 0; case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a9d1abd..7ed91b3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -668,6 +668,7 @@ enum x11drv_window_messages WM_X11DRV_ACQUIRE_SELECTION = 0x80001000, WM_X11DRV_DELETE_WINDOW, WM_X11DRV_SET_WIN_FORMAT, + WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP };

1 0

Erik Inge Bolsø : winealsa.drv: fix typo in IDsCaptureDriverImpl_Open.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 6fc8497519cf1ea3c6972990508a3a16fa49fc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc8497519cf1ea3c69729905… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Mon Sep 8 20:04:46 2008 +0200 winealsa.drv: fix typo in IDsCaptureDriverImpl_Open. --- dlls/winealsa.drv/dscapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 6c5b4a4..872a80c 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -884,7 +884,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_Open(PIDSCDRIVER iface) return hr; } - err = snd_pcm_open(&pcm, WOutDev[This->wDevID].pcmname, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK); + err = snd_pcm_open(&pcm, WInDev[This->wDevID].pcmname, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK); if (err < 0) goto err; err = snd_pcm_hw_params_any(pcm, hw_params); if (err < 0) goto err;

1 0

Nikolay Sivov : gdiplus: Added missed stubs for Image metadata access.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: c2de38ea47046039d21c2ef38e8c4b01d95663f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2de38ea47046039d21c2ef38… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 8 01:25:04 2008 +0400 gdiplus: Added missed stubs for Image metadata access. --- dlls/gdiplus/gdiplus.spec | 10 +++--- dlls/gdiplus/image.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 7 +++++ 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9eafbde..5de555a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -370,11 +370,11 @@ @ stdcall GdipGetPenWidth(ptr ptr) @ stdcall GdipGetPixelOffsetMode(ptr ptr) @ stdcall GdipGetPointCount(ptr ptr) -@ stub GdipGetPropertyCount -@ stub GdipGetPropertyIdList -@ stub GdipGetPropertyItem +@ stdcall GdipGetPropertyCount(ptr ptr) +@ stdcall GdipGetPropertyIdList(ptr long ptr) +@ stdcall GdipGetPropertyItem(ptr long long ptr) @ stdcall GdipGetPropertyItemSize(ptr long ptr) -@ stub GdipGetPropertySize +@ stdcall GdipGetPropertySize(ptr ptr ptr) @ stdcall GdipGetRegionBounds(ptr ptr ptr) @ stdcall GdipGetRegionBoundsI(ptr ptr ptr) @ stdcall GdipGetRegionData(ptr ptr long ptr) @@ -581,7 +581,7 @@ @ stub GdipSetPenUnit @ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) -@ stub GdipSetPropertyItem +@ stdcall GdipSetPropertyItem(ptr ptr) @ stub GdipSetRenderingOrigin @ stdcall GdipSetSmoothingMode(ptr long) @ stdcall GdipSetSolidFillColor(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 61dade9..050187a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -767,6 +767,48 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, return Ok; } +GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, + UINT num, PropertyItem* items) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return InvalidParameter; +} + +GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT* num) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return InvalidParameter; +} + +GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID* list) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return InvalidParameter; +} + +GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size, + PropertyItem* buffer) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return InvalidParameter; +} + GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID pid, UINT* size) { @@ -783,6 +825,16 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID pid, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return InvalidParameter; +} + GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GDIPCONST GUID* dimensionID, UINT* count) { @@ -952,6 +1004,16 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* item) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filename, GDIPCONST CLSID *clsidEncoder, GDIPCONST EncoderParameters *encoderParams) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 03980ea..5babd5e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -403,7 +403,14 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeade GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*); +GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage*,UINT,PROPID*); +GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage*,PROPID,UINT,PropertyItem*); GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); +GpStatus WINGDIPAPI GdipGetPropertySize(GpImage*,UINT*,UINT*); +GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage*,UINT,UINT,PropertyItem*); +GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID); +GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT);

1 0

Henri Verbeet : wined3d: Translate one pixel down after flipping for offscreen rendering.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 932e95c111118b643650d6643e47be0ddb5528a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932e95c111118b643650d6643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 8 10:15:51 2008 +0200 wined3d: Translate one pixel down after flipping for offscreen rendering. --- dlls/wined3d/state.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6111995..61ccab6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3905,19 +3905,32 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock divide by the Width/Height, so we need the half range(1.0) to translate by half a pixel. + Note that when rendering offscreen, we need to translate 1 pixel + (2/h in normalized device coordinates) down after doing the flip, + because of the way the viewport transformation works in OpenGL: + (-1,1) in normalized device coordinates corresponds to the upper + left corner of the upper left pixel in the viewport. (-1,-1) + corresponds to lower left corner of the lower left pixel in the + viewport. In other words, the upper left corner of the pixel + *below* the lower left pixel in the viewport. See also section + 2.11.1 "Controlling the Viewport" of the GL 2.1 spec. + The other fun is that d3d's output z range after the transformation is [0;1], but opengl's is [-1;1]. Since the z buffer is in range [0;1] for both, gl scales [-1;1] to [0;1]. This would mean that we end up in [0.5;1] and loose a lot of Z buffer precision and the clear values do not match in the z test. Thus scale [0;1] to [-1;1], so when gl undoes that we utilize the full z range */ - glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, -1.0); - checkGLcall("glTranslatef (1.0 / width, -1.0 / height, -1.0)"); + if (stateblock->wineD3DDevice->render_offscreen) { /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ + glTranslatef(1.0 / stateblock->viewport.Width, 1.0 / stateblock->viewport.Height, -1.0); + checkGLcall("glTranslatef(1.0 / width, 1.0 / height, -1.0)"); glScalef(1.0, -1.0, 2.0); } else { + glTranslatef(1.0 / stateblock->viewport.Width, -1.0 / stateblock->viewport.Height, -1.0); + checkGLcall("glTranslatef(1.0 / width, -1.0 / height, -1.0)"); glScalef(1.0, 1.0, 2.0); } checkGLcall("glScalef"); @@ -4504,7 +4517,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W */ if (useVertexShaderFunction) { device->posFixup[1] = device->render_offscreen ? -1.0 : 1.0; - device->posFixup[3] = -device->posFixup[1] / stateblock->viewport.Height; + device->posFixup[3] = -1.0 / stateblock->viewport.Height; } } @@ -4636,7 +4649,7 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -stateblock->wineD3DDevice->posFixup[1] / stateblock->viewport.Height; + stateblock->wineD3DDevice->posFixup[3] = -1.0 / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

Nikolay Sivov : gdiplus: Partially implemented GdipTestControl.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: d923d78e9549d6460925f4055d710063b4fc3152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d923d78e9549d6460925f4055… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Sep 7 01:40:26 2008 +0400 gdiplus: Partially implemented GdipTestControl. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 21 +++++++++++++++++++++ dlls/gdiplus/tests/image.c | 12 ++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f7b1d5d..9eafbde 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -602,7 +602,7 @@ @ stdcall GdipStartPathFigure(ptr) @ stdcall GdipStringFormatGetGenericDefault(ptr) @ stdcall GdipStringFormatGetGenericTypographic(ptr) -@ stub GdipTestControl +@ stdcall GdipTestControl(long ptr) @ stdcall GdipTransformMatrixPoints(ptr ptr long) @ stdcall GdipTransformMatrixPointsI(ptr ptr long) @ stdcall GdipTransformPath(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bcdc64f..61dade9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1280,3 +1280,24 @@ GpStatus WINGDIPAPI GdipGetImageFlags(GpImage *image, UINT *flags) return Ok; } + +GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum control, void *param) +{ + TRACE("(%d, %p)\n", control, param); + + switch(control){ + case TestControlForceBilinear: + if(param) + FIXME("TestControlForceBilinear not handled\n"); + break; + case TestControlNoICM: + if(param) + FIXME("TestControlNoICM not handled\n"); + break; + case TestControlGetBuildNumber: + *((DWORD*)param) = 3102; + break; + } + + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 46e63f2..5d8c535 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -518,6 +518,17 @@ static void test_GdipCloneImage(void) expect(Ok, stat); } +static void test_testcontrol(void) +{ + GpStatus stat; + DWORD param; + + param = 0; + stat = GdipTestControl(TestControlGetBuildNumber, &param); + expect(Ok, stat); + ok(param != 0, "Build number expected, got %u\n", param); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -540,6 +551,7 @@ START_TEST(image) test_GdipCreateBitmapFromHBITMAP(); test_GdipGetImageFlags(); test_GdipCloneImage(); + test_testcontrol(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index bc52bd5..f3cdad8 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -329,6 +329,13 @@ enum CoordinateSpace CoordinateSpaceDevice }; +enum GpTestControlEnum +{ + TestControlForceBilinear = 0, + TestControlNoICM = 1, + TestControlGetBuildNumber = 2 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -364,6 +371,7 @@ typedef enum ImageCodecFlags ImageCodecFlags; typedef enum CombineMode CombineMode; typedef enum FlushIntention FlushIntention; typedef enum CoordinateSpace CoordinateSpace; +typedef enum GpTestControlEnum GpTestControlEnum; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cbb59e5..03980ea 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -537,6 +537,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL); GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL); GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); +GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum,void*); + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : gdiplus: Some defines for Image metadata API.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: cda96c0546be3a35dee48e9eac9c3fd326b98f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda96c0546be3a35dee48e9ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 8 01:04:20 2008 +0400 gdiplus: Some defines for Image metadata API. --- include/gdiplusimaging.h | 261 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 261 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cda96c0546be3a35dee48…

1 0

Reece Dunn : secur32: Fixed the logic on some of the schannel tests.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: f14fe767b37d46a2d5ee1dc9958c9c9878c000ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14fe767b37d46a2d5ee1dc99… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Sep 7 11:28:11 2008 +0100 secur32: Fixed the logic on some of the schannel tests. --- dlls/secur32/tests/schannel.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index dc10ccd..881f443 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -267,12 +267,12 @@ static void testAcquireSecurityContext(void) schanCred.paCred = &certs[0]; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", st); @@ -283,12 +283,12 @@ static void testAcquireSecurityContext(void) schanCred.paCred = &certs[1]; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", st);

1 0