Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 23293: Export CPlApplet() as stdcall patch from Thomas Weidenmueller
by gedmurphy＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: gedmurphy Date: Wed Jul 26 01:19:31 2006 New Revision: 23293 URL: http://svn.reactos.org/svn/reactos?rev=23293&view=rev Log: Export CPlApplet() as stdcall patch from Thomas Weidenmueller Modified: trunk/reactos/dll/cpl/access/access.def trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl_new/intl.def trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/powercfg/powercfg.def trunk/reactos/dll/cpl/sysdm/sysdm.def trunk/reactos/dll/cpl/timedate/timedate.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY access.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/cplsample/cplsample.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cplsample/cplsampl… ============================================================================== --- trunk/reactos/dll/cpl/cplsample/cplsample.def (original) +++ trunk/reactos/dll/cpl/cplsample/cplsample.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (original) +++ trunk/reactos/dll/cpl/intl_new/intl.def Wed Jul 26 01:19:31 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet -RegOptsProc -ExtraOptsProc +CPlApplet@16 +RegOptsProc@16 +ExtraOptsProc@16 ; EOF Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/powercfg/powercfg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.def (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.def?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.def (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY sysdm.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF Modified: trunk/reactos/dll/cpl/timedate/timedate.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.def (original) +++ trunk/reactos/dll/cpl/timedate/timedate.def Wed Jul 26 01:19:31 2006 @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF

1 0

[ion] 23292: - Fix a bug in LPC creation (missing one handle) and LPC closing (was not properly closing the port). This caused LPC_PORT_CLOSED never to be sent, and thus CSRSS never received and never closed its handle of the process, meaning that all win32 processes leaked. - As a result, processes can die again, and also be killed by Task Manager. - And finally, "Exit" in cmd.exe as well as pressing the "x" button work.
by ion＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: ion Date: Wed Jul 26 00:21:24 2006 New Revision: 23292 URL: http://svn.reactos.org/svn/reactos?rev=23292&view=rev Log: - Fix a bug in LPC creation (missing one handle) and LPC closing (was not properly closing the port). This caused LPC_PORT_CLOSED never to be sent, and thus CSRSS never received and never closed its handle of the process, meaning that all win32 processes leaked. - As a result, processes can die again, and also be killed by Task Manager. - And finally, "Exit" in cmd.exe as well as pressing the "x" button work. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Jul 26 00:21:24 2006 @@ -24,7 +24,6 @@ // - Add support for Fast Dispatch I/O. // // Ps: -// - Figure out why processes don't die. // - Generate process cookie for user-more thread. // // Ob: @@ -32,11 +31,9 @@ // - Add Directory Lock. // - Use Object Type Mutex/Lock. // - Implement handle database if anyone needs it. -// - Figure out why cmd.exe won't close anymore. // // Ex: // - Use pushlocks for handle implementation. -// - Figure out why cmd.exe won't close anymore. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c (original) +++ trunk/reactos/ntoskrnl/lpc/close.c Wed Jul 26 00:21:24 2006 @@ -57,13 +57,11 @@ /* FIXME Race conditions here! */ - DPRINT("NiClosePort 0x%p OtherPort 0x%p State %d\n", Port, Port->OtherPort, Port->State); - /* * If the client has just closed its handle then tell the server what * happened and disconnect this port. */ - if (HandleCount == 1 && Port->State == EPORT_CONNECTED_CLIENT) + if (!(HandleCount)&& (Port->State == EPORT_CONNECTED_CLIENT)) { DPRINT("Informing server\n"); Message.u1.s1.TotalLength = sizeof(PORT_MESSAGE); @@ -85,7 +83,7 @@ * If the server has closed all of its handles then disconnect the port, * don't actually notify the client until it attempts an operation. */ - if (HandleCount == 1 && Port->State == EPORT_CONNECTED_SERVER) + if (!(HandleCount)&& (Port->State == EPORT_CONNECTED_SERVER)) { DPRINT("Cleaning up server\n"); Port->OtherPort->OtherPort = NULL; Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c Wed Jul 26 00:21:24 2006 @@ -552,8 +552,8 @@ Status = ObInsertObject(ConnectedPort, NULL, PORT_ALL_ACCESS, - 0, - NULL, + 1, + (PVOID*)&ConnectedPort, &ConnectedPortHandle); if (!NT_SUCCESS(Status)) {

1 0

[gedmurphy] 23291: quick build fix Code needs fixing (and formatting) correctly.
by gedmurphy＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: gedmurphy Date: Wed Jul 26 00:02:26 2006 New Revision: 23291 URL: http://svn.reactos.org/svn/reactos?rev=23291&view=rev Log: quick build fix Code needs fixing (and formatting) correctly. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Wed Jul 26 00:02:26 2006 @@ -1047,7 +1047,7 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - BOOL dummy = TRUE; + //BOOL dummy = TRUE; DEVMODE DevMode; int iMode=0; int Width=0; @@ -1103,8 +1103,9 @@ if (This->mDdSetMode.SetMode(&This->mDdSetMode) == DDHAL_DRIVER_HANDLED) { if (This->mDdSetMode.ddRVal == DD_OK) + ; //DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - } + //} }

1 0

[ion] 23290: - Hack FPU handler. 2nd stage installation now works if you had a crash, as well as any other crash where your trace indidicated one of the following: "CoordLpToDP", "KiHandleFpuFault".
by ion＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: ion Date: Tue Jul 25 23:49:53 2006 New Revision: 23290 URL: http://svn.reactos.org/svn/reactos?rev=23290&view=rev Log: - Hack FPU handler. 2nd stage installation now works if you had a crash, as well as any other crash where your trace indidicated one of the following: "CoordLpToDP", "KiHandleFpuFault". Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/fpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/fpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c Tue Jul 25 23:49:53 2006 @@ -363,14 +363,11 @@ { if (ExceptionNr == 7) /* device not present */ { - BOOL FpuInitialized = FALSE; + //BOOL FpuInitialized = FALSE; unsigned int cr0 = Ke386GetCr0(); PKTHREAD CurrentThread; - PFX_SAVE_AREA FxSaveArea; + //PFX_SAVE_AREA FxSaveArea; KIRQL oldIrql; -#ifndef CONFIG_SMP - PKTHREAD NpxThread; -#endif (void) cr0; ASSERT((cr0 & X86_CR0_TS) == X86_CR0_TS); @@ -383,73 +380,7 @@ asm volatile("clts"); CurrentThread = KeGetCurrentThread(); -#ifndef CONFIG_SMP - NpxThread = KeGetCurrentPrcb()->NpxThread; -#endif - ASSERT(CurrentThread != NULL); - DPRINT("Device not present exception happened! (Cr0 = 0x%x, NpxState = 0x%x)\n", cr0, CurrentThread->NpxState); - -#ifndef CONFIG_SMP - /* check if the current thread already owns the FPU */ - if (NpxThread != CurrentThread) /* FIXME: maybe this could be an assertation */ - { - /* save the FPU state into the owner's save area */ - if (NpxThread != NULL) - { - KeGetCurrentPrcb()->NpxThread = NULL; - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)NpxThread->InitialStack - sizeof (FX_SAVE_AREA)); - /* the fnsave might raise a delayed #MF exception */ - if (KeI386FxsrPresent) - { - asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); - } - else - { - asm volatile("fnsave %0" : : "m"(FxSaveArea->U.FnArea)); - FpuInitialized = TRUE; - } - NpxThread->NpxState = NPX_STATE_VALID; - } -#endif /* !CONFIG_SMP */ - - /* restore the state of the current thread */ - ASSERT((CurrentThread->NpxState & NPX_STATE_DIRTY) == 0); - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)CurrentThread->InitialStack - sizeof (FX_SAVE_AREA)); - if (CurrentThread->NpxState & NPX_STATE_VALID) - { - if (KeI386FxsrPresent) - { - FxSaveArea->U.FxArea.MXCsr &= MxcsrFeatureMask; - asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); - } - else - { - asm volatile("frstor %0" : : "m"(FxSaveArea->U.FnArea)); - } - } - else /* NpxState & NPX_STATE_INVALID */ - { - DPRINT("Setting up clean FPU state\n"); - if (KeI386FxsrPresent) - { - memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); - FxSaveArea->U.FxArea.ControlWord = 0x037f; - if (KeI386XMMIPresent) - { - FxSaveArea->U.FxArea.MXCsr = 0x00001f80 & MxcsrFeatureMask; - } - asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); - } - else if (!FpuInitialized) - { - asm volatile("fninit"); - } - } - KeGetCurrentPrcb()->NpxThread = CurrentThread; -#ifndef CONFIG_SMP - } -#endif CurrentThread->NpxState |= NPX_STATE_DIRTY; KeLowerIrql(oldIrql);

1 0

[greatlrd] 23289: Move some stuff from createsurface to startup.c Bugfix some other stuff
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 23:20:49 2006 New Revision: 23289 URL: http://svn.reactos.org/svn/reactos?rev=23289&view=rev Log: Move some stuff from createsurface to startup.c Bugfix some other stuff Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 23:20:49 2006 @@ -250,8 +250,9 @@ if (This->mDdCreatePalette.CreatePalette(&This->mDdCreatePalette) == DDHAL_DRIVER_HANDLED); { - if (This->mDdSetMode.ddRVal == DD_OK) + if (This->mDdCreatePalette.ddRVal == DD_OK) { + Main_DirectDraw_AddRef(iface); return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); } @@ -305,12 +306,9 @@ That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; - // FIXME free This->mDDrawGlobal.dsList on release - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDRAWI_DDRAWSURFACE_INT)); + That->Owner = (IDirectDrawImpl *)This; - That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; - + /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; @@ -1101,9 +1099,16 @@ This->mDdSetMode.ddRVal = DDERR_NOTPALETTIZED; This->mDdSetMode.dwModeIndex = iMode; - This->mDdSetMode.SetMode(&This->mDdSetMode); - - DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + + if (This->mDdSetMode.SetMode(&This->mDdSetMode) == DDHAL_DRIVER_HANDLED) + { + if (This->mDdSetMode.ddRVal == DD_OK) + //DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + } + } + + + /* FIXME fill the This->DirectDrawGlobal.vmiData right */ //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue Jul 25 23:20:49 2006 @@ -212,6 +212,19 @@ /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + + + /* Setup global surface */ + // FIXME free dsList when we exist + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); + This->mDDrawGlobal.dsList->dwIntRefCnt =1; + + This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; return DD_OK; } @@ -364,13 +377,7 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); - /* Setup global surface */ - /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch;*/ + /* FIXME free it in cleanup */ // This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT));

1 0

[greatlrd] 23288: rewrote Main_DDrawSurface_AddAttachedSurface lite so we are using Gdientry DdattachSurface and using wine attach code. to keep Hal compatible.
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 21:31:07 2006 New Revision: 23288 URL: http://svn.reactos.org/svn/reactos?rev=23288&view=rev Log: rewrote Main_DDrawSurface_AddAttachedSurface lite so we are using Gdientry DdattachSurface and using wine attach code. to keep Hal compatible. Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Jul 25 21:31:07 2006 @@ -113,19 +113,48 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { + DWORD ret; DX_WINDBG_trace(); - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - - IDirectDrawSurfaceImpl* That = NULL; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)pAttach; + if (pAttach==NULL) { - return DDERR_INVALIDOBJECT; + return DDERR_CANNOTATTACHSURFACE; } - That = (IDirectDrawSurfaceImpl*)pAttach; + + ret = DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); + + if (ret == DD_OK) + { + /* + Here we put in wine code + + Wine Code from wine cvs 27/7-2006 + with small changes to fith into our ddraw desgin + + */ + if (This->Surf->mddsdPrimary.ddsCaps.dwCaps & That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + That->Surf->mddsdPrimary.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + } + + if( (That->Surf->next_attached != NULL) || (That->Surf->first_attached != (DWORD*)That) ) + { + DX_STUB_str("Wine Code fails"); + return DDERR_CANNOTATTACHSURFACE; + } + + That->Surf->next_attached = This->Surf->next_attached; + That->Surf->first_attached = This->Surf->first_attached; + This->Surf->next_attached = (DWORD*)That; + + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)pAttach); + return DD_OK; + } - //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) - return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); + return ret; } /* MSDN: "not currently implemented." */

1 0

[greatlrd] 23287: Implement Main_DDrawSurface_EnumAttachedSurfaces after wine desgin of it we need rewrite Createsurface and Implement AttahedSurface Thanks to wine code and some wine devloper to expain how it works I got one more directx sdk sample working parlty with this change.
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 20:57:57 2006 New Revision: 23287 URL: http://svn.reactos.org/svn/reactos?rev=23287&view=rev Log: Implement Main_DDrawSurface_EnumAttachedSurfaces after wine desgin of it we need rewrite Createsurface and Implement AttahedSurface Thanks to wine code and some wine devloper to expain how it works I got one more directx sdk sample working parlty with this change. Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Jul 25 20:57:57 2006 @@ -190,9 +190,45 @@ LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { - DX_WINDBG_trace(); - - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl *surf; + DDSURFACEDESC2 desc; + + DX_WINDBG_trace(); + + /* + Wine Code from wine cvs 27/7-2006 + with small changes to fith into our ddraw desgin + */ + + if(cb == NULL) + { + return DDERR_INVALIDPARAMS; + } + + for (surf = (IDirectDrawSurfaceImpl*)This->Surf->next_complex; surf != NULL; surf = (IDirectDrawSurfaceImpl*)surf->Surf->next_complex) + { + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)surf); + desc = surf->Surf->mddsdPrimary; + /* check: != DDENUMRET_OK or == DDENUMRET_CANCEL? */ + if (cb((LPDIRECTDRAWSURFACE7)surf, &desc, context) == DDENUMRET_CANCEL) + { + return DD_OK; + } + } + + for (surf = (IDirectDrawSurfaceImpl*)This->Surf->next_attached; surf != NULL; surf = (IDirectDrawSurfaceImpl*)surf->Surf->next_attached) + { + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)surf); + desc = surf->Surf->mddsdPrimary; + /* check: != DDENUMRET_OK or == DDENUMRET_CANCEL? */ + if (cb((LPDIRECTDRAWSURFACE7)surf, &desc, context) == DDENUMRET_CANCEL) + { + return DD_OK; + } + } + + return DD_OK; } HRESULT WINAPI

1 0

[greatlrd] 23286: fixing bsod in GetAttachSurface when pointer is NULL
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 20:04:10 2006 New Revision: 23286 URL: http://svn.reactos.org/svn/reactos?rev=23286&view=rev Log: fixing bsod in GetAttachSurface when pointer is NULL Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 20:04:10 2006 @@ -297,6 +297,8 @@ // FIXME Free memmory at exit return E_OUTOFMEMORY; } + ZeroMemory(surf, sizeof(DxSurf)); + That->lpVtbl = &DirectDrawSurface7_Vtable; Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Jul 25 20:04:10 2006 @@ -235,7 +235,7 @@ LPDIRECTDRAWSURFACE7* ppSurface) { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - IDirectDrawSurfaceImpl *surf; + IDirectDrawSurfaceImpl *surf; DDSCAPS2 our_caps; DX_WINDBG_trace(); @@ -246,7 +246,7 @@ */ our_caps = *pCaps; - + /* FIXME adding version check Earlier dx apps put garbage into these members, clear them @@ -255,32 +255,43 @@ our_caps.dwCaps3 = 0; our_caps.dwCaps4 = 0; - surf = This; - while( (surf = surf->Surf->next_complex) ) - { - if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && - ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) - { - *ppSurface = (LPDIRECTDRAWSURFACE7)surf; - Main_DDrawSurface_AddRef(*ppSurface); - return DD_OK; - } - } - - /* Next, look at the attachment chain */ - surf = This; - - while( (surf = surf->Surf->next_attached) ) - { - if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && - ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) - { - *ppSurface = (LPDIRECTDRAWSURFACE7)surf; - Main_DDrawSurface_AddRef(*ppSurface); - return DD_OK; - } - } - + //surf = (IDirectDrawSurfaceImpl*)This->Surf->next_complex; + if (This->Surf->next_complex != NULL) + { + surf = (IDirectDrawSurfaceImpl*)This->Surf->next_complex; + while( surf != NULL ) + { + if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && + ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) + { + *ppSurface = (LPDIRECTDRAWSURFACE7)surf; + Main_DDrawSurface_AddRef(*ppSurface); + DX_STUB_str("surf->Surf->next_complex ok"); + return DD_OK; + } + surf = (IDirectDrawSurfaceImpl*)This->Surf->next_complex; + } + } + + if (This->Surf->next_attached != NULL) + { + surf = (IDirectDrawSurfaceImpl*)This->Surf->next_attached; + + while(surf != NULL) + { + if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && + ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) + { + *ppSurface = (LPDIRECTDRAWSURFACE7)surf; + Main_DDrawSurface_AddRef(*ppSurface); + DX_STUB_str("surf->Surf->next_attached ok"); + return DD_OK; + } + surf = (IDirectDrawSurfaceImpl*)This->Surf->next_attached; + } + } + + DX_STUB_str("Fail"); return DDERR_NOTFOUND; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Jul 25 20:04:10 2006 @@ -128,12 +128,12 @@ wine desgin for it type IDirectDrawSurfaceImpl; */ - LPVOID next_attached; - LPVOID first_attached; - LPVOID next_complex; - LPVOID first_complex; - LPVOID next; - LPVOID prev; + DWORD* next_attached; + DWORD* first_attached; + DWORD* next_complex; + DWORD* first_complex; + DWORD* next; + DWORD* prev; /* Need be delete later */ DDRAWI_DDRAWSURFACE_GBL mSurfGlobal;

1 0

[mbosma] 23285: Also committed the red leds because they are way better readable.
by mbosma＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: mbosma Date: Tue Jul 25 18:59:13 2006 New Revision: 23285 URL: http://svn.reactos.org/svn/reactos?rev=23285&view=rev Log: Also committed the red leds because they are way better readable. Modified: trunk/reactos/base/applications/games/winemine/rc/leds.bmp Modified: trunk/reactos/base/applications/games/winemine/rc/leds.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available.

1 0

[mbosma] 23284: Apal (Bug 1632): "I tested winemine but I really didn't enjoy the color combination, so I decided to change it a little bit so as to appear more like classic Windows' minesweeper!"
by mbosma＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: mbosma Date: Tue Jul 25 18:43:00 2006 New Revision: 23284 URL: http://svn.reactos.org/svn/reactos?rev=23284&view=rev Log: Apal (Bug 1632): "I tested winemine but I really didn't enjoy the color combination, so I decided to change it a little bit so as to appear more like classic Windows' minesweeper!" Modified: trunk/reactos/base/applications/games/winemine/main.c trunk/reactos/base/applications/games/winemine/rc/faces.bmp trunk/reactos/base/applications/games/winemine/rc/mines.bmp Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/main.c (original) +++ trunk/reactos/base/applications/games/winemine/main.c Tue Jul 25 18:43:00 2006 @@ -58,7 +58,7 @@ wc.hInstance = hInst; wc.hIcon = LoadIcon( hInst, appname ); wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION ); - wc.hbrBackground = (HBRUSH) GetStockObject( BLACK_BRUSH ); + wc.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname; @@ -519,14 +519,14 @@ top = BOARD_HMARGIN; right = left + LED_WIDTH * 3; bottom = top + LED_HEIGHT; - SetRect( &p_board->timer_rect, left, top, right, bottom ); + SetRect( &p_board->counter_rect, left, top, right, bottom ); /* setting the counter rectangle boundary */ left = p_board->width - BOARD_WMARGIN - LED_WIDTH * 3; top = BOARD_HMARGIN; right = p_board->width - BOARD_WMARGIN; bottom = top + LED_HEIGHT; - SetRect( &p_board->counter_rect, left, top, right, bottom ); + SetRect( &p_board->timer_rect, left, top, right, bottom ); p_board->status = WAITING; p_board->face_bmp = SMILE_BMP; @@ -723,9 +723,9 @@ } /* use unlit led if not playing */ - if( p_board->status == WAITING ) + /* if( p_board->status == WAITING ) for( i = 0; i < 3; i++ ) - led[i] = 11; + led[i] = 11;*/ hOldObj = SelectObject (hMemDC, p_board->hLedsBMP); @@ -766,7 +766,7 @@ { RECT tmp_rect; - if( IntersectRect( &tmp_rect, &ps->rcPaint, &p_board->counter_rect ) ) + if( IntersectRect( &tmp_rect, &ps->rcPaint, &p_board->counter_rect) ) DrawLeds( hdc, hMemDC, p_board, p_board->mines - p_board->num_flags, p_board->counter_rect.left, p_board->counter_rect.top ); @@ -774,7 +774,7 @@ if( IntersectRect( &tmp_rect, &ps->rcPaint, &p_board->timer_rect ) ) DrawLeds( hdc, hMemDC, p_board, p_board->time, p_board->timer_rect.left, - p_board->timer_rect.top ); + p_board->timer_rect.top); if( IntersectRect( &tmp_rect, &ps->rcPaint, &p_board->face_rect ) ) DrawFace( hdc, hMemDC, p_board ); Modified: trunk/reactos/base/applications/games/winemine/rc/faces.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/games/winemine/rc/mines.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs