wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Stefan Dösinger : wined3d: Use less strict pixel format matching if the match fails.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 1219e3d4a752a1e5e6d9a4025d180f0c9da280f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1219e3d4a752a1e5e6d9a4025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 21 09:22:22 2008 -0500 wined3d: Use less strict pixel format matching if the match fails. Some drivers(the open source ones most notably) cannot satisfy all possible D3D formats. This doesn't mean we should fall back to the emergency fallback instantly. Instead, try to loosen the requirements step by step. --- dlls/wined3d/context.c | 163 +++++++++++++++++++++++++++++------------------- 1 files changed, 98 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index efa1006..ca81f3a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -113,10 +113,28 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand /* This function takes care of WineD3D pixel format selection. */ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DFORMAT ColorFormat, WINED3DFORMAT DepthStencilFormat, BOOL auxBuffers, int numSamples, BOOL pbuffer, BOOL findCompatible) { - int iPixelFormat=0; + int iPixelFormat=0, matchtry; short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits=0, stencilBits=0; + struct match_type { + BOOL require_aux; + BOOL exact_alpha; + BOOL exact_color; + } matches[] = { + /* First, try without aux buffers - this is the most common cause + * for not finding a pixel format. Also some drivers(the open source ones) + * only offer 32 bit ARB pixel formats. First try without an exact alpha + * match, then try without an exact alpha and color match. + */ + { TRUE, TRUE, TRUE }, + { FALSE, TRUE, TRUE }, + { TRUE, FALSE, TRUE }, + { TRUE, FALSE, FALSE }, + { FALSE, FALSE, TRUE }, + { FALSE, FALSE, FALSE }, + }; + int i = 0; int nCfgs = This->adapter->nCfgs; WineD3D_PixelFormat *cfgs = This->adapter->cfgs; @@ -149,70 +167,85 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); } - /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ - for(i=0; i<nCfgs; i++) { - BOOL exactDepthMatch = TRUE; - cfgs = &This->adapter->cfgs[i]; - - /* For now only accept RGBA formats. Perhaps some day we will - * allow floating point formats for pbuffers. */ - if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) - continue; - - /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ - if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) - continue; - - /* We like to have aux buffers in backbuffer mode */ - if(auxBuffers && !cfgs->auxBuffers) - continue; - - /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ - if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) - continue; - - if(cfgs->redSize != redBits) - continue; - if(cfgs->greenSize != greenBits) - continue; - if(cfgs->blueSize != blueBits) - continue; - if(cfgs->alphaSize != alphaBits) - continue; - - /* We try to locate a format which matches our requirements exactly. In case of - * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if(cfgs->depthSize < depthBits) - continue; - else if(cfgs->depthSize > depthBits) - exactDepthMatch = FALSE; - - /* In all cases make sure the number of stencil bits matches our requirements - * even when we don't need stencil because it could affect performance EXCEPT - * on cards which don't offer depth formats without stencil like the i915 drivers - * on Linux. */ - if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) - continue; - - /* Check multisampling support */ - if(cfgs->numSamples != numSamples) - continue; - - /* When we have passed all the checks then we have found a format which matches our - * requirements. Note that we only check for a limit number of capabilities right now, - * so there can easily be a dozen of pixel formats which appear to be the 'same' but - * can still differ in things like multisampling, stereo, SRGB and other flags. - */ + for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])); matchtry++) { + for(i=0; i<nCfgs; i++) { + BOOL exactDepthMatch = TRUE; + cfgs = &This->adapter->cfgs[i]; + + /* For now only accept RGBA formats. Perhaps some day we will + * allow floating point formats for pbuffers. */ + if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) + continue; + + /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ + if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) + continue; + + /* We like to have aux buffers in backbuffer mode */ + if(auxBuffers && !cfgs->auxBuffers && matches[matchtry].require_aux) + continue; + + /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ + if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) + continue; + + if(matches[matchtry].exact_color) { + if(cfgs->redSize != redBits) + continue; + if(cfgs->greenSize != greenBits) + continue; + if(cfgs->blueSize != blueBits) + continue; + } else { + if(cfgs->redSize < redBits) + continue; + if(cfgs->greenSize < greenBits) + continue; + if(cfgs->blueSize < blueBits) + continue; + } + if(matches[matchtry].exact_alpha) { + if(cfgs->alphaSize != alphaBits) + continue; + } else { + if(cfgs->alphaSize < alphaBits) + continue; + } - /* Exit the loop as we have found a format :) */ - if(exactDepthMatch) { - iPixelFormat = cfgs->iPixelFormat; - break; - } else if(!iPixelFormat) { - /* In the end we might end up with a format which doesn't exactly match our depth - * requirements. Accept the first format we found because formats with higher iPixelFormat - * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ - iPixelFormat = cfgs->iPixelFormat; + /* We try to locate a format which matches our requirements exactly. In case of + * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ + if(cfgs->depthSize < depthBits) + continue; + else if(cfgs->depthSize > depthBits) + exactDepthMatch = FALSE; + + /* In all cases make sure the number of stencil bits matches our requirements + * even when we don't need stencil because it could affect performance EXCEPT + * on cards which don't offer depth formats without stencil like the i915 drivers + * on Linux. */ + if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) + continue; + + /* Check multisampling support */ + if(cfgs->numSamples != numSamples) + continue; + + /* When we have passed all the checks then we have found a format which matches our + * requirements. Note that we only check for a limit number of capabilities right now, + * so there can easily be a dozen of pixel formats which appear to be the 'same' but + * can still differ in things like multisampling, stereo, SRGB and other flags. + */ + + /* Exit the loop as we have found a format :) */ + if(exactDepthMatch) { + iPixelFormat = cfgs->iPixelFormat; + break; + } else if(!iPixelFormat) { + /* In the end we might end up with a format which doesn't exactly match our depth + * requirements. Accept the first format we found because formats with higher iPixelFormat + * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ + iPixelFormat = cfgs->iPixelFormat; + } } }

1 0

Huw Davies : user32: Don't send the menu clicks if we can' t retrieve the item rect.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 80fe2faeb6c794a3e37e600cd6d0e7e8cbd27b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80fe2faeb6c794a3e37e600cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 21 14:50:10 2008 +0100 user32: Don't send the menu clicks if we can't retrieve the item rect. --- dlls/user32/tests/menu.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 1aa2eb6..4e879c6 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1691,7 +1691,7 @@ static struct menu_mouse_tests_s { static void send_key(WORD wVk) { TEST_INPUT i[2]; - memset(&i, 0, 2*sizeof(INPUT)); + memset(i, 0, sizeof(i)); i[0].type = i[1].type = INPUT_KEYBOARD; i[0].u.ki.wVk = i[1].u.ki.wVk = wVk; i[1].u.ki.dwFlags = KEYEVENTF_KEYUP; @@ -1706,10 +1706,10 @@ static void click_menu(HANDLE hWnd, struct menu_item_pair_s *mi) RECT r; int screen_w = GetSystemMetrics(SM_CXSCREEN); int screen_h = GetSystemMetrics(SM_CYSCREEN); + BOOL ret = GetMenuItemRect(mi->uMenu > 2 ? NULL : hWnd, hMenu, mi->uItem, &r); + if(!ret) return; - GetMenuItemRect(mi->uMenu > 2 ? NULL : hWnd, hMenu, mi->uItem, &r); - - memset(&i, 0, 3*sizeof(INPUT)); + memset(i, 0, sizeof(i)); i[0].type = i[1].type = i[2].type = INPUT_MOUSE; i[0].u.mi.dx = i[1].u.mi.dx = i[2].u.mi.dx = ((r.left + 5) * 65535) / screen_w;

1 0

Francois Gouget : wineesd: Make use of `esd-config --libs` for the configure check.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: e9b1a40669a7386f5b33ad7fa8f37642d5d57114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b1a40669a7386f5b33ad7fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 23:41:21 2008 +0200 wineesd: Make use of `esd-config --libs` for the configure check. Also follow the naming convention for the 'xxx-config' variables. --- configure | 18 +++++++++--------- configure.ac | 15 ++++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 3096dc8..7cfa0fd 100755 --- a/configure +++ b/configure @@ -759,8 +759,8 @@ FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ESDCONFIG -ESDLIBS ESDINCL +ESDLIBS ALSALIBS AUDIOIOLIBS FONTCONFIGINCL @@ -14633,23 +14633,23 @@ fi if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"'; then - ESD_CFLAGS="" + ac_esd_incl="" for i in `$ESDCONFIG --cflags` do case "$i" in - -I*) ESD_CFLAGS="$ESD_CFLAGS $i";; + -I*) ac_esd_incl="$ac_esd_incl $i";; esac done - ESD_LIBS=`$ESDCONFIG --libs` + ac_esd_libs=`$ESDCONFIG --libs` save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ESD_CFLAGS" + CFLAGS="$CFLAGS $ac_esd_incl" { echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5 echo $ECHO_N "checking for esd_open_sound in -lesd... $ECHO_C" >&6; } if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lesd $LIBS" +LIBS="-lesd $ac_esd_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14705,9 +14705,9 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_open_sound" >&5 echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6; } if test $ac_cv_lib_esd_esd_open_sound = yes; then - ESDLIBS=$ESD_LIBS + ESDINCL="$ac_esd_incl" - ESDINCL=$ESD_CFLAGS + ESDLIBS="$ac_esd_libs" cat >>confdefs.h <<\_ACEOF @@ -23841,8 +23841,8 @@ FREETYPELIBS!$FREETYPELIBS$ac_delim FREETYPEINCL!$FREETYPEINCL$ac_delim FONTSSUBDIRS!$FONTSSUBDIRS$ac_delim ESDCONFIG!$ESDCONFIG$ac_delim -ESDLIBS!$ESDLIBS$ac_delim ESDINCL!$ESDINCL$ac_delim +ESDLIBS!$ESDLIBS$ac_delim ALSALIBS!$ALSALIBS$ac_delim AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim diff --git a/configure.ac b/configure.ac index 5b12d97..7417f30 100644 --- a/configure.ac +++ b/configure.ac @@ -1070,20 +1070,21 @@ dnl **** Check for EsounD **** AC_PATH_PROG(ESDCONFIG, esd-config) if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"'; then - ESD_CFLAGS="" + ac_esd_incl="" for i in `$ESDCONFIG --cflags` do case "$i" in - -I*) ESD_CFLAGS="$ESD_CFLAGS $i";; + -I*) ac_esd_incl="$ac_esd_incl $i";; esac done - ESD_LIBS=`$ESDCONFIG --libs` + ac_esd_libs=`$ESDCONFIG --libs` save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ESD_CFLAGS" + CFLAGS="$CFLAGS $ac_esd_incl" AC_CHECK_LIB(esd,esd_open_sound, - [AC_SUBST(ESDLIBS, $ESD_LIBS) - AC_SUBST(ESDINCL, $ESD_CFLAGS) - AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])]) + [AC_SUBST(ESDINCL, "$ac_esd_incl") + AC_SUBST(ESDLIBS, "$ac_esd_libs") + AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],, + [$ac_esd_libs]) CFLAGS="$save_CFLAGS" fi

1 0

Francois Gouget : gphoto2.ds: Make use of `gphoto2-config --libs` for the configure check.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 4bc03fe857ebad9e142d469e568d193f9c26a010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc03fe857ebad9e142d469e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 17:10:45 2008 +0200 gphoto2.ds: Make use of `gphoto2-config --libs` for the configure check. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 20b9b40..3096dc8 100755 --- a/configure +++ b/configure @@ -13488,7 +13488,7 @@ if test "${ac_cv_lib_gphoto2_gp_camera_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgphoto2 $GPHOTO2LIBS $LIBS" +LIBS="-lgphoto2 $ac_gphoto2_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.ac b/configure.ac index 23cff81..5b12d97 100644 --- a/configure.ac +++ b/configure.ac @@ -951,7 +951,7 @@ then [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment]) AC_SUBST(GPHOTO2LIBS,"$ac_gphoto2_libs") AC_SUBST(GPHOTO2INCL,"$ac_gphoto2_incl")],, - [$GPHOTO2LIBS])]) + [$ac_gphoto2_libs])]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],

1 0

Lei Zhang : gdiplus: Add tests for passing negative strides to GdipCreateBitmapFromScan0.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 7a27f8b665e4bc23a448cc709de000baa42d4439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27f8b665e4bc23a448cc709… Author: Lei Zhang <thestig(a)google.com> Date: Fri Jul 18 15:31:58 2008 -0700 gdiplus: Add tests for passing negative strides to GdipCreateBitmapFromScan0. --- dlls/gdiplus/tests/image.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 38a58b9..49d1e5e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -73,6 +73,20 @@ static void test_Scan0(void) stat = GdipCreateBitmapFromScan0(10, 10, 0, PixelFormat24bppRGB, buff, &bm); expect(InvalidParameter, stat); expect(0xdeadbeef, bm); + + bm = NULL; + stat = GdipCreateBitmapFromScan0(10, 10, -8, PixelFormat24bppRGB, buff, &bm); + todo_wine{ + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + } + if (stat == Ok) + GdipDisposeImage((GpImage*)bm); + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(10, 10, -10, PixelFormat24bppRGB, buff, &bm); + expect(InvalidParameter, stat); + expect(NULL, bm); } static void test_GetImageDimension(void)

1 0

Roy Shea : mstask: TaskScheduler stub with AddRef, QueryInterface, and Release.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 4f392cea55f1160d6dc35d05c393862e3edf8808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f392cea55f1160d6dc35d05c… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Jul 17 16:56:14 2008 -0700 mstask: TaskScheduler stub with AddRef, QueryInterface, and Release. --- dlls/mstask/Makefile.in | 5 +- dlls/mstask/mstask_main.c | 5 +- dlls/mstask/mstask_private.h | 39 ++++++++++ dlls/mstask/task_scheduler.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 217 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index f05d63f..b193ae7 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mstask.dll -IMPORTS = kernel32 +IMPORTS = uuid kernel32 C_SRCS = \ - mstask_main.c + mstask_main.c \ + task_scheduler.c IDL_I_SRCS = mstask_local.idl diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c373d66..b1984eb 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" +#include "mstask_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h new file mode 100644 index 0000000..3a08e7a --- /dev/null +++ b/dlls/mstask/mstask_private.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * 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 __MSTASK_PRIVATE_H__ +#define __MSTASK_PRIVATE_H__ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "mstask.h" + +typedef struct +{ + const ITaskSchedulerVtbl *lpVtbl; + LONG ref; +} TaskSchedulerImpl; +extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); + +#endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c new file mode 100644 index 0000000..5d4768e --- /dev/null +++ b/dlls/mstask/task_scheduler.c @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * 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 "mstask_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); + +static void TaskSchedulerDestructor(TaskSchedulerImpl *This) +{ + TRACE("%p\n", This); + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( + ITaskScheduler* iface, + REFIID riid, + void **ppvObject) +{ + TaskSchedulerImpl * This = (TaskSchedulerImpl *)iface; + + TRACE("IID: %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ITaskScheduler)) + { + *ppvObject = &This->lpVtbl; + ITaskScheduler_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MSTASK_ITaskScheduler_AddRef( + ITaskScheduler* iface) +{ + TaskSchedulerImpl *This = (TaskSchedulerImpl *)iface; + TRACE("\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI MSTASK_ITaskScheduler_Release( + ITaskScheduler* iface) +{ + TaskSchedulerImpl * This = (TaskSchedulerImpl *)iface; + ULONG ref; + TRACE("\n"); + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + TaskSchedulerDestructor(This); + return ref; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_SetTargetComputer( + ITaskScheduler* iface, + LPCWSTR pwszComputer) +{ + FIXME("%p, %s: stub\n", iface, debugstr_w(pwszComputer)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( + ITaskScheduler* iface, + LPWSTR *ppwszComputer) +{ + FIXME("%p, %p: stub\n", iface, ppwszComputer); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( + ITaskScheduler* iface, + IEnumWorkItems **ppEnumTasks) +{ + FIXME("%p, %p: stub\n", iface, ppEnumTasks); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( + ITaskScheduler* iface, + LPCWSTR pwszName, + REFIID riid, + IUnknown **ppunk) +{ + FIXME("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), + debugstr_guid(riid), ppunk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( + ITaskScheduler* iface, + LPCWSTR pwszName) +{ + FIXME("%p, %s: stub\n", iface, debugstr_w(pwszName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( + ITaskScheduler* iface, + LPCWSTR pwszTaskName, + REFCLSID rclsid, + REFIID riid, + IUnknown **ppunk) +{ + FIXME("%p, %s, %s, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), + debugstr_guid(rclsid) ,debugstr_guid(riid), ppunk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( + ITaskScheduler* iface, + LPCWSTR pwszTaskName, + IScheduledWorkItem *pWorkItem) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), pWorkItem); + return E_NOTIMPL; +} + +static HRESULT WINAPI MSTASK_ITaskScheduler_IsOfType( + ITaskScheduler* iface, + LPCWSTR pwszName, + REFIID riid) +{ + FIXME("%p, %s, %s: stub\n", iface, debugstr_w(pwszName), + debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const ITaskSchedulerVtbl MSTASK_ITaskSchedulerVtbl = +{ + MSTASK_ITaskScheduler_QueryInterface, + MSTASK_ITaskScheduler_AddRef, + MSTASK_ITaskScheduler_Release, + MSTASK_ITaskScheduler_SetTargetComputer, + MSTASK_ITaskScheduler_GetTargetComputer, + MSTASK_ITaskScheduler_Enum, + MSTASK_ITaskScheduler_Activate, + MSTASK_ITaskScheduler_Delete, + MSTASK_ITaskScheduler_NewWorkItem, + MSTASK_ITaskScheduler_AddWorkItem, + MSTASK_ITaskScheduler_IsOfType +}; + +HRESULT TaskSchedulerConstructor(LPVOID *ppObj) +{ + TaskSchedulerImpl *This; + TRACE("(%p)\n", ppObj); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &MSTASK_ITaskSchedulerVtbl; + This->ref = 1; + + *ppObj = &This->lpVtbl; + return S_OK; +}

1 0

Roy Shea : mstask: Generate C file with GUID definitions from mstask.idl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 21fd0a0460d218ed2c25037a80e7c38b5235dbed URL: http://source.winehq.org/git/wine.git/?a=commit;h=21fd0a0460d218ed2c25037a8… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Jul 17 16:52:02 2008 -0700 mstask: Generate C file with GUID definitions from mstask.idl. --- .gitignore | 2 ++ dlls/mstask/Makefile.in | 2 ++ dlls/mstask/mstask_local.idl | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index ab49a43..a60cefd 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,8 @@ dlls/msi/msiserver.tlb dlls/msi/msiserver_i.c dlls/msi/sql.tab.c dlls/msi/sql.tab.h +dlls/mstask/mstask_local.h +dlls/mstask/mstask_local_i.c dlls/msvideo.dll16 dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 2fd0a66..f05d63f 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ mstask_main.c +IDL_I_SRCS = mstask_local.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mstask/mstask_local.idl b/dlls/mstask/mstask_local.idl new file mode 100644 index 0000000..b1a044a --- /dev/null +++ b/dlls/mstask/mstask_local.idl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * 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 "mstask.idl"

1 0

Gerald Pfeifer : d3d9: Fix type of loop variable in stream_test() and texop_test().
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 971a1e66f417daf102301b991c26afdb7a8471e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=971a1e66f417daf102301b991… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 18 17:17:26 2008 +0200 d3d9: Fix type of loop variable in stream_test() and texop_test(). --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a63d5e3..a47b054 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8723,7 +8723,7 @@ static void stream_test(IDirect3DDevice9 *device) BYTE *data; DWORD color; DWORD ind; - int i; + unsigned i; const DWORD shader_code[] = { @@ -9065,7 +9065,7 @@ static void texop_test(IDirect3DDevice9 *device) D3DCOLOR color; D3DCAPS9 caps; HRESULT hr; - int i; + unsigned i; static const struct { float x, y, z;

1 0

Gerald Pfeifer : comctl32: Fix type of loop variable in HEADER_DeleteItem.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: f3a031f2487101bd2dab90e664ae214d86da3f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a031f2487101bd2dab90e66… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 18 17:24:56 2008 +0200 comctl32: Fix type of loop variable in HEADER_DeleteItem. --- dlls/comctl32/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 9a2e3b7..3d16310 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1073,7 +1073,7 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wParam) HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); INT iItem = (INT)wParam; INT iOrder; - INT i; + UINT i; TRACE("[iItem=%d]\n", iItem);

1 0

Gerald Pfeifer : comctl32: header: Simplify by shedding off unused parameters.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 9500e70def8a875ed2e6cede86ac9c7808564255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9500e70def8a875ed2e6cede8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 18 17:53:04 2008 +0200 comctl32: header: Simplify by shedding off unused parameters. --- dlls/comctl32/header.c | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index af1923c..9a2e3b7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -249,7 +249,7 @@ HEADER_SetItemBounds (HWND hwnd) } static LRESULT -HEADER_Size (HWND hwnd, WPARAM wParam) +HEADER_Size (HWND hwnd) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); @@ -577,7 +577,7 @@ HEADER_Refresh (HWND hwnd, HDC hdc) static void -HEADER_RefreshItem (HWND hwnd, HDC hdc, INT iItem) +HEADER_RefreshItem (HWND hwnd, INT iItem) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); @@ -1250,7 +1250,7 @@ HEADER_GetUnicodeFormat (HWND hwnd) static LRESULT -HEADER_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_HitTest (HWND hwnd, LPARAM lParam) { LPHDHITTESTINFO phti = (LPHDHITTESTINFO)lParam; @@ -1332,7 +1332,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem, const HDITEMW *phdi, BOOL bUnicode) static LRESULT -HEADER_Layout (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_Layout (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); LPHDLAYOUT lpLayout = (LPHDLAYOUT)lParam; @@ -1447,7 +1447,7 @@ HEADER_SetUnicodeFormat (HWND hwnd, WPARAM wParam) static LRESULT -HEADER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_Create (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr; TEXTMETRICW tm; @@ -1490,7 +1490,7 @@ HEADER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_Destroy (HWND hwnd) { HTHEME theme = GetWindowTheme(hwnd); CloseThemeData(theme); @@ -1498,7 +1498,7 @@ HEADER_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) } static LRESULT -HEADER_NCDestroy (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_NCDestroy (HWND hwnd) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_ITEM *lpItem; @@ -1544,7 +1544,7 @@ HEADER_IsDragDistance(const HEADER_INFO *infoPtr, const POINT *pt) } static LRESULT -HEADER_LButtonDblClk (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_LButtonDblClk (HWND hwnd, LPARAM lParam) { POINT pt; UINT flags; @@ -1564,7 +1564,7 @@ HEADER_LButtonDblClk (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_LButtonDown (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -1589,7 +1589,7 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam) /* Send WM_CUSTOMDRAW */ hdc = GetDC (hwnd); - HEADER_RefreshItem (hwnd, hdc, nItem); + HEADER_RefreshItem (hwnd, nItem); ReleaseDC (hwnd, hdc); TRACE("Pressed item %d!\n", nItem); @@ -1620,7 +1620,7 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_LButtonUp (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -1670,7 +1670,7 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) { infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (hwnd); - HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); + HEADER_RefreshItem (hwnd, infoPtr->iMoveItem); ReleaseDC (hwnd, hdc); HEADER_SendNotifyWithHDItemT(hwnd, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); @@ -1735,7 +1735,7 @@ HEADER_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) } static LRESULT -HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_MouseLeave (HWND hwnd) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); /* Reset hot-tracked item when mouse leaves control. */ @@ -1743,7 +1743,7 @@ HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) HDC hdc = GetDC (hwnd); infoPtr->iHotItem = -1; - if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); + if (oldHotItem != -1) HEADER_RefreshItem (hwnd, oldHotItem); ReleaseDC (hwnd, hdc); return 0; @@ -1751,7 +1751,7 @@ HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_MouseMove (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -1814,7 +1814,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; if (oldState != infoPtr->items[infoPtr->iMoveItem].bDown) { hdc = GetDC (hwnd); - HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); + HEADER_RefreshItem (hwnd, infoPtr->iMoveItem); ReleaseDC (hwnd, hdc); } @@ -1866,8 +1866,8 @@ HEADER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) TRACKMOUSEEVENT tme; if (oldHotItem != infoPtr->iHotItem && !infoPtr->bDragging) { hdc = GetDC (hwnd); - if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); - if (infoPtr->iHotItem != -1) HEADER_RefreshItem (hwnd, hdc, infoPtr->iHotItem); + if (oldHotItem != -1) HEADER_RefreshItem (hwnd, oldHotItem); + if (infoPtr->iHotItem != -1) HEADER_RefreshItem (hwnd, infoPtr->iHotItem); ReleaseDC (hwnd, hdc); } tme.cbSize = sizeof( tme ); @@ -1895,7 +1895,7 @@ HEADER_Paint (HWND hwnd, WPARAM wParam) static LRESULT -HEADER_RButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_RButtonUp (HWND hwnd, LPARAM lParam) { BOOL bRet; POINT pt; @@ -1917,7 +1917,7 @@ HEADER_RButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_SetCursor (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_SetCursor (HWND hwnd, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); POINT pt; @@ -2033,14 +2033,14 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return HEADER_GetUnicodeFormat (hwnd); case HDM_HITTEST: - return HEADER_HitTest (hwnd, wParam, lParam); + return HEADER_HitTest (hwnd, lParam); case HDM_INSERTITEMA: case HDM_INSERTITEMW: return HEADER_InsertItemT (hwnd, (INT)wParam, (LPHDITEMW)lParam, msg == HDM_INSERTITEMW); case HDM_LAYOUT: - return HEADER_Layout (hwnd, wParam, lParam); + return HEADER_Layout (hwnd, lParam); case HDM_ORDERTOINDEX: return HEADER_OrderToIndex(hwnd, wParam); @@ -2067,13 +2067,13 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return HEADER_SetUnicodeFormat (hwnd, wParam); case WM_CREATE: - return HEADER_Create (hwnd, wParam, lParam); + return HEADER_Create (hwnd, lParam); case WM_DESTROY: - return HEADER_Destroy (hwnd, wParam, lParam); + return HEADER_Destroy (hwnd); case WM_NCDESTROY: - return HEADER_NCDestroy (hwnd, wParam, lParam); + return HEADER_NCDestroy (hwnd); case WM_ERASEBKGND: return 1; @@ -2085,25 +2085,25 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return HEADER_GetFont (hwnd); case WM_LBUTTONDBLCLK: - return HEADER_LButtonDblClk (hwnd, wParam, lParam); + return HEADER_LButtonDblClk (hwnd, lParam); case WM_LBUTTONDOWN: - return HEADER_LButtonDown (hwnd, wParam, lParam); + return HEADER_LButtonDown (hwnd, lParam); case WM_LBUTTONUP: - return HEADER_LButtonUp (hwnd, wParam, lParam); + return HEADER_LButtonUp (hwnd, lParam); case WM_MOUSELEAVE: - return HEADER_MouseLeave (hwnd, wParam, lParam); + return HEADER_MouseLeave (hwnd); case WM_MOUSEMOVE: - return HEADER_MouseMove (hwnd, wParam, lParam); + return HEADER_MouseMove (hwnd, lParam); case WM_NOTIFYFORMAT: return HEADER_NotifyFormat (hwnd, wParam, lParam); case WM_SIZE: - return HEADER_Size (hwnd, wParam); + return HEADER_Size (hwnd); case WM_THEMECHANGED: return HEADER_ThemeChanged (hwnd); @@ -2113,10 +2113,10 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return HEADER_Paint (hwnd, wParam); case WM_RBUTTONUP: - return HEADER_RButtonUp (hwnd, wParam, lParam); + return HEADER_RButtonUp (hwnd, lParam); case WM_SETCURSOR: - return HEADER_SetCursor (hwnd, wParam, lParam); + return HEADER_SetCursor (hwnd, lParam); case WM_SETFONT: return HEADER_SetFont (hwnd, wParam, lParam);

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 July 2008