Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[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

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);

18 years, 5 months

[greatlrd] 23289: Move some stuff from createsurface to startup.c Bugfix some other stuff

by greatlrd＠svn.reactos.org

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));

18 years, 5 months

[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

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." */

18 years, 5 months

[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

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

18 years, 5 months

[greatlrd] 23286: fixing bsod in GetAttachSurface when pointer is NULL

by greatlrd＠svn.reactos.org

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;

18 years, 5 months

[mbosma] 23285: Also committed the red leds because they are way better readable.

by mbosma＠svn.reactos.org

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.

18 years, 5 months

[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

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.

18 years, 5 months

[greatlrd] 23283: Implement Main_DDrawSurface_GetAttachedSurface 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

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 16:21:00 2006 New Revision: 23283 URL: http://svn.reactos.org/svn/reactos?rev=23283&view=rev Log: Implement Main_DDrawSurface_GetAttachedSurface 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 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 16:21:00 2006 @@ -325,10 +325,10 @@ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -366,7 +366,7 @@ - This->mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; 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 16:21:00 2006 @@ -234,9 +234,54 @@ LPDDSCAPS2 pCaps, LPDIRECTDRAWSURFACE7* ppSurface) { - DX_WINDBG_trace(); - - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl *surf; + DDSCAPS2 our_caps; + + DX_WINDBG_trace(); + + /* + Wine Code from wine cvs 27/7-2006 + with small changes to fith into our ddraw desgin + */ + + our_caps = *pCaps; + + /* + FIXME adding version check + Earlier dx apps put garbage into these members, clear them + */ + our_caps.dwCaps2 = 0; + 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; + } + } + + return DDERR_NOTFOUND; } HRESULT WINAPI 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 16:21:00 2006 @@ -116,10 +116,26 @@ DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - DDSURFACEDESC mddsdPrimary; + DDSURFACEDESC2 mddsdPrimary; DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; + /* + AttachList We need getting surface pointer + of already create surface that have some private + data msdn ATTACHLIST can not provide all info + we need with our desgin therfor we are using + wine desgin for it + type IDirectDrawSurfaceImpl; + */ + LPVOID next_attached; + LPVOID first_attached; + LPVOID next_complex; + LPVOID first_complex; + LPVOID next; + LPVOID prev; + + /* Need be delete later */ DDRAWI_DDRAWSURFACE_GBL mSurfGlobal; DDRAWI_DDRAWSURFACE_MORE mSurfMore; DDRAWI_DDRAWSURFACE_LCL mSurfLocal;

18 years, 5 months

[greatlrd] 23282: patch from LMH1 : Bug#: 1678 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 13:02:45 2006 New Revision: 23282 URL: http://svn.reactos.org/svn/reactos?rev=23282&view=rev Log: patch from LMH1 : Bug#: 1678 : Norwegian translation Added: trunk/reactos/base/applications/games/winemine/No.rc (with props) Modified: trunk/reactos/base/applications/games/winemine/winemine.rc Added: trunk/reactos/base/applications/games/winemine/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/No.rc (added) +++ trunk/reactos/base/applications/games/winemine/No.rc Tue Jul 25 13:02:45 2006 @@ -1,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "Minesveiper" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Valg" { + MENUITEM "&Nytt", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Merk spørsmål", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Nybegynner", IDM_BEGINNER + MENUITEM "&Anvansert", IDM_ADVANCED + MENUITEM "&Ekspert", IDM_EXPERT + MENUITEM "&Egendefinert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDM_EXIT + } + POPUP "&Informasjon" { + MENUITEM "&Beste tider", IDM_TIMES + MENUITEM "&Om", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Beste tider" +{ + GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 + LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 + LTEXT "Anvansert", IDNONE, 20, 30, 40, 8 + LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Congratulations!" +{ + LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Egendefinert spill" +{ + LTEXT "Høyde", IDNONE, 5, 5, 30, 10 + LTEXT "Bredde", IDNONE, 5, 35, 30, 10 + LTEXT "Miner", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Om" +{ + LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 + ICON "Minesveiper", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/winemine.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/winemine.rc (original) +++ trunk/reactos/base/applications/games/winemine/winemine.rc Tue Jul 25 13:02:45 2006 @@ -27,7 +27,7 @@ #include "Pl.rc" #include "Nl.rc" #include "Uk.rc" - +#include "No.rc" IDI_WINEMINE ICON MOVEABLE "rc/winemine.ico"

18 years, 5 months

[greatlrd] 23281: patch from LMH1 : Bug#: 1677 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 12:57:37 2006 New Revision: 23281 URL: http://svn.reactos.org/svn/reactos?rev=23281&view=rev Log: patch from LMH1 : Bug#: 1677 : Norwegian translation Added: trunk/reactos/base/applications/ibrowser/No.rc (with props) Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Added: trunk/reactos/base/applications/ibrowser/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/No.rc (added) +++ trunk/reactos/base/applications/ibrowser/No.rc Tue Jul 25 12:57:37 2006 @@ -1,0 +1,161 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NO\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// Norwegian (N.O.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Åpne", ID_FILE_OPEN + MENUITEM "A&vslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "S&idelinje", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statuslinje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "&Fullskjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hjelp" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Om IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Om ReactOS Internett nettleser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Internett nettleser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internett nettleser" + IDS_EMPTY "(TOM)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&Om..." +END + +#endif // NORWEGIAN (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NO +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/ibrowser/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc (original) +++ trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Tue Jul 25 12:57:37 2006 @@ -66,7 +66,8 @@ "#include ""Sv.rc""\r\n" "#include ""Hu.rc""\r\n" "#include ""Ro.rc""\r\n" - "#include ""Nl.rc""\r\n" + "#include ""Nl.rc""\r\n" + "#include ""No.rc""\r\n" "#include ""Ja.rc""\0" END @@ -104,6 +105,7 @@ #include "Ro.rc" #include "Nl.rc" #include "Ja.rc" +#include "No.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED

18 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
67
Older →

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