Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

by mbosma＠svn.reactos.com

fix compile Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:50:29 UTC (rev 18923) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:59:21 UTC (rev 18924) @@ -324,7 +324,7 @@ /* FIXME Do not use DUMMYUNIONNAME1 some how union lPitch does not see by the compiler but rest of the union are visable. more header problem ??? */ - pDDSD->DUMMYUNIONNAME1.lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; + pDDSD->lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; /* have not check where I should get hold of this info yet _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:50:29 UTC (rev 18923) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:59:21 UTC (rev 18924) @@ -21,27 +21,27 @@ This->owner = (IDirectDrawImpl*)pDD; /************ fill the discription of our primary surface ***********************/ - memset (&ddsd, 0, sizeof(DDSURFACEDESC)); - ddsd.dwSize = sizeof(DDSURFACEDESC); + memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); + This->ddsd.dwSize = sizeof(DDSURFACEDESC); - RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); - RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); - RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); - RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); - RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); + RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); + RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); + RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); + RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); - ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - ddsd.dwFlags = pDDSD2->dwFlags; - ddsd.dwHeight = pDDSD2->dwHeight; - ddsd.dwLinearSize = pDDSD2->dwLinearSize; - ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - ddsd.dwReserved = pDDSD2->dwReserved; - ddsd.dwWidth = pDDSD2->dwWidth; - ddsd.lPitch = pDDSD2->lPitch; - ddsd.lpSurface = pDDSD2->lpSurface; + This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + This->ddsd.dwFlags = pDDSD2->dwFlags; + This->ddsd.dwHeight = pDDSD2->dwHeight; + This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; + This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + This->ddsd.dwReserved = pDDSD2->dwReserved; + This->ddsd.dwWidth = pDDSD2->dwWidth; + This->ddsd.lPitch = pDDSD2->lPitch; + This->ddsd.lpSurface = pDDSD2->lpSurface; /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) @@ -50,7 +50,7 @@ DDHAL_CANCREATESURFACEDATA CanCreateData; memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&ddsd; + CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; @@ -64,8 +64,8 @@ /* FIXME we are skipping filling in some data, I do not care for now */ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + This->ddsd.dwFlags = DDSD_CAPS; + This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); @@ -86,7 +86,7 @@ This->Local.lpSurfMore = &This->More; /* FIXME do a memcopy */ - This->Local.ddsCaps = *(DDSCAPS*)&ddsd.ddsCaps; + This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; /* for the double pointer below */ DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; @@ -97,7 +97,7 @@ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = pDirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; CreateData.ddRVal = DD_FALSE;

18 years, 10 months

[mbosma] 18923: Fixed the "header problems".

by mbosma＠svn.reactos.com

Fixed the "header problems". Modified: trunk/reactos/lib/ddraw/main/surface_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:48:01 UTC (rev 18922) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:50:29 UTC (rev 18923) @@ -18,39 +18,31 @@ if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; - This->owner = (IDirectDrawImpl*)pDD; - /************ fill the discription of our primary surface ***********************/ - DDSURFACEDESC ddsd; - memset (&ddsd, 0, sizeof(DDSURFACEDESC)); - ddsd.dwSize = sizeof(DDSURFACEDESC); + /************ fill the discription of our primary surface ***********************/ + memset (&ddsd, 0, sizeof(DDSURFACEDESC)); + ddsd.dwSize = sizeof(DDSURFACEDESC); - /* FIXME Fill the rest from ddsd2 to ddsd */ + RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); + RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); + RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); + RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); + RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); - RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); - RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); - RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); - RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); - RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + ddsd.dwFlags = pDDSD2->dwFlags; + ddsd.dwHeight = pDDSD2->dwHeight; + ddsd.dwLinearSize = pDDSD2->dwLinearSize; + ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + ddsd.dwReserved = pDDSD2->dwReserved; + ddsd.dwWidth = pDDSD2->dwWidth; + ddsd.lPitch = pDDSD2->lPitch; + ddsd.lpSurface = pDDSD2->lpSurface; - ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - ddsd.dwFlags = pDDSD2->dwFlags; - ddsd.dwHeight = pDDSD2->dwHeight; - /* FIXME ddsd.dwLinearSize = pDDSD2->dwLinearSize; Problem with our header for dx */ - ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - ddsd.dwReserved = pDDSD2->dwReserved; - ddsd.dwWidth = pDDSD2->dwWidth; - /* FIXME ddsd.dwZBufferBitDepth where in pDDSD2 */ - /* FIXME ddsd.lPitch = pDDSD2->lPitch; Problem with our header for dx */ - ddsd.lpSurface = pDDSD2->lpSurface; - - - - /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { @@ -67,7 +59,6 @@ return CanCreateData.ddRVal; } - /************ Create Surface ***********************/ /* FIXME we are skipping filling in some data, I do not care for now */ @@ -109,9 +100,8 @@ CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; - CreateData.ddRVal = DD_FALSE; + CreateData.ddRVal = DD_FALSE; - /* this is the call we were waiting for */ if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 09:48:01 UTC (rev 18922) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 09:50:29 UTC (rev 18923) @@ -45,6 +45,7 @@ DDRAWI_DDRAWSURFACE_MORE More; DDRAWI_DDRAWSURFACE_LCL Local; DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + DDSURFACEDESC ddsd; } IDirectDrawSurfaceImpl;

18 years, 10 months

[mbosma] 18922: Remove DUMMYUNIONNAMEs since it fixes compile problems.

by mbosma＠svn.reactos.com

Remove DUMMYUNIONNAMEs since it fixes compile problems. Modified: trunk/reactos/w32api/include/ddraw.h _____ Modified: trunk/reactos/w32api/include/ddraw.h --- trunk/reactos/w32api/include/ddraw.h 2005-11-01 08:37:43 UTC (rev 18921) +++ trunk/reactos/w32api/include/ddraw.h 2005-11-01 09:48:01 UTC (rev 18922) @@ -998,13 +998,13 @@ union { LONG lPitch; /* 10: distance to start of next line (return value only)*/ DWORD dwLinearSize; - } DUMMYUNIONNAME1; + }; DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ union { DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ - } DUMMYUNIONNAME2; + }; DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ DWORD dwReserved; /* 20:reserved*/ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ @@ -1025,28 +1025,27 @@ union { LONG lPitch; /*10: distance to start of next line (return value only)*/ DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */ - } DUMMYUNIONNAME1; + }; DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ union { DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */ - } DUMMYUNIONNAME2; + }; DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ DWORD dwReserved; /* 20:reserved*/ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ union { DDCOLORKEY ddckCKDestOverlay; /* 28: CK for dest overlay use*/ DWORD dwEmptyFaceColor; /* 28: color for empty cubemap faces */ - } DUMMYUNIONNAME3; + }; DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/ DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/ DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/ - union { DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/ DWORD dwFVF; /* 48: vertex format description of vertex buffers */ - } DUMMYUNIONNAME4; + }; DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */ DWORD dwTextureStage; /* 78: stage in multitexture cascade */ } DDSURFACEDESC2,*LPDDSURFACEDESC2;

18 years, 10 months

[mbosma] 18921: Created makefile for alphablend-test in rosapps.

by mbosma＠svn.reactos.com

Created makefile for alphablend-test in rosapps. Modified: trunk/rosapps/directory.xml Deleted: trunk/rosapps/tests/Makefile Added: trunk/rosapps/tests/alphablend/alphablend.xml Deleted: trunk/rosapps/tests/alphablend/makefile Modified: trunk/rosapps/tests/directory.xml _____ Modified: trunk/rosapps/directory.xml --- trunk/rosapps/directory.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/directory.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -45,6 +45,9 @@ <directory name="templates"> <xi:include href="templates/directory.xml" /> </directory> +<directory name="tests"> + <xi:include href="tests/directory.xml" /> +</directory> <!-- <directory name="welcome"> <xi:include href="welcome/welcome.xml" /> _____ Deleted: trunk/rosapps/tests/Makefile --- trunk/rosapps/tests/Makefile 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/Makefile 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,132 +0,0 @@ -# -# ReactOS test applications makefile -# - -PATH_TO_TOP = ../../reactos - -include $(PATH_TO_TOP)/rules.mak - -# Broken tests -# dnsapi iptest lan regdump subclass - -TEST_APPS = \ -accelerator \ -alive \ -alphablend \ -apc \ -apc2 \ -args \ -atomtest \ -bench \ -bitblt \ -button \ -button2 \ -capclock \ -carets \ -combo \ -consume \ -copymove \ -count \ -create-links \ -dibtest \ -dirdlg \ -diskspeed \ -dnsquery \ -edit \ -enhmetafile \ -enumfonts \ -enumwnd \ -enumws \ -event \ -eventpair \ -fiber \ -global_mem \ -gradient \ -guithreadinfo \ -hello \ -hivetest \ -icontest \ -isotest \ -lineclip \ -linetest \ -lpc \ -map_dup_inherit \ -mdi \ -mktime \ -moztest \ -mstest \ -multithrdwin \ -multiwin \ -mutex \ -nameserverlist \ -noexecute \ -nptest \ -oskittcp \ -p_dup_handle \ -palbitblt \ -patblt \ -polytest \ -popupmenu \ -primitives \ -pteb \ -regqueryvalue \ -regtest \ -sectest \ -sertest \ -shaptest \ -shm \ -statst \ -statst2 \ -stretchblt \ -suspend \ -tcpsvr \ -terminate \ -thread \ -thread_msg \ -threadwait \ -tmrqueue \ -tokentest \ -txtscale \ -vmtest \ -winhello \ -wm_erasebkgnd \ -wm_paint \ -zwcontinue - -# Deactivated tests: -# dump_shared_data -# miditest - -all: $(TEST_APPS) - -depends: - -implib: $(TEST_APPS:%=%_implib) - -clean: $(TEST_APPS:%=%_clean) - -install: $(TEST_APPS:%=%_install) - -.PHONY: all depends implib clean install - -# -# Test Applications -# -$(TEST_APPS): %: - $(MAKE) -C $* - -$(TEST_APPS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(TEST_APPS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(TEST_APPS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(TEST_APPS) $(TEST_APPS:%=%_implib) $(TEST_APPS:%=%_clean) $(TEST_APPS:%=%_install) - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF _____ Added: trunk/rosapps/tests/alphablend/alphablend.xml --- trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Deleted: trunk/rosapps/tests/alphablend/makefile --- trunk/rosapps/tests/alphablend/makefile 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/alphablend/makefile 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = alphablend - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/directory.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,271 +1,3 @@ -<directory name="accelerator"> - <xi:include href="accelerator/accelerator.xml" /> -</directory> -<directory name="alive"> - <xi:include href="alive/alive.xml" /> -</directory> <directory name="alphablend"> <xi:include href="alphablend/alphablend.xml" /> -</directory> -<directory name="apc"> - <xi:include href="apc/apc.xml" /> -</directory> -<directory name="apc2"> - <xi:include href="apc2/apc2.xml" /> -</directory> -<directory name="args"> - <xi:include href="args/args.xml" /> -</directory> -<directory name="atomtest"> - <xi:include href="atomtest/atomtest.xml" /> -</directory> -<directory name="bench"> - <xi:include href="bench/bench.xml" /> -</directory> -<directory name="bitblt"> - <xi:include href="bitblt/bitblt.xml" /> -</directory> -<directory name="button"> - <xi:include href="button/button.xml" /> -</directory> -<directory name="button2"> - <xi:include href="button2/button2.xml" /> -</directory> -<directory name="capclock"> - <xi:include href="capclock/capclock.xml" /> -</directory> -<directory name="carets"> - <xi:include href="carets/carets.xml" /> -</directory> -<directory name="combo"> - <xi:include href="combo/combo.xml" /> -</directory> -<directory name="consume"> - <xi:include href="consume/consume.xml" /> -</directory> -<directory name="copymove"> - <xi:include href="copymove/copymove.xml" /> -</directory> -<directory name="count"> - <xi:include href="count/count.xml" /> -</directory> -<directory name="create-links"> - <xi:include href="create-links/create-links.xml" /> -</directory> -<directory name="dibtest"> - <xi:include href="dibtest/dibtest.xml" /> -</directory> -<directory name="dirdlg"> - <xi:include href="dirdlg/dirdlg.xml" /> -</directory> -<directory name="diskspeed"> - <xi:include href="diskspeed/diskspeed.xml" /> -</directory> -<directory name="dnsapi"> - <xi:include href="dnsapi/dnsapi.xml" /> -</directory> -<directory name="dnsquery"> - <xi:include href="dnsquery/dnsquery.xml" /> -</directory> -<directory name="dump_shared_data"> - <xi:include href="dump_shared_data/dump_shared_data.xml" /> -</directory> -<directory name="edit"> - <xi:include href="edit/edit.xml" /> -</directory> -<directory name="enhmetafile"> - <xi:include href="enhmetafile/enhmetafile.xml" /> -</directory> -<directory name="enumfonts"> - <xi:include href="enumfonts/enumfonts.xml" /> -</directory> -<directory name="enumwnd"> - <xi:include href="enumwnd/enumwnd.xml" /> -</directory> -<directory name="enumws"> - <xi:include href="enumws/enumws.xml" /> -</directory> -<directory name="event"> - <xi:include href="event/event.xml" /> -</directory> -<directory name="eventpair"> - <xi:include href="eventpair/eventpair.xml" /> -</directory> -<directory name="fiber"> - <xi:include href="fiber/fiber.xml" /> -</directory> -<directory name="gethostbyname"> - <xi:include href="gethostbyname/gethostbyname.xml" /> -</directory> -<directory name="global_mem"> - <xi:include href="global_mem/global_mem.xml" /> -</directory> -<directory name="gradient"> - <xi:include href="gradient/gradient.xml" /> -</directory> -<directory name="guithreadinfo"> - <xi:include href="guithreadinfo/guithreadinfo.xml" /> -</directory> -<directory name="hello"> - <xi:include href="hello/hello.xml" /> -</directory> -<directory name="hivetest"> - <xi:include href="hivetest/hivetest.xml" /> -</directory> -<directory name="icontest"> - <xi:include href="icontest/icontest.xml" /> -</directory> -<directory name="iptest"> - <xi:include href="iptest/iptest.xml" /> -</directory> -<directory name="isotest"> - <xi:include href="isotest/isotest.xml" /> -</directory> -<directory name="lan"> - <xi:include href="lan/lan.xml" /> -</directory> -<directory name="lineclip"> - <xi:include href="lineclip/lineclip.xml" /> -</directory> -<directory name="linetest"> - <xi:include href="linetest/linetest.xml" /> -</directory> -<directory name="lpc"> - <xi:include href="lpc/lpc.xml" /> -</directory> -<directory name="map_dup_inherit"> - <xi:include href="map_dup_inherit/map_dup_inherit.xml" /> -</directory> -<directory name="mdi"> - <xi:include href="mdi/mdi.xml" /> -</directory> -<directory name="miditest"> - <xi:include href="miditest/miditest.xml" /> -</directory> -<directory name="mktime"> - <xi:include href="mktime/mktime.xml" /> -</directory> -<directory name="moztest"> - <xi:include href="moztest/moztest.xml" /> -</directory> -<directory name="mstest"> - <xi:include href="mstest/mstest.xml" /> -</directory> -<directory name="multithrdwin"> - <xi:include href="multithrdwin/multithrdwin.xml" /> -</directory> -<directory name="multiwin"> - <xi:include href="multiwin/multiwin.xml" /> -</directory> -<directory name="mutex"> - <xi:include href="mutex/mutex.xml" /> -</directory> -<directory name="nameserverlist"> - <xi:include href="nameserverlist/nameserverlist.xml" /> -</directory> -<directory name="noexecute"> - <xi:include href="noexecute/noexecute.xml" /> -</directory> -<directory name="nptest"> - <xi:include href="nptest/nptest.xml" /> -</directory> -<directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.xml" /> -</directory> -<directory name="palbitblt"> - <xi:include href="palbitblt/palbitblt.xml" /> -</directory> -<directory name="patblt"> - <xi:include href="patblt/patblt.xml" /> -</directory> -<directory name="p_dup_handle"> - <xi:include href="p_dup_handle/p_dup_handle.xml" /> -</directory> -<directory name="polytest"> - <xi:include href="polytest.xml" /> -</directory> -<directory name="popupmenu"> - <xi:include href="popupmenu/popupmenu.xml" /> -</directory> -<directory name="primitives"> - <xi:include href="primitives/primitives.xml" /> -</directory> -<directory name="pteb"> - <xi:include href="pteb/pteb.xml" /> -</directory> -<directory name="regdump"> - <xi:include href="regdump/regdump.xml" /> -</directory> -<directory name="regqueryvalue"> - <xi:include href="regqueryvalue/regqueryvalue.xml" /> -</directory> -<directory name="regtest"> - <xi:include href="regtest/regtest.xml" /> -</directory> -<directory name="sectest"> - <xi:include href="sectest/sectest.xml" /> -</directory> -<directory name="sertest"> - <xi:include href="sertest/sertest.xml" /> -</directory> -<directory name="shaptest"> - <xi:include href="shaptest/shaptest.xml" /> -</directory> -<directory name="shm"> - <xi:include href="shm/shm.xml" /> -</directory> -<directory name="statst"> - <xi:include href="statst/statst.xml" /> -</directory> -<directory name="statst2"> - <xi:include href="statst2/statst2.xml" /> -</directory> -<directory name="stretchblt"> - <xi:include href="stretchblt/stretchblt.xml" /> -</directory> -<directory name="subclass"> - <xi:include href="subclass/subclass.xml" /> -</directory> -<directory name="suspend"> - <xi:include href="suspend/suspend.xml" /> -</directory> -<directory name="tcpsvr"> - <xi:include href="tcpsvr/tcpsvr.xml" /> -</directory> -<directory name="terminate"> - <xi:include href="terminate/terminate.xml" /> -</directory> -<directory name="thread"> - <xi:include href="thread/thread.xml" /> -</directory> -<directory name="thread_msg"> - <xi:include href="thread_msg/thread_msg.xml" /> -</directory> -<directory name="threadwait"> - <xi:include href="threadwait/threadwait.xml" /> -</directory> -<directory name="tmrqueue"> - <xi:include href="tmrqueue/tmrqueue.xml" /> -</directory> -<directory name="tokentest"> - <xi:include href="tokentest/tokentest.xml" /> -</directory> -<directory name="txtscale"> - <xi:include href="txtscale/txtscale.xml" /> -</directory> -<directory name="vmtest"> - <xi:include href="vmtest/vmtest.xml" /> -</directory> -<directory name="winhello"> - <xi:include href="winhello/winhello.xml" /> -</directory> -<directory name="wm_erasebkgnd"> - <xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" /> -</directory> -<directory name="wm_paint"> - <xi:include href="wm_paint/wm_paint.xml" /> -</directory> -<directory name="zwcontinue"> - <xi:include href="zwcontinue/zwcontinue.xml" /> -</directory> - +</directory> \ No newline at end of file

18 years, 10 months

[mf] 18920: correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes() to fix explorer's start menu root

by mf＠svn.reactos.com

correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes() to fix explorer's start menu root Modified: trunk/reactos/lib/shell32/shlfolder.c _____ Modified: trunk/reactos/lib/shell32/shlfolder.c --- trunk/reactos/lib/shell32/shlfolder.c 2005-10-31 20:43:06 UTC (rev 18919) +++ trunk/reactos/lib/shell32/shlfolder.c 2005-11-01 01:39:45 UTC (rev 18920) @@ -411,14 +411,13 @@ *pdwAttributes &= dwSupportedAttr; } + dwAttributes = *pdwAttributes; + if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (_ILGetGUIDPointer (pidl)) { - if (!HCR_GetFolderAttributes (pidl, pdwAttributes)) { - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; - } + } else if (_ILGetGUIDPointer (pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { dwAttributes = _ILGetFileAttributes (pidl, NULL, 0);

18 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005