June 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Implement LVM_GETVIEW.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: d5f9f27c37ae5f4a252cfbdc58709b8416229412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f9f27c37ae5f4a252cfbdc5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 3 04:48:04 2009 +0400 comctl32/listview: Implement LVM_GETVIEW. --- dlls/comctl32/listview.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3fe41bd..d3f2303 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -122,7 +122,7 @@ * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO * -- LVM_GETUNICODEFORMAT, LVM_SETUNICODEFORMAT - * -- LVM_GETVIEW, LVM_SETVIEW + * -- LVM_SETVIEW * -- LVM_GETWORKAREAS, LVM_SETWORKAREAS * -- LVM_HASGROUP, LVM_INSERTGROUP, LVM_REMOVEGROUP, LVM_REMOVEALLGROUPS * -- LVM_INSERTGROUPSORTED @@ -280,6 +280,7 @@ typedef struct tagLISTVIEW_INFO RECT rcFocus; DWORD dwStyle; /* the cached window GWL_STYLE */ DWORD dwLvExStyle; /* extended listview style */ + DWORD uView; /* current view available through LVM_[G,S]ETVIEW */ INT nItemCount; /* the number of items in the list */ HDPA hdpaItems; /* array ITEM_INFO pointers */ HDPA hdpaPosX; /* maintains the (X, Y) coordinates of the */ @@ -1351,6 +1352,26 @@ static void toggle_checkbox_state(LISTVIEW_INFO *infoPtr, INT nItem) } } +/* this should be called after window style got updated, + it used to reset view state to match current window style */ +static inline void map_style_view(LISTVIEW_INFO *infoPtr) +{ + switch (infoPtr->dwStyle & LVS_TYPEMASK) + { + case LVS_ICON: + infoPtr->uView = LV_VIEW_ICON; + break; + case LVS_REPORT: + infoPtr->uView = LV_VIEW_DETAILS; + break; + case LVS_SMALLICON: + infoPtr->uView = LV_VIEW_SMALLICON; + break; + case LVS_LIST: + infoPtr->uView = LV_VIEW_LIST; + } +} + /******** Internal API functions ************************************/ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr, INT nSubItem) @@ -8293,6 +8314,8 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) LISTVIEW_UpdateScroll(infoPtr); } + map_style_view(infoPtr); + OpenThemeData(hwnd, themeClass); /* initialize the icon sizes */ @@ -9723,6 +9746,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + map_style_view(infoPtr); + if (uNewView != uOldView) { SIZE oldIconSize = infoPtr->iconSize; @@ -10094,7 +10119,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETUNICODEFORMAT: return (infoPtr->notifyFormat == NFR_UNICODE); - /* case LVM_GETVIEW: */ + case LVM_GETVIEW: + return infoPtr->uView; case LVM_GETVIEWRECT: return LISTVIEW_GetViewRect(infoPtr, (LPRECT)lParam);

1 0

Nikolay Sivov : comctl32/listview: Implement LVM_SETVIEW.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 6a3ac63c6b6bfa660642a19da305f27bda88f95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3ac63c6b6bfa660642a19da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 3 08:05:27 2009 +0400 comctl32/listview: Implement LVM_SETVIEW. --- dlls/comctl32/listview.c | 434 +++++++++++++++++++++++++--------------------- 1 files changed, 236 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a3ac63c6b6bfa660642a…

1 0

Henri Verbeet : wined3d: Introduce texture_init() to handle most of the 2D texture initialization.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 5171a65d81a04e84747011477fadfdf9a94c1fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5171a65d81a04e84747011477… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:25 2009 +0200 wined3d: Introduce texture_init() to handle most of the 2D texture initialization. --- dlls/wined3d/device.c | 151 +-------------------- dlls/wined3d/texture.c | 297 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 248 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5171a65d81a04e8474701…

1 0

Henri Verbeet : wined3d: Introduce cubetexture_cleanup().
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: aabb51286d08db1e8df096b956fb5cac274be5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabb51286d08db1e8df096b95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 wined3d: Introduce cubetexture_cleanup(). --- dlls/wined3d/cubetexture.c | 46 +++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index f29db22..2e8c9c4 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,6 +27,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This, D3DCB_DESTROYSURFACEFN surface_destroy_cb) +{ + unsigned int i, j; + + TRACE("(%p) : Cleaning up.\n", This); + + for (i = 0; i < This->baseTexture.levels; ++i) + { + for (j = 0; j < 6; ++j) + { + IWineD3DSurface *surface = This->surfaces[j][i]; + + if (surface) + { + /* Clean out the texture name we gave to the surface so that the + * surface doesn't try and release it. */ + surface_set_texture_name(surface, 0, TRUE); + surface_set_texture_name(surface, 0, FALSE); + surface_set_texture_target(surface, 0); + IWineD3DSurface_SetContainer(surface, NULL); + surface_destroy_cb(surface); + } + } + } + basetexture_cleanup((IWineD3DBaseTexture *)This); +} + /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */ @@ -262,23 +289,8 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) ******************************************* */ static void WINAPI IWineD3DCubeTextureImpl_Destroy(IWineD3DCubeTexture *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroySurface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - unsigned int i,j; - TRACE("(%p) : Cleaning up\n",This); - for (i = 0; i < This->baseTexture.levels; i++) { - for (j = 0; j < 6; j++) { - if (This->surfaces[j][i] != NULL) { - IWineD3DSurface *surface = This->surfaces[j][i]; - /* Clean out the texture name we gave to the surface so that the surface doesn't try and release it */ - surface_set_texture_name(surface, 0, TRUE); - surface_set_texture_name(surface, 0, FALSE); - surface_set_texture_target(surface, 0); - /* Cleanup the container */ - IWineD3DSurface_SetContainer(This->surfaces[j][i], 0); - D3DCB_DestroySurface(This->surfaces[j][i]); - } - } - } - basetexture_cleanup((IWineD3DBaseTexture *)iface); + + cubetexture_cleanup(This, D3DCB_DestroySurface); /* finally delete the object */ HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : wined3d: Introduce cubetexture_init() to handle most of the cube texture initialization.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: b0ba731bd5b12bb2bb8726167dd9dd74f121c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ba731bd5b12bb2bb8726167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 wined3d: Introduce cubetexture_init() to handle most of the cube texture initialization. --- dlls/wined3d/cubetexture.c | 275 +++++++++++++++++++++++++++++++--------- dlls/wined3d/device.c | 111 +---------------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 222 insertions(+), 168 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0ba731bd5b12bb2bb872…

1 0

Henri Verbeet : wined3d: Introduce volumetexture_cleanup().
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 9e69b86a03560fe603c318f5cb7bc4bcc17c7791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e69b86a03560fe603c318f5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 wined3d: Introduce volumetexture_cleanup(). --- dlls/wined3d/volumetexture.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 680df93..6b30f3a 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -26,6 +26,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This, D3DCB_DESTROYVOLUMEFN volume_destroy_cb) +{ + unsigned int i; + + TRACE("(%p) : Cleaning up.\n", This); + + for (i = 0; i < This->baseTexture.levels; ++i) + { + IWineD3DVolume *volume = This->volumes[i]; + + if (volume) + { + /* Cleanup the container. */ + IWineD3DVolume_SetContainer(volume, NULL); + volume_destroy_cb(volume); + } + } + basetexture_cleanup((IWineD3DBaseTexture *)This); +} + /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ @@ -216,16 +236,9 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if ******************************************* */ static void WINAPI IWineD3DVolumeTextureImpl_Destroy(IWineD3DVolumeTexture *iface, D3DCB_DESTROYVOLUMEFN D3DCB_DestroyVolume) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - unsigned int i; - TRACE("(%p) : Cleaning up\n",This); - for (i = 0; i < This->baseTexture.levels; i++) { - if (This->volumes[i] != NULL) { - /* Cleanup the container */ - IWineD3DVolume_SetContainer(This->volumes[i], 0); - D3DCB_DestroyVolume(This->volumes[i]); - } - } - basetexture_cleanup((IWineD3DBaseTexture *)iface); + + volumetexture_cleanup(This, D3DCB_DestroyVolume); + HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : wined3d: Introduce volumetexture_init() to handle most of the volume texture initialization.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 97f320a77b49b95fc8eae267019f39a8f862e8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f320a77b49b95fc8eae2670… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 wined3d: Introduce volumetexture_init() to handle most of the volume texture initialization. --- dlls/wined3d/device.c | 96 ++------------------ dlls/wined3d/volumetexture.c | 196 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 167 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97f320a77b49b95fc8eae…

1 0

Henri Verbeet : include: Add a generic red-black tree.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 484cde13270c18327dc4277f20250e48a23b0d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484cde13270c18327dc4277f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 include: Add a generic red-black tree. --- include/wine/rbtree.h | 342 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 342 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=484cde13270c18327dc42…

1 0

Henri Verbeet : wined3d: Replace the wined3d hash table with the generic red-black tree.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: ad6279de9f6b861401afa1d74100f3825dcd599e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6279de9f6b861401afa1d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 10:47:26 2009 +0200 wined3d: Replace the wined3d hash table with the generic red-black tree. --- dlls/wined3d/arb_program_shader.c | 22 ++- dlls/wined3d/ati_fragment_shader.c | 23 ++- dlls/wined3d/glsl_shader.c | 92 +++++++----- dlls/wined3d/utils.c | 298 ++++-------------------------------- dlls/wined3d/wined3d_private.h | 43 +---- 5 files changed, 121 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad6279de9f6b861401afa…

1 0

Alexandre Julliard : makefiles: Use winegcc to build the crosstests too.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: a2d88ab356dcb6ee71b4ef52416c6b33939bc1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d88ab356dcb6ee71b4ef524… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 17:08:06 2009 +0200 makefiles: Use winegcc to build the crosstests too. --- configure | 47 +++-------------------------------------------- configure.ac | 2 +- dlls/Maketest.rules.in | 12 +++++------- 3 files changed, 9 insertions(+), 52 deletions(-) diff --git a/configure b/configure index 35fb4ac..85f27b7 100755 --- a/configure +++ b/configure @@ -693,8 +693,8 @@ X_PRE_LIBS X_CFLAGS XMKMF LIBPTHREAD +CROSSTARGETFLAGS CROSSTEST -CROSSWINDRES CROSSCC CARBONLIB COREAUDIO @@ -8199,49 +8199,6 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in $host_cpu-pc-mingw32-windres i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CROSSWINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CROSSWINDRES"; then - ac_cv_prog_CROSSWINDRES="$CROSSWINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CROSSWINDRES="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CROSSWINDRES=$ac_cv_prog_CROSSWINDRES -if test -n "$CROSSWINDRES"; then - { $as_echo "$as_me:$LINENO: result: $CROSSWINDRES" >&5 -$as_echo "$CROSSWINDRES" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CROSSWINDRES" && break -done -test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -8289,6 +8246,8 @@ test -n "$MINGWAR" || MINGWAR="false" then CROSSTEST="\$(CROSSTEST)" + CROSSTARGETFLAGS="-b `expr $CROSSCC : '$.*$-gcc'`" + fi fi diff --git a/configure.ac b/configure.ac index 9fc8936..001c312 100644 --- a/configure.ac +++ b/configure.ac @@ -679,11 +679,11 @@ if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) - WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) WINE_CHECK_MINGW_PROG(MINGWAR,ar,false) if test "$CROSSCC" != "false" then AC_SUBST(CROSSTEST,"\$(CROSSTEST)") + AC_SUBST(CROSSTARGETFLAGS,"-b `expr $CROSSCC : '$.*$-gcc'`") fi fi diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 7ea8372..0ff50d9 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -22,9 +22,8 @@ ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe -CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) $(BISON_SRCS:.y=.tab.cross.o) $(LEX_SRCS:.l=.yy.cross.o) $(IDL_GEN_C_SRCS:.c=.cross.o) testlist.cross.o CROSSCC = @CROSSCC@ -CROSSWINDRES = @CROSSWINDRES@ +CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @MAKE_RULES@ @@ -48,18 +47,17 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests -.SUFFIXES: .cross.o .res.cross.o +CROSSOBJS = $(OBJS:.o=.cross.o) $(RC_SRCS:.rc=.res) + +.SUFFIXES: .cross.o .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< -.res.res.cross.o: - $(CROSSWINDRES) -i $< -o $@ - crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in - $(CROSSCC) $(CROSSOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) + $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) $(CROSSOBJS): $(IDL_GEN_HEADERS)

1 0