Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52165: [FAT32] - Fix a bug in the new fat32 bootsector code. The old code was using a 32bit push, the new code uses 2 16 bit pushes - enable new fat32 and isobtrt bootsectors
by tkreuzer＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tkreuzer Date: Thu Jun 9 22:04:45 2011 New Revision: 52165 URL: http://svn.reactos.org/svn/reactos?rev=52165&view=rev Log: [FAT32] - Fix a bug in the new fat32 bootsector code. The old code was using a 32bit push, the new code uses 2 16 bit pushes - enable new fat32 and isobtrt bootsectors Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/fat32.S Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Thu Jun 9 22:04:45 2011 @@ -3,17 +3,15 @@ #CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) #CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -#CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) +CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) #CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) -#CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) +CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) if(NOT MSVC) CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) -CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) endif() add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all) Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Thu Jun 9 22:04:45 2011 @@ -181,7 +181,8 @@ ReadSectorsSetupDiskAddressPacket: mov word ptr ds:[LBASectorsRead],cx - push 0 // push large 0 ? + push 0 + push 0 push eax // Put 64-bit logical block address on stack push es // Put transfer segment on stack push bx // Put transfer offset on stack

1 0

[akhaldi] 52164: [CMAKE] * Add uniata debug option.
by akhaldi＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: akhaldi Date: Thu Jun 9 20:56:05 2011 New Revision: 52164 URL: http://svn.reactos.org/svn/reactos?rev=52164&view=rev Log: [CMAKE] * Add uniata debug option. Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Thu Jun 9 20:56:05 2011 @@ -1,5 +1,7 @@ include_directories(inc) + +#add_definitions(-D_DEBUG) set_cpp() set_rc_compiler()

1 0

[jimtabor] 52163: [Win32k] - Fix hot tracking but does not clear it properly. See bug 6257. - Ported NC_HandleNCHitTest from wine, will sync User32 later.
by jimtabor＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: jimtabor Date: Thu Jun 9 20:00:43 2011 New Revision: 52163 URL: http://svn.reactos.org/svn/reactos?rev=52163&view=rev Log: [Win32k] - Fix hot tracking but does not clear it properly. See bug 6257. - Ported NC_HandleNCHitTest from wine, will sync User32 later. Modified: trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Thu Jun 9 20:00:43 2011 @@ -27,6 +27,21 @@ #define HAS_THINFRAME(Style, ExStyle) \ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) + +#define HAS_BIGFRAME(style,exStyle) \ + (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \ + ((exStyle) & WS_EX_DLGMODALFRAME)) + +#define HAS_STATICOUTERFRAME(style,exStyle) \ + (((exStyle) & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == \ + WS_EX_STATICEDGE) + +#define HAS_ANYFRAME(style,exStyle) \ + (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \ + ((exStyle) & WS_EX_DLGMODALFRAME) || \ + !((style) & (WS_CHILD | WS_POPUP))) + +#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && pWnd->IDMenu) #define IntIsDesktopWindow(WndObj) \ (WndObj->spwndParent == NULL) @@ -112,5 +127,6 @@ WNDPROC FASTCALL IntGetWindowProc(PWND,BOOL); BOOL FASTCALL IntEnableWindow(HWND,BOOL); +DWORD FASTCALL GetNCHitEx(PWND pWnd, POINT pt); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Thu Jun 9 20:00:43 2011 @@ -215,5 +215,207 @@ return lResult; } +static HICON NC_IconForWindow( PWND pWnd ) +{ + HICON hIcon = 0; + + if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return hIcon; + if (!hIcon) hIcon = pWnd->pcls->hIconSm; + if (!hIcon) hIcon = pWnd->pcls->hIcon; + + if (!hIcon && pWnd->style & DS_MODALFRAME) + { // Fake it out for now, we use it as a test. + hIcon = (HICON)1; + /* FIXME: Need to setup Registry System Cursor & Icons via Callbacks at init time! */ + if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small + if (!hIcon) hIcon = gpsi->hIcoWindows; // Reg size. + } + return hIcon; +} + +DWORD FASTCALL +GetNCHitEx(PWND pWnd, POINT pt) +{ + RECT rcWindow, rcClient; + DWORD Style, ExStyle; + + if (!pWnd) return HTNOWHERE; + + rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; + rcWindow.right = pWnd->rcWindow.right; + rcWindow.bottom = pWnd->rcWindow.bottom; + rcClient.right = pWnd->rcClient.right; + rcClient.bottom = pWnd->rcClient.bottom; + + if (!IntPtInRect(&rcWindow, pt)) return HTNOWHERE; + + Style = pWnd->style; + ExStyle = pWnd->ExStyle; + + if (Style & WS_MINIMIZE) return HTCAPTION; + + if (IntPtInRect( &rcClient, pt )) return HTCLIENT; + + /* Check borders */ + if (HAS_THICKFRAME( Style, ExStyle )) + { + RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXFRAME), -UserGetSystemMetrics(SM_CYFRAME) ); + if (!IntPtInRect(&rcWindow, pt)) + { + /* Check top sizing border */ + if (pt.y < rcWindow.top) + { + if (pt.x < rcWindow.left+UserGetSystemMetrics(SM_CXSIZE)) return HTTOPLEFT; + if (pt.x >= rcWindow.right-UserGetSystemMetrics(SM_CXSIZE)) return HTTOPRIGHT; + return HTTOP; + } + /* Check bottom sizing border */ + if (pt.y >= rcWindow.bottom) + { + if (pt.x < rcWindow.left+UserGetSystemMetrics(SM_CXSIZE)) return HTBOTTOMLEFT; + if (pt.x >= rcWindow.right-UserGetSystemMetrics(SM_CXSIZE)) return HTBOTTOMRIGHT; + return HTBOTTOM; + } + /* Check left sizing border */ + if (pt.x < rcWindow.left) + { + if (pt.y < rcWindow.top+UserGetSystemMetrics(SM_CYSIZE)) return HTTOPLEFT; + if (pt.y >= rcWindow.bottom-UserGetSystemMetrics(SM_CYSIZE)) return HTBOTTOMLEFT; + return HTLEFT; + } + /* Check right sizing border */ + if (pt.x >= rcWindow.right) + { + if (pt.y < rcWindow.top+UserGetSystemMetrics(SM_CYSIZE)) return HTTOPRIGHT; + if (pt.y >= rcWindow.bottom-UserGetSystemMetrics(SM_CYSIZE)) return HTBOTTOMRIGHT; + return HTRIGHT; + } + } + } + else /* No thick frame */ + { + if (HAS_DLGFRAME( Style, ExStyle )) + RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); + else if (HAS_THINFRAME( Style, ExStyle )) + RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); + if (!IntPtInRect( &rcWindow, pt )) return HTBORDER; + } + + /* Check caption */ + + if ((Style & WS_CAPTION) == WS_CAPTION) + { + if (ExStyle & WS_EX_TOOLWINDOW) + rcWindow.top += UserGetSystemMetrics(SM_CYSMCAPTION) - 1; + else + rcWindow.top += UserGetSystemMetrics(SM_CYCAPTION) - 1; + if (!IntPtInRect( &rcWindow, pt )) + { + BOOL min_or_max_box = (Style & WS_MAXIMIZEBOX) || + (Style & WS_MINIMIZEBOX); + if (ExStyle & WS_EX_LAYOUTRTL) + { + /* Check system menu */ + if ((Style & WS_SYSMENU) && !(ExStyle & WS_EX_TOOLWINDOW) && NC_IconForWindow(pWnd)) + { + rcWindow.right -= UserGetSystemMetrics(SM_CYCAPTION) - 1; + if (pt.x > rcWindow.right) return HTSYSMENU; + } + + /* Check close button */ + if (Style & WS_SYSMENU) + { + rcWindow.left += UserGetSystemMetrics(SM_CYCAPTION); + if (pt.x < rcWindow.left) return HTCLOSE; + } + + /* Check maximize box */ + /* In win95 there is automatically a Maximize button when there is a minimize one*/ + if (min_or_max_box && !(ExStyle & WS_EX_TOOLWINDOW)) + { + rcWindow.left += UserGetSystemMetrics(SM_CXSIZE); + if (pt.x < rcWindow.left) return HTMAXBUTTON; + } + + /* Check minimize box */ + if (min_or_max_box && !(ExStyle & WS_EX_TOOLWINDOW)) + { + rcWindow.left += UserGetSystemMetrics(SM_CXSIZE); + if (pt.x < rcWindow.left) return HTMINBUTTON; + } + } + else + { + /* Check system menu */ + if ((Style & WS_SYSMENU) && !(ExStyle & WS_EX_TOOLWINDOW) && NC_IconForWindow(pWnd)) + { + rcWindow.left += UserGetSystemMetrics(SM_CYCAPTION) - 1; + if (pt.x < rcWindow.left) return HTSYSMENU; + } + + /* Check close button */ + if (Style & WS_SYSMENU) + { + rcWindow.right -= UserGetSystemMetrics(SM_CYCAPTION); + if (pt.x > rcWindow.right) return HTCLOSE; + } + + /* Check maximize box */ + /* In win95 there is automatically a Maximize button when there is a minimize one*/ + if (min_or_max_box && !(ExStyle & WS_EX_TOOLWINDOW)) + { + rcWindow.right -= UserGetSystemMetrics(SM_CXSIZE); + if (pt.x > rcWindow.right) return HTMAXBUTTON; + } + + /* Check minimize box */ + if (min_or_max_box && !(ExStyle & WS_EX_TOOLWINDOW)) + { + rcWindow.right -= UserGetSystemMetrics(SM_CXSIZE); + if (pt.x > rcWindow.right) return HTMINBUTTON; + } + } + return HTCAPTION; + } + } + + /* Check menu bar */ + + if (HAS_MENU( pWnd, Style ) && (pt.y < rcClient.top) && + (pt.x >= rcClient.left) && (pt.x < rcClient.right)) + return HTMENU; + + /* Check vertical scroll bar */ + + if (ExStyle & WS_EX_LAYOUTRTL) ExStyle ^= WS_EX_LEFTSCROLLBAR; + if (Style & WS_VSCROLL) + { + if((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) + rcClient.left -= UserGetSystemMetrics(SM_CXVSCROLL); + else + rcClient.right += UserGetSystemMetrics(SM_CXVSCROLL); + if (IntPtInRect( &rcClient, pt )) return HTVSCROLL; + } + + /* Check horizontal scroll bar */ + + if (Style & WS_HSCROLL) + { + rcClient.bottom += UserGetSystemMetrics(SM_CYHSCROLL); + if (IntPtInRect( &rcClient, pt )) + { + /* Check size box */ + if ((Style & WS_VSCROLL) && + ((((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) && (pt.x <= rcClient.left + UserGetSystemMetrics(SM_CXVSCROLL))) || + (((ExStyle & WS_EX_LEFTSCROLLBAR) == 0) && (pt.x >= rcClient.right - UserGetSystemMetrics(SM_CXVSCROLL))))) + return HTSIZE; + return HTHSCROLL; + } + } + + /* Has to return HTNOWHERE if nothing was found + Could happen when a window has a customized non client area */ + return HTNOWHERE; +} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Jun 9 20:00:43 2011 @@ -41,6 +41,39 @@ 256); return(STATUS_SUCCESS); +} + +PWND FASTCALL +IntChildrenWindowFromPoint(PWND pWndTop, INT x, INT y) +{ + PWND pWnd, pWndChild; + + if (!(pWndTop->style & WS_VISIBLE)) return NULL; + if ((pWndTop->style & WS_DISABLED)) return NULL; + if (!IntPtInWindow(pWndTop, x, y)) return NULL; + + if (x - pWndTop->rcClient.left < pWndTop->rcClient.right && + y - pWndTop->rcClient.top < pWndTop->rcClient.bottom ) + { + for (pWnd = pWndTop->spwndChild; + pWnd != NULL; + pWnd = pWnd->spwndNext) + { + if (pWnd->state2 & WNDS2_INDESTROY || pWnd->state & WNDS_DESTROYED ) + { + DPRINT("The Window is in DESTROY!\n"); + continue; + } + + pWndChild = IntChildrenWindowFromPoint(pWnd, x, y); + + if (pWndChild) + { + return pWndChild; + } + } + } + return pWndTop; } PWND FASTCALL @@ -503,22 +536,17 @@ if (Msg->hwnd != NULL) { pwnd = UserGetWindowObject(Msg->hwnd); - if ((pwnd->style & WS_VISIBLE) && - IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) - { - pDesk->htEx = HTCLIENT; - pDesk->spwndTrack = pwnd; - } } else { pwnd = IntTopLevelWindowFromPoint(Msg->pt.x, Msg->pt.y); - if (pwnd) - { - Msg->hwnd = pwnd->head.h; - pDesk->htEx = HTCLIENT; - pDesk->spwndTrack = pwnd; - } + if (pwnd) Msg->hwnd = pwnd->head.h; + } + + if (pwnd) + { + pDesk->spwndTrack = IntChildrenWindowFromPoint(pwnd, Msg->pt.x, Msg->pt.y); + pDesk->htEx = GetNCHitEx(pDesk->spwndTrack, Msg->pt); } hdcScreen = IntGetScreenDC();

1 0

[nyadav] 52162: [AUDSRV] Fix Function Names to Conventions
by nyadav＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: nyadav Date: Thu Jun 9 18:43:48 2011 New Revision: 52162 URL: http://svn.reactos.org/svn/reactos?rev=52162&view=rev Log: [AUDSRV] Fix Function Names to Conventions Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Thu Jun 9 18:43:48 2011 @@ -14,7 +14,7 @@ /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +WINAPI int InitStream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { long streamid; @@ -61,7 +61,7 @@ return 0; } -WINAPI int playaudio ( ClientStream * clientstream ) +WINAPI int PlayAudio ( ClientStream * clientstream ) { /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); @@ -85,12 +85,11 @@ } clientstream->callbacks.PlayComplete(0); -DEAD: /*Audio Thread Ended*/ return 0; } -WINAPI int stopaudio (ClientStream * clientstream ) +WINAPI int StopAudio (ClientStream * clientstream ) { /*Server Side termination is remaining*/ /*If connected Properly call the remote audsrv_stop() function*/ Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Thu Jun 9 18:43:48 2011 @@ -1,6 +1,6 @@ -@ stdcall initstream (ptr long long long long long long long long) -@ stdcall playaudio ( ptr); -@ stdcall stopaudio (ptr ); +@ stdcall InitStream (ptr long long long long long long long long) +@ stdcall PlayAudio ( ptr); +@ stdcall StopAudio (ptr ); @ stdcall Volume(ptr ptr ); @ stdcall SetVolume(ptr long); @ stdcall Write(ptr ptr); Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Thu Jun 9 18:43:48 2011 @@ -13,16 +13,16 @@ #include <audsrvapi.h> #include <stdio.h> -void opencomplete (int error ); -void buffercopied (int error ); -void playcomplete (int error ); +void OpenComplete (int error ); +void BufferCopied (int error ); +void PlayComplete (int error ); ClientStream clientstream = {0, 0, {NULL}, - {opencomplete, - buffercopied, - playcomplete} + {OpenComplete, + BufferCopied, + PlayComplete} }; DWORD WINAPI RunAudioThread(LPVOID param) @@ -32,18 +32,18 @@ return 0; } -void opencomplete (int error ) +void OpenComplete (int error ) { /*Copy First Buffer and write*/ Write(&clientstream, "HELLO_RANDOM_STRING"); } -void buffercopied (int error ) +void BufferCopied (int error ) { Write(&clientstream, "HELLO_RANDOM_STRING"); } -void playcomplete (int error ) +void PlayComplete (int error ) { OutputDebugStringA("Playback Completed\n"); } @@ -55,7 +55,7 @@ DWORD dwID; HANDLE audiothread = NULL; char input='\0'; - printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); + OutputDebugStringA("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ @@ -71,19 +71,19 @@ if ( error ) { - printf("Failed to Initialize Stream.Error %d\n", error); + OutputDebugStringA("Failed to Initialize Stream.Error \n"); goto error; } else { - printf("StreamID : %ld\n",clientstream.stream); + OutputDebugStringA("StreamID : %ld\n",clientstream.stream); audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); } while ( input != 'a' ) scanf("%c",&input); - printf("Stoping Audio Stream.\n"); + OutputDebugStringA("Stoping Audio Stream.\n"); stopaudio(&clientstream); WaitForSingleObject(audiothread,INFINITE);

1 0

[nyadav] 52161: [AUDSRV] Following Naming Convention for Functions
by nyadav＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: nyadav Date: Thu Jun 9 18:31:59 2011 New Revision: 52161 URL: http://svn.reactos.org/svn/reactos?rev=52161&view=rev Log: [AUDSRV] Following Naming Convention for Functions Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Thu Jun 9 18:31:59 2011 @@ -14,7 +14,7 @@ static DWORD ServiceInit(VOID); -static BOOL WINAPI close (DWORD dwCtrlType); +static BOOL WINAPI Close (DWORD dwCtrlType); static WCHAR ServiceName[] = L"AudSrv"; @@ -80,7 +80,7 @@ { case SERVICE_CONTROL_STOP: DPRINT(" SERVICE_CONTROL_STOP received\n"); - close(CTRL_CLOSE_EVENT); + Close(CTRL_CLOSE_EVENT); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -102,7 +102,7 @@ case SERVICE_CONTROL_SHUTDOWN: DPRINT(" SERVICE_CONTROL_SHUTDOWN received\n"); - close(CTRL_CLOSE_EVENT); + Close(CTRL_CLOSE_EVENT); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -156,7 +156,7 @@ *This functions fetches FilteredBuffer from Every ClientStream Stucture *and mixes them in oder to feed player thread*/ void -mixandfill(MixerEngine * mixer, +MixAndFill(MixerEngine * mixer, int buffer) { while(WaitForSingleObject(mixer->streampresent, @@ -172,16 +172,16 @@ switch(mixer->masterbitspersample) { case 8: - mixs8(mixer,buffer); + MixS8(mixer,buffer); break; case 16: - mixs16(mixer,buffer); + MixS16(mixer,buffer); break; case 32: - mixs32(mixer,buffer); + MixS32(mixer,buffer); break; case 64: - mixs64(mixer,buffer); + MixS64(mixer,buffer); break; } } @@ -190,16 +190,16 @@ switch(mixer->masterbitspersample) { case 8: - mixu8(mixer,buffer); + MixU8(mixer,buffer); break; case 16: - mixu16(mixer,buffer); + MixU16(mixer,buffer); break; case 32: - mixu32(mixer,buffer); + MixU32(mixer,buffer); break; case 64: - mixu64(mixer,buffer); + MixU64(mixer,buffer); break; } } @@ -208,17 +208,17 @@ switch(mixer->masterbitspersample) { case 32: - mixfl32(mixer,buffer); + MixFL32(mixer,buffer); break; case 64: - mixfl64(mixer,buffer); + MixFL64(mixer,buffer); break; } } } /*Frees the Buffer Created in mixer thread*/ -void freebuffer() +void FreeBuffer() { HeapFree(GetProcessHeap(), 0, @@ -228,7 +228,8 @@ } /*Plays Master buffer pengine->masterbuf[pengine->playcurrent]*/ -void playbuffer(MixerEngine * mixer,int buffer) +void PlayBuffer(MixerEngine * mixer, + int buffer) { SP_DEVICE_INTERFACE_DATA InterfaceData; SP_DEVINFO_DATA DeviceData; @@ -436,7 +437,7 @@ if(mixer->dead) break; - mixandfill(mixer, + MixAndFill(mixer, 1-mixer->playcurrent); SetEvent(mixer->filled); @@ -463,10 +464,10 @@ break; SetEvent(mixer->played); - playbuffer(mixer, + PlayBuffer(mixer, mixer->playcurrent); - freebuffer(); + FreeBuffer(); mixer->playcurrent=1-mixer->playcurrent; } @@ -530,7 +531,7 @@ } /*This Functions Kills the application, in any condition*/ -static BOOL WINAPI close ( DWORD dwCtrlType ) +static BOOL WINAPI Close ( DWORD dwCtrlType ) { pengine->dead=1; @@ -587,7 +588,7 @@ FALSE, NULL); - SetConsoleCtrlHandler(close, + SetConsoleCtrlHandler(Close, TRUE); SpawnMixerThread(pengine); @@ -625,7 +626,7 @@ pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); - SetConsoleCtrlHandler(close,TRUE); + SetConsoleCtrlHandler(Close,TRUE); SpawnMixerThread(pengine); SpawnPlayerThread(pengine); SpawnRPCThread(pengine); Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Thu Jun 9 18:31:59 2011 @@ -99,14 +99,14 @@ DWORD WINAPI RunRPCThread(LPVOID lpParameter); /* audsrv.c*/ -void mixandfill(MixerEngine * mixer, +void MixAndFill(MixerEngine * mixer, int buffer); -void playbuffer(MixerEngine * mixer, +void PlayBuffer(MixerEngine * mixer, int buffer); /*stream.c*/ -long getnewstreamid(); -long addstream(LONG frequency, +long GetNewStreamID(); +long AddStream(LONG frequency, int channels, int bitspersample, int datatype, @@ -116,34 +116,34 @@ float balance); /*mixer.c*/ -void * mixs8(MixerEngine * mixer, +void * MixS8(MixerEngine * mixer, int buffer); -void * mixs16(MixerEngine * mixer, +void * MixS16(MixerEngine * mixer, int buffer); -void * mixs32(MixerEngine * mixer, +void * MixS32(MixerEngine * mixer, int buffer); -void * mixs64(MixerEngine * mixer, +void * MixS64(MixerEngine * mixer, int buffer); -void * mixu8(MixerEngine * mixer, +void * MixU8(MixerEngine * mixer, int buffer); -void * mixu16(MixerEngine * mixer, +void * MixU16(MixerEngine * mixer, int buffer); -void * mixu32(MixerEngine * mixer, +void * MixU32(MixerEngine * mixer, int buffer); -void * mixu64(MixerEngine * mixer, +void * MixU64(MixerEngine * mixer, int buffer); -void * mixfl32(MixerEngine * mixer, +void * MixFL32(MixerEngine * mixer, int buffer); -void * mixfl64(MixerEngine * mixer, +void * MixFL64(MixerEngine * mixer, int buffer); #endif /* __AUDSRV_H__ */ Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Thu Jun 9 18:31:59 2011 @@ -8,11 +8,11 @@ */ #include "audsrv.h" -void * mixs8(MixerEngine * mixer,int buffer) +void * MixS8(MixerEngine * mixer,int buffer) { return NULL; } -void * mixs16(MixerEngine * mixer,int buffer) +void * MixS16(MixerEngine * mixer,int buffer) { mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); @@ -20,35 +20,35 @@ return NULL; } -void * mixs32(MixerEngine * mixer,int buffer) +void * MixS32(MixerEngine * mixer,int buffer) { return NULL; } -void * mixs64(MixerEngine * mixer,int buffer) +void * MixS64(MixerEngine * mixer,int buffer) { return NULL; } -void * mixu8(MixerEngine * mixer,int buffer) +void * MixU8(MixerEngine * mixer,int buffer) { return NULL; } -void * mixu16(MixerEngine * mixer,int buffer) +void * MixU16(MixerEngine * mixer,int buffer) { return NULL; } -void * mixu32(MixerEngine * mixer,int buffer) +void * MixU32(MixerEngine * mixer,int buffer) { return NULL; } -void * mixu64(MixerEngine * mixer,int buffer) +void * MixU64(MixerEngine * mixer,int buffer) { return NULL; } -void * mixfl32(MixerEngine * mixer,int buffer) +void * MixFL32(MixerEngine * mixer,int buffer) { return NULL; } -void * mixfl64(MixerEngine * mixer,int buffer) +void * MixFL64(MixerEngine * mixer,int buffer) { return NULL; } Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Thu Jun 9 18:31:59 2011 @@ -55,7 +55,7 @@ { long stream; - stream = addstream(frequency, + stream = AddStream(frequency, channels, bitspersample, datatype, Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Thu Jun 9 18:31:59 2011 @@ -9,7 +9,7 @@ #include "audsrv.h" -long getnewstreamid() +long GetNewStreamID() { long streamid= pengine->streamidpool; pengine->streamidpool+=1; @@ -88,7 +88,7 @@ /*Clean Stream's data*/ } -long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +long AddStream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { ServerStream * newstream,*localstream; DWORD dwID; @@ -175,7 +175,7 @@ WaitForSingleObject(newstream->threadready, INFINITE); - newstream->streamid=getnewstreamid(); + newstream->streamid=GetNewStreamID(); if(localstream == NULL) {

1 0

[nyadav] 52160: [AUDSRV] Add File Headers, some style fixes
by nyadav＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: nyadav Date: Thu Jun 9 18:12:07 2011 New Revision: 52160 URL: http://svn.reactos.org/svn/reactos?rev=52160&view=rev Log: [AUDSRV] Add File Headers,some style fixes Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -424,14 +424,17 @@ SetEvent(mixer->played); - while(1) + while(TRUE) { while(WaitForSingleObject(mixer->played, 100)!=0) { if(mixer->dead) - goto DEAD; + break; } + + if(mixer->dead) + break; mixandfill(mixer, 1-mixer->playcurrent); @@ -439,7 +442,6 @@ SetEvent(mixer->filled); } -DEAD: return 0; } @@ -454,8 +456,11 @@ 100)!=0) { if(mixer->dead) - goto DEAD; + break; } + + if(mixer->dead) + break; SetEvent(mixer->played); playbuffer(mixer, @@ -466,7 +471,6 @@ mixer->playcurrent=1-mixer->playcurrent; } -DEAD: return 0; } Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/mixer.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ #include "audsrv.h" void * mixs8(MixerEngine * mixer,int buffer) Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/stream.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrv.h" long getnewstreamid() Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\audsrvapi.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrvapi.h" /*All the wrappers for Remote Function should be here*/ @@ -57,14 +66,18 @@ /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); - while(1) + while(TRUE) { while(WaitForSingleObject(clientstream->ClientEventPool[0], 100)!=0) { if(clientstream->dead) - goto DEAD; + break; } + + if(clientstream->dead) + break; + /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ Sleep(1000); @@ -74,7 +87,6 @@ DEAD: /*Audio Thread Ended*/ - return 0; } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,2 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\audsrvapi.h + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #include "audsrvrpc_c.h" #include <audsrv/audsrvapi.h> Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\audsrvapi\dllmain.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ #include "audsrvapi.h" @@ -39,7 +47,8 @@ case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: status = RpcBindingFree(audsrv_v0_0_c_ifspec); - if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",(int)status); + if (status == RPC_S_INVALID_BINDING) + OutputDebugStringA("Error Closing RPC Connection"); break; } return TRUE; Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Thu Jun 9 18:12:07 2011 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/audsrv.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Neeraj Yadav + + */ + #define WIN32_NO_STATUS #define _KSDDK_ @@ -20,7 +29,7 @@ { ClientStream * localstream = (ClientStream *) param; playaudio(localstream); - + return 0; } void opencomplete (int error ) @@ -36,8 +45,7 @@ } void playcomplete (int error ) { - printf("Play Complete Code %d\n", - error); + OutputDebugStringA("Playback Completed\n"); } int __cdecl

1 0

[tkreuzer] 52159: [OBJ2BIN] - Skip empty sections. ML for x86 adds those, while ML (not ML64) for x64 doesn't.
by tkreuzer＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tkreuzer Date: Thu Jun 9 17:59:47 2011 New Revision: 52159 URL: http://svn.reactos.org/svn/reactos?rev=52159&view=rev Log: [OBJ2BIN] - Skip empty sections. ML for x86 adds those, while ML (not ML64) for x64 doesn't. Modified: trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Thu Jun 9 17:59:47 2011 @@ -110,6 +110,9 @@ return -5; } + /* Skip empty sections */ + if (SectionHeader.SizeOfRawData == 0) continue; + /* Check if this is '.text' section */ if (strcmp(SectionHeader.Name, ".text") == 0) break; } @@ -139,7 +142,7 @@ /* Read symbol data */ if (!fread(pSymbols, nSize, 1, pSourceFile)) { - fprintf(stderr, "Failed to read section %ld file\n", i); + fprintf(stderr, "Failed to read symbols: %ld\n", nSize); return -9; } @@ -161,7 +164,8 @@ /* Read section data */ if (!fread(pData, SectionHeader.SizeOfRawData, 1, pSourceFile)) { - fprintf(stderr, "Failed to read section %ld file\n", i); + fprintf(stderr, "Failed to read section %ld, at 0x%lx size=0x%lx \n", + i, SectionHeader.PointerToRawData, SectionHeader.SizeOfRawData); return -12; }

1 0

[akhaldi] 52158: [CMAKE] * MSVC fixes for msvcrtex.
by akhaldi＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: akhaldi Date: Thu Jun 9 17:59:26 2011 New Revision: 52158 URL: http://svn.reactos.org/svn/reactos?rev=52158&view=rev Log: [CMAKE] * MSVC fixes for msvcrtex. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtdll.c trunk/reactos/lib/sdk/crt/startup/crtexe.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Thu Jun 9 17:59:26 2011 @@ -20,8 +20,6 @@ startup/atonexit.c startup/txtmode.c startup/pesect.c - startup/pseudo-reloc.c - startup/pseudo-reloc-list.c startup/tlsmcrt.c startup/tlsthrd.c startup/tlsmthread.c @@ -36,6 +34,12 @@ misc/fltused.c misc/ofmt_stub.c ) + +if(NOT MSVC) +list(APPEND MSVCRTEX_SOURCE + startup/pseudo-reloc.c + startup/pseudo-reloc-list.c) +endif() if(ARCH MATCHES i386) list(APPEND MSVCRTEX_SOURCE Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Thu Jun 9 17:59:26 2011 @@ -33,8 +33,12 @@ #include <locale.h> extern void __cdecl _initterm(_PVFV *,_PVFV *); -extern void __main (); + +#if defined(__GNUC__) +extern void __main (void); extern void _pei386_runtime_relocator (void); +#endif + extern _CRTALLOC(".CRT$XIA") _PIFV __xi_a[]; extern _CRTALLOC(".CRT$XIZ") _PIFV __xi_z[]; extern _CRTALLOC(".CRT$XCA") _PVFV __xc_a[]; @@ -179,7 +183,9 @@ retcode = FALSE; goto i__leave; } +#if defined(__GNUC__) _pei386_runtime_relocator (); +#endif if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) { retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved); @@ -194,7 +200,9 @@ } } if (dwReason == DLL_PROCESS_ATTACH) +#if defined(__GNUC__) __main (); +#endif retcode = DllMain(hDllHandle,dwReason,lpreserved); if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Thu Jun 9 17:59:26 2011 @@ -20,6 +20,7 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> +#include <malloc.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -32,7 +33,7 @@ #endif /* Hack, for bug in ld. Will be removed soon. */ -#ifndef _MSC_VER +#if defined(__GNUC__) #define __ImageBase __MINGW_LSYMBOL(_image_base__) #endif @@ -42,6 +43,8 @@ extern void _fpreset (void); #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') + +__declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); extern int * __MINGW_IMP_SYMBOL(_fmode); extern int * __MINGW_IMP_SYMBOL(_commode); @@ -55,9 +58,11 @@ #if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; #else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; -#endif +int __declspec(selectany) _MINGW_INSTALL_DEBUG_MATHERR = 0; +#endif + extern int __defaultmatherr; + extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); static int __cdecl check_managed_app (void); @@ -80,7 +85,12 @@ DWORD __mingw_winmain_nShowCmd; static int argc; + +#if defined(__GNUC__) extern void __main(void); +extern void _pei386_runtime_relocator (void); +#endif + #ifdef WPRFLAG static wchar_t **argv; static wchar_t **envp; @@ -96,7 +106,7 @@ static _startupinfo startinfo; extern LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler; -extern void _pei386_runtime_relocator (void); + long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); @@ -107,10 +117,8 @@ static int __cdecl pre_c_init (void); static void __cdecl pre_cpp_init (void); static void __cdecl __mingw_prepare_except_for_msvcr80_and_higher (void); -_CRTALLOC(".CRT$XIAA") _PIFV mingw_pcinit = pre_c_init; -_CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; - -extern int _MINGW_INSTALL_DEBUG_MATHERR; +_CRTALLOC(".CRT$XIAA") _PIFV __declspec(selectany) mingw_pcinit = pre_c_init; +_CRTALLOC(".CRT$XCAA") _PVFV __declspec(selectany) mingw_pcppinit = pre_cpp_init; static int __cdecl pre_c_init (void) @@ -216,7 +224,7 @@ WINBOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); -#ifndef _WIN64 +#if !defined(_WIN64) && defined(__GNUC__) /* We need to make sure that this function is build with frame-pointer and that we align the stack to 16 bytes for the sake of SSE ops in main or in functions inlined into main. */ @@ -265,7 +273,9 @@ if (__dyn_tls_init_callback != NULL) __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL); +#if defined(__GNUC__) _pei386_runtime_relocator (); +#endif __mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler); #ifdef _WIN64 __mingw_init_ehandler (); @@ -277,33 +287,35 @@ if (mingw_app_type) { #ifdef WPRFLAG - lpszCommandLine = (_TCHAR *) _wcmdln; -#else - lpszCommandLine = (char *) _acmdln; -#endif - while (*lpszCommandLine > SPACECHAR || (*lpszCommandLine&&inDoubleQuote)) - { - if (*lpszCommandLine == DQUOTECHAR) - inDoubleQuote = !inDoubleQuote; + lpszCommandLine = (_TCHAR *) _wcmdln; +#else + lpszCommandLine = (char *) _acmdln; +#endif + while (*lpszCommandLine > SPACECHAR || (*lpszCommandLine && inDoubleQuote)) + { + if (*lpszCommandLine == DQUOTECHAR) + inDoubleQuote = !inDoubleQuote; #ifdef _MBCS - if (_ismbblead (*lpszCommandLine)) - { - if (lpszCommandLine) /* FIXME: Why this check? Should I check for *lpszCommandLine != 0 too? */ - lpszCommandLine++; + if (_ismbblead (*lpszCommandLine)) + { + if (lpszCommandLine) /* FIXME: Why this check? Should I check for *lpszCommandLine != 0 too? */ + lpszCommandLine++; + } +#endif + ++lpszCommandLine; } -#endif - ++lpszCommandLine; + while (*lpszCommandLine && (*lpszCommandLine <= SPACECHAR)) + lpszCommandLine++; + + __mingw_winmain_hInstance = (HINSTANCE) &__ImageBase; + __mingw_winmain_lpCmdLine = lpszCommandLine; + __mingw_winmain_nShowCmd = StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? + StartupInfo.wShowWindow : SW_SHOWDEFAULT; } - while (*lpszCommandLine && (*lpszCommandLine <= SPACECHAR)) - lpszCommandLine++; - - __mingw_winmain_hInstance = (HINSTANCE) &__ImageBase; - __mingw_winmain_lpCmdLine = lpszCommandLine; - __mingw_winmain_nShowCmd = StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? - StartupInfo.wShowWindow : SW_SHOWDEFAULT; - } duplicate_ppstrings (argc, &argv); +#if defined(__GNUC__) __main (); +#endif #ifdef WPRFLAG __winitenv = envp; /* C++ initialization. @@ -422,8 +434,8 @@ uintptr_t __UNUSED_PARAM(pReserved)) { #ifdef __MINGW_SHOW_INVALID_PARAMETER_EXCEPTION - wprintf(L"Invalid parameter detected in function %s. File: %s Line: %d\n", function, file, line); - wprintf(L"Expression: %s\n", expression); + wprintf(L"Invalid parameter detected in function %s. File: %s Line: %d\n", function, file, line); + wprintf(L"Expression: %s\n", expression); #endif }

1 0

[tfaber] 52157: [KMTESTS] - add simple loader application that can list/run tests from a driver via DeviceIoControl, and prints output to the console
by tfaber＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tfaber Date: Thu Jun 9 15:14:02 2011 New Revision: 52157 URL: http://svn.reactos.org/svn/reactos?rev=52157&view=rev Log: [KMTESTS] - add simple loader application that can list/run tests from a driver via DeviceIoControl, and prints output to the console Added: branches/GSoC_2011/KMTestSuite/kmtests/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt (with props) branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild (with props) branches/GSoC_2011/KMTestSuite/kmtests/include/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.exe.manifest (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.rc (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c (with props) Modified: branches/GSoC_2011/KMTestSuite/CMakeLists.txt branches/GSoC_2011/KMTestSuite/directory.rbuild Modified: branches/GSoC_2011/KMTestSuite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/CMakeList… ============================================================================== --- branches/GSoC_2011/KMTestSuite/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/CMakeLists.txt [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -3,6 +3,7 @@ #add_subdirectory(dibtests) add_subdirectory(drivers) #add_subdirectory(dxtest) +add_subdirectory(kmtests) #add_subdirectory(regtests) add_subdirectory(rosautotest) add_subdirectory(tests) Modified: branches/GSoC_2011/KMTestSuite/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/directory… ============================================================================== --- branches/GSoC_2011/KMTestSuite/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/directory.rbuild [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="apitests"> + <xi:include href="apitests/directory.rbuild" /> + </directory> <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> </directory> @@ -9,6 +12,9 @@ </directory> <directory name="dxtest"> <xi:include href="dxtest/directory.rbuild" /> + </directory> + <directory name="kmtests"> + <xi:include href="kmtests/directory.rbuild" /> </directory> <directory name="regtests"> <xi:include href="regtests/directory.rbuild" /> @@ -25,7 +31,4 @@ <directory name="winetests"> <xi:include href="winetests/directory.rbuild" /> </directory> - <directory name="apitests"> - <xi:include href="apitests/directory.rbuild" /> - </directory> </group> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 9 15:14:02 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,17 @@ +include_directories( + include) + +set_rc_compiler() + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND KMTEST_SOURCE + kmtest/kmtest.c + kmtest/service.c + kmtest/kmtest.rc) + +add_executable(kmtest ${KMTEST_SOURCE}) +set_module_type(kmtest win32cui) +add_importlibs(kmtest advapi32 msvcrt kernel32) + +add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/d… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> +  + <xi:include href="kmtest.rbuild" /> +</group> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 9 15:14:02 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite public declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_PUBLIC_H_ +#define _KMTEST_PUBLIC_H_ + +#define IOCTL_KMTEST_GET_TESTS \ + CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_READ_DATA) + +#define IOCTL_KMTEST_RUN_TEST \ + CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) + +#define KMTEST_DEVICE_NAME L"Kmtest" +#define KMTEST_DEVICE_PATH (L"\\\\.\\Global\\GLOBALROOT\\Device\\" KMTEST_DEVICE_NAME) + +#endif /* !defined _KMTEST_PUBLIC_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 9 15:14:02 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,8 @@ +<module name="kmtest" type="win32cui" installbase="system32" installname="kmtest.exe"> + <include base="kmtest">include</include> + <library>advapi32</library> + <directory name="kmtest"> + <file>kmtest.c</file> + <file>service.c</file> + </directory> +</module> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,197 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Loader Application + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#include <windows.h> +#include <strsafe.h> + +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> + +#include "kmtest.h" +#include <winioctl.h> +#include <kmt_public.h> + +static void OutputError(FILE *fp, DWORD error); +static DWORD RunTest(char *testName); +static DWORD ListTests(PSTR *testList); +int __cdecl main(int argc, char **argv); + +static void OutputError(FILE *fp, DWORD error) +{ + char *message; + if (!FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&message, 0, NULL)) + { + fprintf(fp, "Could not retrieve error message (error 0x%08lx). Original error: 0x%08lx\n", GetLastError(), error); + } + + fprintf(fp, "%s\n", message); + + LocalFree(message); +} + +static DWORD RunTest(char *testName) +{ + DWORD error = ERROR_SUCCESS; + HANDLE hDevice = INVALID_HANDLE_VALUE; + DWORD bytesRead; + char buffer[1024]; + BOOL ret; + + hDevice = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, 0, NULL); + + if (hDevice == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + goto cleanup; + } + + if (!DeviceIoControl(hDevice, IOCTL_KMTEST_RUN_TEST, testName, strlen(testName), NULL, 0, &bytesRead, NULL)) + { + error = GetLastError(); + goto cleanup; + } + + while ((ret = ReadFile(hDevice, buffer, sizeof buffer - 1, &bytesRead, NULL)) != 0) + { + if (!bytesRead) + break; + + assert(bytesRead < sizeof buffer); + buffer[bytesRead] = '\0'; + + fputs(buffer, stdout); + } + if (!ret) + { + error = GetLastError(); + goto cleanup; + } + +cleanup: + if (hDevice != INVALID_HANDLE_VALUE) + CloseHandle(hDevice); + + return error; +} + +static DWORD ListTests(PSTR *testList) +{ + DWORD error = ERROR_SUCCESS; + HANDLE hDevice = INVALID_HANDLE_VALUE; + DWORD bytesRead; + PSTR buffer = NULL; + DWORD bufferSize; + + if (!testList) + { + error = ERROR_INVALID_PARAMETER; + goto cleanup; + } + + hDevice = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, 0, NULL); + + if (hDevice == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + goto cleanup; + } + + bufferSize = 1024; + buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + if (!buffer) + { + error = GetLastError(); + goto cleanup; + } + + if (!DeviceIoControl(hDevice, IOCTL_KMTEST_GET_TESTS, NULL, 0, buffer, bufferSize, &bytesRead, NULL)) + { + error = GetLastError(); + goto cleanup; + } + +cleanup: + if (buffer && error) + { + HeapFree(GetProcessHeap(), 0, buffer); + buffer = NULL; + } + + if (hDevice != INVALID_HANDLE_VALUE) + CloseHandle(hDevice); + + if (testList) + *testList = buffer; + + return error; +} + +int __cdecl main(int argc, char **argv) +{ + int status = EXIT_SUCCESS; + DWORD error; + + if (argc <= 1) + { + /* no arguments: show usage and list tests */ + char *programName = argc == 0 ? "kmtest" : argv[0]; + char *testNames, *testName; + size_t len; + + printf("Usage: %s test_name\n", programName); + puts("\nValid test names:"); + puts(" Create"); + puts(" Start"); + puts(" Stop"); + puts(" Delete"); + + error = ListTests(&testNames); + testName = testNames; + + while ((len = strlen(testName)) != 0) + { + printf(" %s\n", testName); + testName += len + 1; + } + + /* TODO: user-mode test parts */ + + if (error) + OutputError(stdout, error); + } + else + { + char *testName = argv[1]; + + if (argc > 2) + fputs("Excess arguments ignored\n", stderr); + + if (!lstrcmpiA(testName, "create")) + error = Service_Control(Service_Create); + else if (!lstrcmpiA(testName, "delete")) + error = Service_Control(Service_Delete); + else if (!lstrcmpiA(testName, "start")) + error = Service_Control(Service_Start); + else if (!lstrcmpiA(testName, "stop")) + error = Service_Control(Service_Stop); + else + /* TODO: user-mode test parts */ + error = RunTest(testName); + + OutputError(stdout, error); + } + + if (error) + status = EXIT_FAILURE; + + return status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.exe.manifest URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.exe.manifest (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.exe.manifest [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="kmtest"/> + <description>ReactOS Kernel-Mode Test Suite Loader Application</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.exe.manifest ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Loader Application + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTESTS_H_ +#define _KMTESTS_H_ + +#include <windows.h> + +/* service control functions */ +typedef DWORD SERVICE_FUNC(SC_HANDLE hManager); + +SERVICE_FUNC Service_Create; +SERVICE_FUNC Service_Delete; +SERVICE_FUNC Service_Start; +SERVICE_FUNC Service_Stop; + +DWORD Service_Control(SERVICE_FUNC *Service_Func); + +#endif /* !defined _KMTESTS_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.rc (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.rc [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Loader Resource File + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <windows.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel-Mode Test Suite Loader Application\0" +#define REACTOS_STR_INTERNAL_NAME "kmtest.exe\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kmtest.exe\0" +#include <reactos/version.rc> + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "kmtest/kmtest.exe.manifest" Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c [iso-8859-1] Thu Jun 9 15:14:02 2011 @@ -1,0 +1,135 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Loader service control functions + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#include <windows.h> +#include <strsafe.h> + +#include "kmtest.h" + +#define SERVICE_NAME L"Kmtest" +#define SERVICE_PATH L"\\kmtest_drv.sys" + +DWORD Service_Create(SC_HANDLE hScm) +{ + DWORD error = ERROR_SUCCESS; + SC_HANDLE hService = NULL; + wchar_t driverPath[MAX_PATH]; + HRESULT result = S_OK; + + if (!GetCurrentDirectory(sizeof driverPath / sizeof driverPath[0], driverPath) + || FAILED(result = StringCbCat(driverPath, sizeof driverPath, SERVICE_PATH))) + { + if (FAILED(result)) + error = result; + else + error = GetLastError(); + goto cleanup; + } + + hService = CreateService(hScm, SERVICE_NAME, L"ReactOS Kernel-Mode Test Suite Driver", + SERVICE_START, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, driverPath, NULL, NULL, NULL, NULL, NULL); + + if (!hService) + error = GetLastError(); + +cleanup: + return error; +} + +DWORD Service_Delete(SC_HANDLE hScm) +{ + DWORD error = ERROR_SUCCESS; + SC_HANDLE hService = NULL; + + hService = OpenService(hScm, SERVICE_NAME, DELETE); + + if (!hService) + { + error = GetLastError(); + goto cleanup; + } + + if (!DeleteService(hService)) + error = GetLastError(); + +cleanup: + if (hService) + CloseServiceHandle(hService); + + return error; +} + +DWORD Service_Start(SC_HANDLE hScm) +{ + DWORD error = ERROR_SUCCESS; + SC_HANDLE hService = NULL; + + hService = OpenService(hScm, SERVICE_NAME, SERVICE_START); + + if (!hService) + { + error = GetLastError(); + goto cleanup; + } + + if (!StartService(hService, 0, NULL)) + error = GetLastError(); + +cleanup: + if (hService) + CloseServiceHandle(hService); + + return error; +} + +DWORD Service_Stop(SC_HANDLE hScm) +{ + DWORD error = ERROR_SUCCESS; + SC_HANDLE hService = NULL; + SERVICE_STATUS serviceStatus; + + hService = OpenService(hScm, SERVICE_NAME, SERVICE_STOP); + + if (!hService) + { + error = GetLastError(); + goto cleanup; + } + + if (!ControlService(hService, SERVICE_CONTROL_STOP, &serviceStatus)) + error = GetLastError(); + +cleanup: + if (hService) + CloseServiceHandle(hService); + + return error; +} + +DWORD Service_Control(SERVICE_FUNC *Service_Func) +{ + DWORD error = ERROR_SUCCESS; + SC_HANDLE hScm = NULL; + + hScm = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + + if (!hScm) + { + error = GetLastError(); + goto cleanup; + } + + error = Service_Func(hScm); + +cleanup: + if (hScm) + CloseServiceHandle(hScm); + + return error; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 52156: [BOOTSECTOR] - export obj2bin on gcc builds, too - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors wi...
by tkreuzer＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tkreuzer Date: Thu Jun 9 13:56:44 2011 New Revision: 52156 URL: http://svn.reactos.org/svn/reactos?rev=52156&view=rev Log: [BOOTSECTOR] - export obj2bin on gcc builds, too - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors with the new code one at a time, and in the end we can eventually drop nmake - add wrapper isobtrt.S, which defines ROS_REGTEST and includes isoboot.S Added: trunk/reactos/boot/freeldr/bootsect/isobtrt.S (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/gcc.cmake trunk/reactos/msc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52156&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -59,7 +59,7 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl wrc gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -1,12 +1,18 @@ -if(MSVC) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) -else() +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) + +#CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) +#CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) +#CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) +#CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) +CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) +#CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) + +if(NOT MSVC) CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 0) +CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) -CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 0) CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) endif() @@ -17,3 +23,5 @@ add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all) +endif() + Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -45,8 +45,9 @@ // **************************************************************************** //#define DEBUG_MESSAGES /* Uncomment to get debugging messages */ +#ifndef ROS_REGTEST #define WAIT_FOR_KEY - +#endif // **************************************************************************** // BEGIN THE BIOS/CODE/DATA SEGMENT @@ -129,7 +130,6 @@ #endif // Make sure the keyboard buffer is empty -#ifdef WAIT_FOR_KEY call pollchar_and_empty // Check for MBR on harddisk @@ -148,6 +148,7 @@ je .boot_cdrom // no boot sector found (hopefully there are no weird bootsectors which begin with 0) pop ax +#ifdef WAIT_FOR_KEY // Display the 'Press key' message and wait for a maximum of 5 seconds call crlf mov si, offset presskey_msg // si points to 'Press key' message @@ -171,6 +172,7 @@ dec byte ptr ds:[TimeoutCount] // decrement timeout counter jz .boot_harddisk jmp .next_second +#endif .boot_harddisk: call crlf @@ -192,7 +194,6 @@ mov dx, HEX(0080) ljmp16 0, HEX(7C00) -#endif .boot_cdrom: #ifdef WAIT_FOR_KEY Added: trunk/reactos/boot/freeldr/bootsect/isobtrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.S (added) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.S [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -1,0 +1,3 @@ + +#define ROS_REGTEST +#include "isoboot.S" Propchange: trunk/reactos/boot/freeldr/bootsect/isobtrt.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/gcc.cmake?rev=52156&r1=521… ============================================================================== --- trunk/reactos/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/gcc.cmake [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -352,3 +352,23 @@ set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) endmacro() + +macro(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address) + set(_object_file ${_binary_file}.o) + + add_custom_command( + OUTPUT ${_object_file} + COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ${_asm_file} + DEPENDS ${_asm_file}) + + add_custom_command( + OUTPUT ${_binary_file} + COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address} + # COMMAND objcopy --output-target binary --image-base 0x${_base_address} ${_object_file} ${_binary_file} + DEPENDS ${_object_file}) + + set_source_files_properties(${_object_file} ${_binary_file} PROPERTIES GENERATED TRUE) + + add_custom_target(${_target_name} ALL DEPENDS ${_binary_file}) + +endmacro() Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=52156&r1=521… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Thu Jun 9 13:56:44 2011 @@ -192,7 +192,7 @@ #pseh workaround set(PSEH_LIB "pseh") -macro(CreateBootSectorTarget _target_name _asm_file _binary_file _base_address) +macro(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address) set(_object_file ${_binary_file}.obj) set(_temp_file ${_binary_file}.tmp)

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