wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Andrey Turkin : server: Store I/O completion information in async structure .
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 3afbee521845443e1a757a1b0afbd6d0abccbd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afbee521845443e1a757a1b0… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Dec 17 22:06:17 2007 +0300 server: Store I/O completion information in async structure. This is to allow completions to be sent on handle close. Also this can be helpful for AcceptEx/TransmitFile implementation. --- dlls/ntdll/tests/file.c | 14 +++++++++++++- server/async.c | 12 ++++++------ server/fd.c | 10 +++++----- server/file.h | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4e1833c..8d2ffc3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -566,9 +566,21 @@ static void test_iocp_fileio(HANDLE h) ok( U(ioSb).Status == STATUS_SUCCESS, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); } + + ReadFile( hPipeSrv, buf, sizeof(buf), &read, &o); + CloseHandle( hPipeSrv ); + count = get_pending_msgs(h); + ok( count == 1, "Unexpected msg count: %ld\n", count ); + if (get_msg(h)) + { + ok( completionKey == CKEY_SECOND, "Invalid completion key: %lx\n", completionKey ); + ok( ioSb.Information == 0, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + /* wine sends wrong status here */ + todo_wine ok( U(ioSb).Status == STATUS_PIPE_BROKEN, "Invalid ioSb.Status: %x\n", U(ioSb).Status); + ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); + } } - CloseHandle( hPipeSrv ); CloseHandle( hPipeClt ); } diff --git a/server/async.c b/server/async.c index ae58636..ff5f7a6 100644 --- a/server/async.c +++ b/server/async.c @@ -42,6 +42,8 @@ struct async struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ struct event *event; + struct completion *completion; + unsigned long comp_key; async_data_t data; /* data for async I/O call */ }; @@ -121,6 +123,7 @@ static void async_destroy( struct object *obj ) if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); + if (async->completion) release_object( async->completion ); release_object( async->queue ); release_object( async->thread ); } @@ -146,10 +149,6 @@ void async_terminate( struct async *async, unsigned int status ) return; } - /* send error completion event */ - if (status != STATUS_ALERTED && async->data.cvalue && async->queue->fd) - fd_add_completion( async->queue->fd, async->data.cvalue, status, 0 ); - memset( &data, 0, sizeof(data) ); data.type = APC_ASYNC_IO; data.async_io.func = async->data.callback; @@ -214,6 +213,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->data = *data; async->timeout = NULL; async->queue = (struct async_queue *)grab_object( queue ); + fd_assign_completion( queue->fd, &async->completion, &async->comp_key ); list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); @@ -257,8 +257,8 @@ void async_set_result( struct object *obj, unsigned int status, unsigned long to if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; - if (async->data.cvalue && async->queue->fd) - fd_add_completion( async->queue->fd, async->data.cvalue, status, total ); + if (async->completion && async->data.cvalue) + add_completion( async->completion, async->comp_key, async->data.cvalue, status, total ); if (async->data.apc) { apc_call_t data; diff --git a/server/fd.c b/server/fd.c index 95a0520..c7f20d5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1922,11 +1922,10 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl return fd; } -/* add a completion result to a completion queue attached to the fd */ -void fd_add_completion( struct fd *fd, unsigned long cvalue, unsigned int status, unsigned long information ) +void fd_assign_completion( struct fd *fd, struct completion **p_port, unsigned long *p_key ) { - if (fd->completion) - add_completion( fd->completion, fd->comp_key, cvalue, status, information ); + *p_key = fd->comp_key; + *p_port = fd->completion ? (struct completion *)grab_object( fd->completion ) : NULL; } /* flush a file buffers */ @@ -2066,7 +2065,8 @@ DECL_HANDLER(add_fd_completion) struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); if (fd) { - fd_add_completion( fd, req->cvalue, req->status, req->information ); + if (fd->completion) + add_completion( fd->completion, fd->comp_key, req->cvalue, req->status, req->information ); release_object( fd ); } } diff --git a/server/file.h b/server/file.h index e444007..26d1702 100644 --- a/server/file.h +++ b/server/file.h @@ -139,7 +139,7 @@ extern void async_set_result( struct object *obj, unsigned int status, unsigned extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); -extern void fd_add_completion( struct fd *fd, unsigned long cvalue, unsigned int status, unsigned long information ); +extern void fd_assign_completion( struct fd *fd, struct completion **p_port, unsigned long *p_key ); /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)

1 0

Kirill K. Smirnov : ws2_32: Fix flags conversion in getnameinfo() function.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 01380b0554f685d85bf0dca6363cd55003ba482d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01380b0554f685d85bf0dca63… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 17 17:40:02 2007 +0300 ws2_32: Fix flags conversion in getnameinfo() function. --- dlls/ws2_32/socket.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3abb5a0..12024f5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -327,6 +327,15 @@ static const int ws_aiflag_map[][2] = */ }; +static const int ws_niflag_map[][2] = +{ + MAP_OPTION( NI_NOFQDN ), + MAP_OPTION( NI_NUMERICHOST ), + MAP_OPTION( NI_NAMEREQD ), + MAP_OPTION( NI_NUMERICSERV ), + MAP_OPTION( NI_DGRAM ), +}; + static const int ws_eai_map[][2] = { MAP_OPTION( EAI_AGAIN ), @@ -3327,7 +3336,7 @@ void WINAPI WS_freeaddrinfo(struct WS_addrinfo *res) } } -/* helper functions for getaddrinfo() */ +/* helper functions for getaddrinfo()/getnameinfo() */ static int convert_aiflag_w2u(int winflags) { int i, unixflags = 0; @@ -3341,6 +3350,19 @@ static int convert_aiflag_w2u(int winflags) { return unixflags; } +static int convert_niflag_w2u(int winflags) { + int i, unixflags = 0; + + for (i=0;i<sizeof(ws_niflag_map)/sizeof(ws_niflag_map[0]);i++) + if (ws_niflag_map[i][0] & winflags) { + unixflags |= ws_niflag_map[i][1]; + winflags &= ~ws_niflag_map[i][0]; + } + if (winflags) + FIXME("Unhandled windows NI_xxx flags %x\n", winflags); + return unixflags; +} + static int convert_aiflag_u2w(int unixflags) { int i, winflags = 0; @@ -3498,7 +3520,7 @@ int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, WSASetLastError(WSAEFAULT); return WSA_NOT_ENOUGH_MEMORY; } - ret = getnameinfo(&sa_u.addr, size, host, hostlen, serv, servlen, convert_aiflag_w2u(flags)); + ret = getnameinfo(&sa_u.addr, size, host, hostlen, serv, servlen, convert_niflag_w2u(flags)); return convert_eai_u2w(ret); #else FIXME("getnameinfo() failed, not found during buildtime.\n");

1 0

Francois Gouget : configure: Work around an Xcode 3. 0 bug when detecting the libGL library.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: d701ee22f3b4ad8937f824dd670ffeba50f7ec5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d701ee22f3b4ad8937f824dd6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 18 10:17:20 2007 +0100 configure: Work around an Xcode 3.0 bug when detecting the libGL library. --- configure | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- configure.ac | 17 +++++++---- 2 files changed, 99 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 2747d1b..9a88bd5 100755 --- a/configure +++ b/configure @@ -10479,14 +10479,97 @@ fi if test "x$ac_cv_lib_soname_GL" = "x"; then { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } + { echo "$as_me:$LINENO: checking for -lGL" >&5 +echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_GL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glXCreateContext (); +int +main () +{ +return glXCreateContext (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*$libGL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_GL" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } if test -f /usr/X11R6/lib/libGL.a - then - wine_warnings="$wine_warnings|/usr/X11R6/lib/libGL.a is present on your system. + then + wine_warnings="$wine_warnings|/usr/X11R6/lib/libGL.a is present on your system. This probably prevents linking to OpenGL. Try deleting the file and restarting configure." - else - wine_warnings="$wine_warnings|No OpenGL library found on this system. + else + wine_warnings="$wine_warnings|No OpenGL library found on this system. Wine will be built without OpenGL or Direct3D support." - fi + fi +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBGL "$ac_cv_lib_soname_GL" +_ACEOF + + OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" + OPENGLFILES='$(OPENGLFILES)' + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENGL 1 +_ACEOF + +fi + else { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5 echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; } diff --git a/configure.ac b/configure.ac index 492d363..e30ba97 100644 --- a/configure.ac +++ b/configure.ac @@ -651,14 +651,19 @@ Wine will be built without XComposite support. (winex11.drv)]) [OPENGL_LIBS="-lGL" OPENGLFILES='$(OPENGLFILES)' AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], - [if test -f /usr/X11R6/lib/libGL.a - then - WINE_WARNING([/usr/X11R6/lib/libGL.a is present on your system. + [WINE_CHECK_SONAME(GL,glXCreateContext, + [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" + OPENGLFILES='$(OPENGLFILES)' + AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], + [if test -f /usr/X11R6/lib/libGL.a + then + WINE_WARNING([/usr/X11R6/lib/libGL.a is present on your system. This probably prevents linking to OpenGL. Try deleting the file and restarting configure.]) - else - WINE_WARNING([No OpenGL library found on this system. + else + WINE_WARNING([No OpenGL library found on this system. Wine will be built without OpenGL or Direct3D support.]) - fi], + fi], + $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) dnl Check for GLU32 library.

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: f1c27eda6bf8924a0e36c0e8546f57e3449f7748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c27eda6bf8924a0e36c0e85… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 09:48:16 2007 +0100 Assorted spelling fixes. --- dlls/comctl32/commctrl.c | 2 +- dlls/d3d9/tests/device.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/shell32/shfldr_unixfs.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 60ea2ef..7fe5676 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -715,7 +715,7 @@ InitCommonControls (void) * * NOTES * Probaly all versions of comctl32 initializes the Win95 controls in DllMain - * during DLL initializaiton. Starting from comctl32 v5.82 all the controls + * during DLL initialization. Starting from comctl32 v5.82 all the controls * are initialized there. We follow this behaviour and this function is just * a dummy. * diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ff0975f..5598ecb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -183,7 +183,7 @@ static void test_swapchain(void) ok(backbuffer != NULL, "The back buffer is NULL\n"); if(backbuffer) IDirect3DSurface9_Release(backbuffer); - /* Try to get a nonexistant swapchain */ + /* Try to get a nonexistent swapchain */ hr = IDirect3DDevice9_GetSwapChain(pDevice, 1, &swapchainX); ok(hr == D3DERR_INVALIDCALL, "GetSwapChain on an nonexistent swapchain returned (%s)\n", DXGetErrorString9(hr)); ok(swapchainX == NULL, "Swapchain 1 is %p\n", swapchainX); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 645ac19..7e139c8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2792,7 +2792,7 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, * TranslateCharsetInfo [GDI32.@] * * Fills a CHARSETINFO structure for a character set, code page, or - * font. This allows making the correspondence between different labelings + * font. This allows making the correspondence between different labels * (character set, Windows, ANSI, and OEM codepages, and Unicode ranges) * of the same encoding. * diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 72c1965..e4cea4a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -482,7 +482,7 @@ static inline void UNIXFS_seconds_since_1970_to_dos_date_time( * buffer 'pIDL'. * * PARAMS - * pszUnixPath [I] An absolute path. The SHITEMID will be build for the last component. + * pszUnixPath [I] An absolute path. The SHITEMID will be built for the last component. * pIDL [O] SHITEMID will be constructed here. * * RETURNS

1 0

David Adam : d3dx8: Implement D3DXCreateMatrixStack.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 796b2dd0a597da3b9bf1481da93a07db04415a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796b2dd0a597da3b9bf1481da… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Dec 17 23:12:33 2007 +0100 d3dx8: Implement D3DXCreateMatrixStack. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 28b772e..0ccfdf2 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -68,7 +68,7 @@ @ stdcall D3DXPlaneTransform(ptr ptr ptr) @ stdcall D3DXColorAdjustSaturation(ptr ptr long) @ stdcall D3DXColorAdjustContrast(ptr ptr long) -@ stub D3DXCreateMatrixStack +@ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateFont(ptr ptr ptr) @ stub D3DXCreateFontIndirect @ stub D3DXCreateSprite diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 33a24fc..0446198 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -587,6 +587,23 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) /*_________________D3DXMatrixStack____________________*/ +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) +{ + ID3DXMatrixStackImpl* object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl)); + if ( object == NULL ) + { + *ppstack = NULL; + return E_OUTOFMEMORY; + } + object->lpVtbl = &ID3DXMatrixStack_Vtbl; + object->ref = 1; + object->current = 0; + *ppstack = (LPD3DXMATRIXSTACK)object; + return D3D_OK; +} + static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppobj) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;

1 0

David Adam : d3dx8: Add basic functions and stubs for MatrixStack.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 3175d58ffee4144aa2f8d04dd3342e12ca5359dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3175d58ffee4144aa2f8d04dd… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Dec 18 00:05:19 2007 +0100 d3dx8: Add basic functions and stubs for MatrixStack. --- dlls/d3dx8/d3dx8_private.h | 20 ++++++ dlls/d3dx8/math.c | 164 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8_private.h b/dlls/d3dx8/d3dx8_private.h index 63cc91e..923f285 100644 --- a/dlls/d3dx8/d3dx8_private.h +++ b/dlls/d3dx8/d3dx8_private.h @@ -2,6 +2,7 @@ * Direct3D X 8 private include file * * Copyright 2002 Raphael Junqueira + * Copyright 2007 David Adam * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ /* Interfaces */ typedef struct ID3DXBufferImpl ID3DXBufferImpl; typedef struct ID3DXFontImpl ID3DXFontImpl; +typedef struct ID3DXMatrixStackImpl ID3DXMatrixStackImpl; /* ----------- */ /* ID3DXBuffer */ @@ -70,4 +72,22 @@ struct ID3DXFontImpl /* ID3DXFont fields */ }; +/* ----------- */ +/* ID3DXMatrix */ +/* ----------- */ + +/***************************************************************************** + * ID3DXMatrixStackImpl implementation structure + */ +struct ID3DXMatrixStackImpl +{ + /* IUnknown fields */ + const ID3DXMatrixStackVtbl *lpVtbl; + LONG ref; + + /* ID3DXMatrixStack fields */ + int current; + D3DXMATRIX *stack; +}; + #endif /*__WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 18115b4..33a24fc 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -26,12 +26,14 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "d3dx8.h" +#include "d3dx8_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx8); +static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; + /*_________________D3DXColor____________________*/ D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s) @@ -583,6 +585,166 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) return pout; } +/*_________________D3DXMatrixStack____________________*/ + +static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppobj) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXMatrixStack)) + { + ID3DXMatrixStack_AddRef(iface); + *ppobj = This; + return S_OK; + } + *ppobj = NULL; + ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) : AddRef from %d\n", This, ref - 1); + return ref; +} + +static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + if ( !ref ) HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) : ReleaseRef to %d\n", This, ref); + return ref; +} + +static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return NULL; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) +{ + ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + FIXME("(%p) : stub\n",This); + return D3D_OK; +} + +static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl = +{ + ID3DXMatrixStackImpl_QueryInterface, + ID3DXMatrixStackImpl_AddRef, + ID3DXMatrixStackImpl_Release, + ID3DXMatrixStackImpl_Pop, + ID3DXMatrixStackImpl_Push, + ID3DXMatrixStackImpl_LoadIdentity, + ID3DXMatrixStackImpl_LoadMatrix, + ID3DXMatrixStackImpl_MultMatrix, + ID3DXMatrixStackImpl_MultMatrixLocal, + ID3DXMatrixStackImpl_RotateAxis, + ID3DXMatrixStackImpl_RotateAxisLocal, + ID3DXMatrixStackImpl_RotateYawPitchRoll, + ID3DXMatrixStackImpl_RotateYawPitchRollLocal, + ID3DXMatrixStackImpl_Scale, + ID3DXMatrixStackImpl_ScaleLocal, + ID3DXMatrixStackImpl_Translate, + ID3DXMatrixStackImpl_TranslateLocal, + ID3DXMatrixStackImpl_GetTop +}; + /*_________________D3DXPLANE________________*/ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal)

1 0

David Adam : d3dx8: Rename d3dx_core_private.h to d3dx8_private.h.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 303b1a110daf6bfc3c632a1cb0d1c79aa8f9b0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=303b1a110daf6bfc3c632a1cb… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Dec 17 23:08:16 2007 +0100 d3dx8: Rename d3dx_core_private.h to d3dx8_private.h. --- dlls/d3dx8/d3dx8_main.c | 3 +-- .../d3dx8/{d3dx8core_private.h => d3dx8_private.h} | 8 ++++---- dlls/d3dx8/d3dxbuffer.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index 16c3740..c24aedc 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -30,8 +30,7 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "d3dx8core.h" -#include "d3dx8core_private.h" +#include "d3dx8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8_private.h similarity index 93% rename from dlls/d3dx8/d3dx8core_private.h rename to dlls/d3dx8/d3dx8_private.h index fb98b38..63cc91e 100644 --- a/dlls/d3dx8/d3dx8core_private.h +++ b/dlls/d3dx8/d3dx8_private.h @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_D3DX8CORE_PRIVATE_H -#define __WINE_D3DX8CORE_PRIVATE_H +#ifndef __WINE_D3DX8_PRIVATE_H +#define __WINE_D3DX8_PRIVATE_H #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "d3dx8core.h" +#include "d3dx8.h" /* Interfaces */ typedef struct ID3DXBufferImpl ID3DXBufferImpl; @@ -70,4 +70,4 @@ struct ID3DXFontImpl /* ID3DXFont fields */ }; -#endif /*__WINE_D3DX8CORE_PRIVATE_H */ +#endif /*__WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c index 369714c..56591c0 100644 --- a/dlls/d3dx8/d3dxbuffer.c +++ b/dlls/d3dx8/d3dxbuffer.c @@ -31,7 +31,7 @@ #include "wine/debug.h" #include "d3d8.h" -#include "d3dx8core_private.h" +#include "d3dx8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d);

1 0

David Adam : d3dx8: Add definition for MatrixStack.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 9558fd0f32b9d1e49fe61365ecf3ba3924d6ac63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9558fd0f32b9d1e49fe61365e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Dec 17 23:49:09 2007 +0100 d3dx8: Add definition for MatrixStack. --- dlls/dxguid/dx8guid.c | 2 +- include/d3dx8math.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx8guid.c b/dlls/dxguid/dx8guid.c index 78c6114..6b51c9e 100644 --- a/dlls/dxguid/dx8guid.c +++ b/dlls/dxguid/dx8guid.c @@ -31,4 +31,4 @@ #include "initguid.h" #include "d3d8.h" -#include "d3dx8core.h" +#include "d3dx8.h" diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 1863ac0..755698a 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -30,6 +30,11 @@ #define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f)) #define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI)) +typedef struct ID3DXMatrixStack *LPD3DXMATRIXSTACK; + +DEFINE_GUID(IID_ID3DXMatrixStack, +0xe3357330, 0xcc5e, 0x11d2, 0xa4, 0x34, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); + typedef struct D3DXVECTOR2 { #ifdef __cplusplus @@ -345,6 +350,64 @@ D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, } #endif +#define INTERFACE ID3DXMatrixStack +DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(Pop)(THIS) PURE; + STDMETHOD(Push)(THIS) PURE; + STDMETHOD(LoadIdentity)(THIS) PURE; + STDMETHOD(LoadMatrix)(THIS_ CONST LPD3DXMATRIX) PURE; + STDMETHOD(MultMatrix)(THIS_ CONST LPD3DXMATRIX) PURE; + STDMETHOD(MultMatrixLocal)(THIS_ CONST LPD3DXMATRIX) PURE; + STDMETHOD(RotateAxis)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE; + STDMETHOD(RotateAxisLocal)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE; + STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD(Scale)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD(ScaleLocal)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD(Translate)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD(TranslateLocal)(THIS_ FLOAT, FLOAT, FLOAT) PURE; + STDMETHOD_(LPD3DXMATRIX, GetTop)(THIS) PURE; +}; + +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) + +#define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DXMatrixStack_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DXMatrixStack_Release(p) (p)->lpVtbl->Release(p) +#define ID3DXMAtrixStack_Pop(p) (p)->lpVtbl->Pop(p) +#define ID3DXMatrixStack_Push(p) (p)->lpVtbl->Push(p) +#define ID3DXMatrixStack_LoadIdentity(p) (p)->lpVtbl->LoadIdentity(p) +#define ID3DXMatrixStack_LoadMatrix(p,a) (p)->lpVtbl->LoadMatrix(p,a) +#define ID3DXMatrixStack_MultMatrix(p,a) (p)->lpVtbl->MultMatrix(p,a) +#define ID3DXMatrixStack_MultMatrixLocal(p,a) (p)->lpVtbl->MultMatrixLocal(p,a) +#define ID3DXMatrixStack_RotateAxis(p,a,b) (p)->lpVtbl->RotateAxis(p,a,b) +#define ID3DXMatrixStack_RotateAxisLocal(p,a,b) (p)->lpVtbl->RotateAxisLocal(p,a,b) +#define ID3DXMatrixStack_RotateYawPitchRoll(p,a,b,c) (p)->lpVtbl->RotateYawPitchRoll(p,a,b,c) +#define ID3DXMatrixStack_RotateYawPitchRollLocal(p,a,b,c) (p)->lpVtbl->RotateYawPitchRollLocal(p,a,b,c) +#define ID3DXMatrixStack_Scale(p,a,b,c) (p)->lpVtbl->Scale(p,a,b,c) +#define ID3DXMatrixStack_ScaleLocal(p,a,b,c) (p)->lpVtbl->ScaleLocal(p,a,b,c) +#define ID3DXMatrixStack_Translate(p,a,b,c) (p)->lpVtbl->Translate(p,a,b,c) +#define ID3DXMatrixStack_TranslateLocal(p,a,b,c) (p)->lpVtbl->TranslateLocal(p,a,b,c) +#define ID3DXMatrixStack_GetTop(p) (p)->lpVtbl->GetTop(p) + +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); + +#ifdef __cplusplus +} +#endif + #include <d3dx8math.inl> #endif /* __D3DX8MATH_H__ */

1 0

Stefan Dösinger : wined3d: Split up the render target -> render target blit.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 83c0b13c5b2bf710542f365b6aa876b103a46147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c0b13c5b2bf710542f365b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 16 00:18:20 2007 +0100 wined3d: Split up the render target -> render target blit. --- dlls/wined3d/surface.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bedb306..7971908 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2967,9 +2967,23 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * TRACE("Unsupported blit between buffers on the same swapchain\n"); return WINED3DERR_INVALIDCALL; - } else if((dstSwapchain || This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) && - (srcSwapchain || SrcSurface == myDevice->render_targets[0]) ) { - ERR("Can't perform hardware blit between 2 different swapchains, falling back to software\n"); + } else if(dstSwapchain && dstSwapchain == srcSwapchain) { + FIXME("Implement hardware blit between two surfaces on the same swapchain\n"); + return WINED3DERR_INVALIDCALL; + } else if(dstSwapchain && srcSwapchain) { + FIXME("Implement hardware blit between two different swapchains\n"); + return WINED3DERR_INVALIDCALL; + } else if(dstSwapchain) { + if(SrcSurface != myDevice->render_targets[0]) { + ERR("Unexpected render target -> render target blit\n"); + } + FIXME("Implement blit from active render target to a swapchain\n"); + return WINED3DERR_INVALIDCALL; + } else if(srcSwapchain) { + if(This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { + ERR("Unexpected render target -> render target blit\n"); + } + FIXME("Implement blit from a swapchain to the active render target\n"); return WINED3DERR_INVALIDCALL; }

1 0

Stefan Dösinger : wined3d: Implement D3DFMT_G16R16.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: df77e28854ca53e4e2c8fdd081d604400c02473d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df77e28854ca53e4e2c8fdd08… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 15 23:47:10 2007 +0100 wined3d: Implement D3DFMT_G16R16. --- dlls/d3d9/tests/visual.c | 73 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 4 ++- dlls/wined3d/surface.c | 30 ++++++++++++++++ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 125c535..764b5fa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2054,6 +2054,78 @@ out: IDirect3D9_Release(d3d); } +static void g16r16_texture_test(IDirect3DDevice9 *device) +{ + IDirect3D9 *d3d = NULL; + HRESULT hr; + IDirect3DTexture9 *texture = NULL; + D3DLOCKED_RECT lr; + DWORD *data; + DWORD color, red, green, blue; + float quad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + + memset(&lr, 0, sizeof(lr)); + IDirect3DDevice9_GetDirect3D(device, &d3d); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_TEXTURE, D3DFMT_G16R16) != D3D_OK) { + skip("D3DFMT_G16R16 textures not supported\n"); + goto out; + } + + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_G16R16, + D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); + if(!texture) { + skip("Failed to create D3DFMT_G16R16 texture\n"); + goto out; + } + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed with %s\n", DXGetErrorString9(hr)); + data = lr.pBits; + *data = 0x0f00f000; + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 240, 320); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(blue == 0xff && red >= 0xef && red <= 0xf1 && green >= 0x0e && green <= 0x10, + "D3DFMT_G16R16 with value 0x00ffff00 has color %08x, expected 0x00F00FFF\n", color); + +out: + if(texture) IDirect3DTexture9_Release(texture); + IDirect3D9_Release(d3d); +} + static void texture_transform_flags_test(IDirect3DDevice9 *device) { HRESULT hr; @@ -5442,6 +5514,7 @@ START_TEST(visual) alpha_test(device_ptr); release_buffer_test(device_ptr); float_texture_test(device_ptr); + g16r16_texture_test(device_ptr); texture_transform_flags_test(device_ptr); autogen_mipmap_test(device_ptr); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 31f2d63..7badb4c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1746,6 +1746,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_R16F: case WINED3DFMT_X8L8V8U8: case WINED3DFMT_L6V5U5: + case WINED3DFMT_G16R16: TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); return WINED3DERR_NOTAVAILABLE; @@ -1842,6 +1843,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_A8B8G8R8: case WINED3DFMT_X8B8G8R8: case WINED3DFMT_P8: + case WINED3DFMT_G16R16: TRACE_(d3d_caps)("[OK]\n"); return WINED3D_OK; case WINED3DFMT_R16F: @@ -1973,6 +1975,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_X8B8G8R8: case WINED3DFMT_A2R10G10B10: case WINED3DFMT_A2B10G10R10: + case WINED3DFMT_G16R16: TRACE_(d3d_caps)("[OK]\n"); return WINED3D_OK; @@ -2045,7 +2048,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; /* Not supported */ - case WINED3DFMT_G16R16: case WINED3DFMT_A16B16G16R16: case WINED3DFMT_A8R3G3B2: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 692b506..bedb306 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1567,6 +1567,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 6; break; + case WINED3DFMT_G16R16: + *convert = CONVERT_G16R16; + *format = GL_RGB; + *internal = GL_RGB16_EXT; + *type = GL_UNSIGNED_SHORT; + *target_bpp = 6; + break; + default: break; } @@ -1883,6 +1891,28 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; } + + case CONVERT_G16R16: + { + unsigned int x, y; + WORD *Source; + WORD *Dest; + + for(y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + WORD green = (*Source++); + WORD red = (*Source++); + Dest[0] = green; + Dest[1] = red; + Dest[2] = 0xffff; + Dest += 3; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cee47eb..a24f213 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -165,7 +165,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A2B10G10R10 ,GL_RGBA ,GL_RGBA , 0, GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV }, {WINED3DFMT_A8B8G8R8 ,GL_RGBA8 ,GL_RGBA8 , 0, GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_X8B8G8R8 ,GL_RGB8 ,GL_RGB8 , 0, GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, - {WINED3DFMT_G16R16 ,0 ,0 , 0, 0 ,0 }, + {WINED3DFMT_G16R16 ,GL_RGB16_EXT ,GL_RGB16_EXT , 0, GL_RGB ,GL_UNSIGNED_SHORT }, {WINED3DFMT_A2R10G10B10 ,GL_RGBA ,GL_RGBA , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV }, {WINED3DFMT_A16B16G16R16 ,GL_RGBA16_EXT ,GL_RGBA16_EXT , 0, GL_RGBA ,GL_UNSIGNED_SHORT }, /* Luminance */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6207162..f4c7c0b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1238,7 +1238,8 @@ typedef enum { CONVERT_V16U16, CONVERT_A4L4, CONVERT_R32F, - CONVERT_R16F + CONVERT_R16F, + CONVERT_G16R16, } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2007