wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Alexandre Julliard : kernel32: Use FIELD_OFFSET instead of pointer cast.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 3eea9a61936484ffef3babe50c812ca41a52b906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eea9a61936484ffef3babe50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 12:38:58 2007 +0200 kernel32: Use FIELD_OFFSET instead of pointer cast. --- dlls/kernel32/ne_segment.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index b4f6e7c..7758d6d 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -694,7 +694,7 @@ static BOOL NE_InitDLL( NE_MODULE *pModule ) context.SegGs = wine_get_gs(); context.SegCs = SEL(pSegTable[SELECTOROF(pModule->ne_csip)-1].hSeg); context.Eip = OFFSETOF(pModule->ne_csip); - context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); pModule->ne_csip = 0; /* Don't initialize it twice */ TRACE_(dll)("Calling LibMain for %.*s, cs:ip=%04x:%04x ds=%04x di=%04x cx=%04x\n", @@ -799,7 +799,7 @@ static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason ) context.SegGs = wine_get_gs(); context.SegCs = HIWORD(entryPoint); context.Eip = LOWORD(entryPoint); - context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); args[7] = HIWORD(dwReason); args[6] = LOWORD(dwReason);

1 0

Karl Relton : wineserver: Allow already peeked messages to merge.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: e764e6136991b7f5fde73fb17fd38ab343bb6e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e764e6136991b7f5fde73fb17… Author: Karl Relton <karllinuxtest.relton(a)ntlworld.com> Date: Thu Oct 4 20:51:37 2007 +0100 wineserver: Allow already peeked messages to merge. --- dlls/user32/tests/msg.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 1 - 2 files changed, 102 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 527f4c2..82dd503 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8545,6 +8545,107 @@ todo_wine { DestroyWindow(info.hwnd); } +static void wait_move_event(HWND hwnd, int x, int y) +{ + MSG msg; + DWORD time; + BOOL ret; + int go = 0; + + time = GetTickCount(); + while (GetTickCount() - time < 200 && !go) { + ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); + go = ret && msg.pt.x > x && msg.pt.y > y; + } +} + +#define STEP 20 +static void test_PeekMessage2(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + UINT message; + DWORD time1, time2, time3; + int x1, y1, x2, y2, x3, y3; + POINT pos; + + time1 = time2 = time3 = 0; + x1 = y1 = x2 = y2 = x3 = y3 = 0; + + /* Initialise window and make sure it is ready for events */ + hwnd = CreateWindow("TestWindowClass", "PeekMessage2", WS_OVERLAPPEDWINDOW, + 10, 10, 800, 800, NULL, NULL, NULL, NULL); + assert(hwnd); + trace("Window for test_PeekMessage2 %p\n", hwnd); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + SetFocus(hwnd); + GetCursorPos(&pos); + SetCursorPos(100, 100); + mouse_event(MOUSEEVENTF_MOVE, -STEP, -STEP, 0, 0); + flush_events(); + + /* Do initial mousemove, wait until we can see it + and then do our test peek with PM_NOREMOVE. */ + mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); + wait_move_event(hwnd, 80, 80); + + ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); + ok(ret, "no message available\n"); + if (ret) { + trace("1st move event: %04x %x %d %d\n", msg.message, msg.time, msg.pt.x, msg.pt.y); + message = msg.message; + time1 = msg.time; + x1 = msg.pt.x; + y1 = msg.pt.y; + ok(message == WM_MOUSEMOVE, "message not WM_MOUSEMOVE, %04x instead\n", message); + } + + /* Allow time to advance a bit, and then simulate the user moving their + * mouse around. After that we peek again with PM_NOREMOVE. + * Although the previous mousemove message was never removed, the + * mousemove we now peek should reflect the recent mouse movements + * because the input queue will merge the move events. */ + Sleep(2); + mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); + wait_move_event(hwnd, x1, y1); + + ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); + ok(ret, "no message available\n"); + if (ret) { + trace("2nd move event: %04x %x %d %d\n", msg.message, msg.time, msg.pt.x, msg.pt.y); + message = msg.message; + time2 = msg.time; + x2 = msg.pt.x; + y2 = msg.pt.y; + ok(message == WM_MOUSEMOVE, "message not WM_MOUSEMOVE, %04x instead\n", message); + ok(time2 > time1, "message time not advanced: %x %x\n", time1, time2); + ok(x2 != x1 && y2 != y1, "coords not changed: (%d %d) (%d %d)\n", x1, y1, x2, y2); + } + + /* Have another go, to drive the point home */ + Sleep(2); + mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); + wait_move_event(hwnd, x2, y2); + + ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); + ok(ret, "no message available\n"); + if (ret) { + trace("3rd move event: %04x %x %d %d\n", msg.message, msg.time, msg.pt.x, msg.pt.y); + message = msg.message; + time3 = msg.time; + x3 = msg.pt.x; + y3 = msg.pt.y; + ok(message == WM_MOUSEMOVE, "message not WM_MOUSEMOVE, %04x instead\n", message); + ok(time3 > time2, "message time not advanced: %x %x\n", time2, time3); + ok(x3 != x2 && y3 != y2, "coords not changed: (%d %d) (%d %d)\n", x2, y2, x3, y3); + } + + DestroyWindow(hwnd); + SetCursorPos(pos.x, pos.y); + flush_events(); +} static void test_quit_message(void) { @@ -9894,6 +9995,7 @@ START_TEST(msg) test_ShowWindow(); test_PeekMessage(); + test_PeekMessage2(); test_scrollwindowex(); test_messages(); test_showwindow(); diff --git a/server/queue.c b/server/queue.c index 7e6da57..1cda33c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -406,7 +406,6 @@ static int merge_message( struct thread_input *input, const struct message *msg if (!ptr) return 0; prev = LIST_ENTRY( ptr, struct message, entry ); - if (prev->unique_id) return 0; if (prev->result) return 0; if (prev->win != msg->win) return 0; if (prev->msg != msg->msg) return 0;

1 0

Stefan Leichter : regedit: Replace call to delete_branch with RegDeleteTreeA.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: b0180f7b1d94afab4cf64d53fdb02e7091a922f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0180f7b1d94afab4cf64d53f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Oct 9 23:50:18 2007 +0200 regedit: Replace call to delete_branch with RegDeleteTreeA. --- programs/regedit/regproc.c | 65 +------------------------------------------- 1 files changed, 1 insertions(+), 64 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fb7f37c..e17a973 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -951,53 +951,6 @@ BOOL import_registry_file(LPTSTR filename) } /****************************************************************************** - * Recursive function which removes the registry key with all subkeys. - */ -static void delete_branch(HKEY key, - CHAR **reg_key_name_buf, DWORD *reg_key_name_len) -{ - HKEY branch_key; - DWORD max_sub_key_len; - DWORD subkeys; - DWORD curr_len; - LONG ret; - long int i; - - if (RegOpenKey(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { - REGPROC_print_error(); - } - - /* get size information and resize the buffers if necessary */ - if (RegQueryInfoKey(branch_key, NULL, NULL, NULL, - &subkeys, &max_sub_key_len, - NULL, NULL, NULL, NULL, NULL, NULL - ) != ERROR_SUCCESS) { - REGPROC_print_error(); - } - curr_len = strlen(*reg_key_name_buf); - REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, - max_sub_key_len + curr_len + 1); - - (*reg_key_name_buf)[curr_len] = '\\'; - for (i = subkeys - 1; i >= 0; i--) { - DWORD buf_len = *reg_key_name_len - curr_len; - - ret = RegEnumKeyEx(branch_key, i, *reg_key_name_buf + curr_len + 1, - &buf_len, NULL, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS && - ret != ERROR_MORE_DATA && - ret != ERROR_NO_MORE_ITEMS) { - REGPROC_print_error(); - } else { - delete_branch(key, reg_key_name_buf, reg_key_name_len); - } - } - (*reg_key_name_buf)[curr_len] = '\0'; - RegCloseKey(branch_key); - RegDeleteKey(key, *reg_key_name_buf); -} - -/****************************************************************************** * Removes the registry key with all subkeys. Parses full key name. * * Parameters: @@ -1008,7 +961,6 @@ void delete_registry_key(CHAR *reg_key_name) { CHAR *key_name; HKEY key_class; - HKEY branch_key; if (!reg_key_name || !reg_key_name[0]) return; @@ -1024,20 +976,5 @@ void delete_registry_key(CHAR *reg_key_name) exit(1); } - /* open the specified key to make sure it exists */ - if (RegOpenKey(key_class, key_name, &branch_key) == ERROR_SUCCESS) { - CHAR *branch_name; - DWORD branch_name_len; - RegCloseKey(branch_key); - - /* Copy the key name to a new buffer that delete_branch() can - * reallocate as needed - */ - branch_name_len = strlen(key_name); - branch_name = HeapAlloc(GetProcessHeap(), 0, branch_name_len+1); - CHECK_ENOUGH_MEMORY(branch_name); - strcpy(branch_name, key_name); - delete_branch(key_class, &branch_name, &branch_name_len); - HeapFree(GetProcessHeap(), 0, branch_name); - } + RegDeleteTreeA(key_class, key_name); }

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : winecfg: Updated Korean resource.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 3fbff605bdec30752da1ba575da34bea399b98cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbff605bdec30752da1ba575… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Oct 8 08:40:10 2007 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 75 ++++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fbff605bdec30752da1b…

1 0

Vitaliy Margolen : dinput: Use ClipCursor() to keep mouse from leaving the window.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 7e6d0e71ebf00e109055da7660c1043c2997b279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6d0e71ebf00e109055da766… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 7 10:30:02 2007 -0600 dinput: Use ClipCursor() to keep mouse from leaving the window. --- dlls/dinput/mouse.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 8edfe0e..214bbd8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -410,7 +410,18 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) /* Install our mouse hook */ if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) + { + RECT rc; + ShowCursor(FALSE); /* hide cursor */ + if (GetWindowRect(This->base.win, &rc)) + { + FIXME("Clipping cursor to %s\n", wine_dbgstr_rect( &rc )); + ClipCursor(&rc); + } + else + ERR("Failed to get RECT: %d\n", GetLastError()); + } /* Get the window dimension and find the center */ GetWindowRect(This->base.win, &rect); @@ -446,7 +457,10 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) + { + ClipCursor(NULL); ShowCursor(TRUE); /* show cursor */ + } /* And put the mouse cursor back where it was at acquire time */ if (This->base.dwCoopLevel & DISCL_EXCLUSIVE)

1 0

Jacek Caban : mshtml: Fixed test crash on Windows.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: d9d11b3e7c7c82c86431cdefc6e687877d49c99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d11b3e7c7c82c86431cdefc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 17:06:24 2007 +0200 mshtml: Fixed test crash on Windows. --- dlls/mshtml/tests/htmldoc.c | 90 +++++++++++++++++++++++++++--------------- 1 files changed, 58 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d54e7cc..b3224a3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -211,6 +211,62 @@ static void test_timer(DWORD flags) CHECK_CALLED(Exec_SETTITLE); } +static HRESULT WINAPI External_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI External_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDispatchVtbl ExternalVtbl = { + External_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + External_Invoke +}; + +static IDispatch External = { &ExternalVtbl }; + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -1863,7 +1919,7 @@ static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { CHECK_EXPECT(GetExternal); - *ppDispatch = (void*)1; + *ppDispatch = &External; return S_FALSE; } @@ -2100,36 +2156,6 @@ static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, voi return QueryInterface(riid, ppv); } -static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) -{ - return 2; -} - -static ULONG WINAPI Dispatch_Release(IDispatch *iface) -{ - return 1; -} - -static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, - UINT cNames, LCID lcid, DISPID *rgDispId) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -3468,7 +3494,7 @@ static void test_external(IUnknown *unk, BOOL initialized) if(initialized) { ok(hres == S_FALSE, "get_external failed: %08x\n", hres); CHECK_CALLED(GetExternal); - ok(external == (void*)1, "external != NULL\n"); + ok(external != NULL, "external == NULL\n"); }else { ok(hres == S_OK, "get_external failed: %08x\n", hres); ok(external == NULL, "external != NULL\n");

1 0

David Adam : include: Skeleton header for D3DX8.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 1feb1c052b531557cb33ea1de8ec848fb28dd690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1feb1c052b531557cb33ea1de… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Fri Oct 5 20:03:41 2007 +0200 include: Skeleton header for D3DX8. --- include/Makefile.in | 2 + include/d3dx8.h | 28 ++++++++++++++++++++++ include/d3dx8math.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 60b916a..de8b86a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,7 +104,9 @@ SRCDIR_INCLUDES = \ d3drmdef.h \ d3dtypes.h \ d3dvec.inl \ + d3dx8.h \ d3dx8core.h \ + d3dx8math.h \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/d3dx8.h b/include/d3dx8.h new file mode 100644 index 0000000..52ddaf3 --- /dev/null +++ b/include/d3dx8.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX8_H__ +#define __D3DX8_H__ + +#include <d3d8.h> +#include <limits.h> + +#include <d3dx8math.h> +#include <d3dx8core.h> + +#endif diff --git a/include/d3dx8math.h b/include/d3dx8math.h new file mode 100644 index 0000000..452eb05 --- /dev/null +++ b/include/d3dx8math.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <d3dx8.h> + +#ifndef __D3DX8MATH_H__ +#define __D3DX8MATH_H__ + +#include <math.h> + +#define D3DX_PI ((FLOAT)3.141592654) +#define D3DX_1BYPI ((FLOAT)0.318309886) + +#define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f)) +#define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI)) + +typedef struct D3DXVECTOR2 +{ + FLOAT x, y; +} D3DXVECTOR2, *LPD3DXVECTOR2; + +typedef struct D3DXVECTOR3 +{ + FLOAT x, y, z; +} D3DXVECTOR3, *LPD3DXVECTOR3; + +typedef struct D3DXVECTOR4 +{ + FLOAT x, y, z, w; +} D3DXVECTOR4, *LPD3DXVECTOR4; + +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; + +typedef struct D3DXQUATERNION +{ + FLOAT x, y, z, w; +} D3DXQUATERNION, *LPD3DXQUATERNION; + +typedef struct D3DXPLANE +{ + FLOAT a, b, c, d; +} D3DXPLANE, *LPD3DXPLANE; + +typedef struct D3DXCOLOR +{ + FLOAT r, g, b, a; +} D3DXCOLOR, *LPD3DXCOLOR; + +#endif /* __D3DX8MATH_H__ */

1 0

Roderick Colenbrander : wined3d: Merge p8 palette initialization code.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 8e64d870b15d93b7c9b3595e93480f9f0778a8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e64d870b15d93b7c9b3595e9… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Oct 8 22:11:06 2007 +0200 wined3d: Merge p8 palette initialization code. --- dlls/wined3d/surface.c | 67 +++++++++++------------------------------------ 1 files changed, 16 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee086e3..938df0d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], BOOL colorkey); static void surface_download_data(IWineD3DSurfaceImpl *This) { if (!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); @@ -1589,54 +1590,13 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN { IWineD3DPaletteImpl* pal = This->palette; BYTE table[256][4]; - unsigned int i; unsigned int x, y; if( pal == NULL) { /* TODO: If we are a sublevel, try to get the palette from level 0 */ } - if (pal == NULL) { - /* Still no palette? Use the device's palette */ - /* Get the surface's palette */ - for (i = 0; i < 256; i++) { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - - table[i][0] = device->palettes[device->currentPalette][i].peRed; - table[i][1] = device->palettes[device->currentPalette][i].peGreen; - table[i][2] = device->palettes[device->currentPalette][i].peBlue; - if ((convert == CONVERT_PALETTED_CK) && - (i >= This->SrcBltCKey.dwColorSpaceLowValue) && - (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - /* We should maybe here put a more 'neutral' color than the standard bright purple - one often used by application to prevent the nice purple borders when bi-linear - filtering is on */ - table[i][3] = 0x00; - } else { - table[i][3] = 0xFF; - } - } - } else { - TRACE("Using surface palette %p\n", pal); - /* Get the surface's palette */ - for (i = 0; i < 256; i++) { - table[i][0] = pal->palents[i].peRed; - table[i][1] = pal->palents[i].peGreen; - table[i][2] = pal->palents[i].peBlue; - if ((convert == CONVERT_PALETTED_CK) && - (i >= This->SrcBltCKey.dwColorSpaceLowValue) && - (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - /* We should maybe here put a more 'neutral' color than the standard bright purple - one often used by application to prevent the nice purple borders when bi-linear - filtering is on */ - table[i][3] = 0x00; - } else if(pal->Flags & WINEDDPCAPS_ALPHA) { - table[i][3] = pal->palents[i].peFlags; - } else { - table[i][3] = 0xFF; - } - } - } + d3dfmt_p8_init_palette(This, table, (convert == CONVERT_PALETTED_CK)); for (y = 0; y < height; y++) { @@ -1930,14 +1890,8 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN return WINED3D_OK; } -/* This function is used in case of 8bit paletted textures to upload the palette. - For now it only supports GL_EXT_paletted_texture extension but support for other - extensions like ARB_fragment_program and ATI_fragment_shaders will be added as well. -*/ -static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], BOOL colorkey) { IWineD3DPaletteImpl* pal = This->palette; - BYTE table[256][4]; int i; if (pal == NULL) { @@ -1949,7 +1903,7 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve table[i][0] = device->palettes[device->currentPalette][i].peRed; table[i][1] = device->palettes[device->currentPalette][i].peGreen; table[i][2] = device->palettes[device->currentPalette][i].peBlue; - if ((convert == CONVERT_PALETTED_CK) && + if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { /* We should maybe here put a more 'neutral' color than the standard bright purple @@ -1967,7 +1921,7 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve table[i][0] = pal->palents[i].peRed; table[i][1] = pal->palents[i].peGreen; table[i][2] = pal->palents[i].peBlue; - if ((convert == CONVERT_PALETTED_CK) && + if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { /* We should maybe here put a more 'neutral' color than the standard bright purple @@ -1981,6 +1935,17 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve } } } +} + +/* This function is used in case of 8bit paletted textures to upload the palette. + For now it only supports GL_EXT_paletted_texture extension but support for other + extensions like ARB_fragment_program and ATI_fragment_shaders will be added as well. +*/ +static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + BYTE table[256][4]; + + d3dfmt_p8_init_palette(This, table, (convert == CONVERT_PALETTED_CK)); GL_EXTCALL(glColorTableEXT(GL_TEXTURE_2D,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); }

1 0

Stefan Dösinger : ddraw: Downgrade the SetCooperativeLevel FIXME to a TRACE.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 848650d908df811b49f24161df8939365a53ca18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848650d908df811b49f24161d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 15:00:18 2007 +0200 ddraw: Downgrade the SetCooperativeLevel FIXME to a TRACE. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 508832b..7785624 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -361,7 +361,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, HWND window; HRESULT hr; - FIXME("(%p)->(%p,%08x)\n",This,hwnd,cooplevel); + TRACE("(%p)->(%p,%08x)\n",This,hwnd,cooplevel); DDRAW_dump_cooperativelevel(cooplevel); EnterCriticalSection(&ddraw_cs);

1 0

Stefan Dösinger : ddraw: Do not fail on surface creation errors, skip instead.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 7a445747eaa3a63ecf8cd5a8c7bbae58a0c97ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a445747eaa3a63ecf8cd5a8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 14:56:46 2007 +0200 ddraw: Do not fail on surface creation errors, skip instead. --- dlls/ddraw/tests/d3d.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f154a3a..b82b67f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -93,9 +93,8 @@ static BOOL CreateDirect3D(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDS, NULL); - ok(rc==DD_OK, "CreateSurface returned: %x\n", rc); if (!SUCCEEDED(rc)) - return FALSE; + return FALSE; memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd);

1 0

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 October 2007