Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 59137: [AUDIO] - Support zero value tags CORE-6890 #comment please retest
by janderwald＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: janderwald Date: Sat Jun 1 23:16:08 2013 New Revision: 59137 URL: http://svn.reactos.org/svn/reactos?rev=59137&view=rev Log: [AUDIO] - Support zero value tags CORE-6890 #comment please retest Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Jun 1 23:16:08 2013 @@ -59,13 +59,19 @@ typedef struct { + PVOID Tag; + UCHAR Used; +}KSSTREAM_TAG, *PKSSTREAM_TAG; + +typedef struct +{ ULONG StreamHeaderCount; ULONG StreamHeaderIndex; ULONG TotalStreamData; PKSSTREAM_HEADER CurStreamHeader; PVOID * Data; - PVOID * Tags; + PKSSTREAM_TAG Tags; }KSSTREAM_DATA, *PKSSTREAM_DATA; #define STREAM_DATA_OFFSET (0) @@ -208,7 +214,7 @@ if (m_TagSupportEnabled) { // allocate array for storing the pointers of the data */ - StreamData->Tags = (PVOID*)AllocateItem(NonPagedPool, sizeof(PVOID) * StreamData->StreamHeaderCount, TAG_PORTCLASS); + StreamData->Tags = (PKSSTREAM_TAG)AllocateItem(NonPagedPool, sizeof(KSSTREAM_TAG) * StreamData->StreamHeaderCount, TAG_PORTCLASS); if (!StreamData->Data) { // out of memory @@ -520,7 +526,6 @@ PKSSTREAM_DATA StreamData; /* sanity checks */ - PC_ASSERT(Tag != NULL); PC_ASSERT(PhysicalAddress); PC_ASSERT(VirtualAddress); PC_ASSERT(ByteCount); @@ -551,7 +556,11 @@ *VirtualAddress = StreamData->Data[StreamData->StreamHeaderIndex]; // store tag in irp - StreamData->Tags[StreamData->StreamHeaderIndex] = Tag; + StreamData->Tags[StreamData->StreamHeaderIndex].Tag = Tag; + StreamData->Tags[StreamData->StreamHeaderIndex].Used = TRUE; + + // increment header index + StreamData->StreamHeaderIndex++; // mapping size if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) @@ -571,7 +580,7 @@ m_NumDataAvailable -= StreamData->CurStreamHeader->FrameExtent; } - if (StreamData->StreamHeaderIndex + 1 == StreamData->StreamHeaderCount) + if (StreamData->StreamHeaderIndex == StreamData->StreamHeaderCount) { // last mapping *Flags = 1; @@ -587,9 +596,6 @@ { // one more mapping in the irp *Flags = 0; - - // increment header index - StreamData->StreamHeaderIndex++; // move to next header StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); @@ -622,10 +628,11 @@ for(Index = 0; Index < StreamData->StreamHeaderIndex; Index++) { // check if it is the same tag - if (StreamData->Tags[Index] == Tag) + if (StreamData->Tags[Index].Tag == Tag && StreamData->Tags[Index].Used == TRUE) { // mark mapping as released - StreamData->Tags[Index] = NULL; + StreamData->Tags[Index].Tag = NULL; + StreamData->Tags[Index].Used = FALSE; // done return STATUS_SUCCESS; @@ -648,15 +655,17 @@ StreamData = (PKSSTREAM_DATA)Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; // sanity check - PC_ASSERT(StreamData->StreamHeaderIndex + 1 == StreamData->StreamHeaderCount); + PC_ASSERT(StreamData->StreamHeaderIndex == StreamData->StreamHeaderCount); // check if the released mapping is one of these for(Index = 0; Index < StreamData->StreamHeaderCount; Index++) { - if (StreamData->Tags[Index] == Tag) + if (StreamData->Tags[Index].Tag == Tag && + StreamData->Tags[Index].Used == TRUE) { // mark mapping as released - StreamData->Tags[Index] = NULL; + StreamData->Tags[Index].Tag = NULL; + StreamData->Tags[Index].Used = FALSE; // done break; @@ -668,7 +677,8 @@ // therefore if the current mapping is not the searched one, it must have been already // released // - PC_ASSERT(StreamData->Tags[Index] == NULL); + ASSERT(StreamData->Tags[Index].Tag == NULL); + ASSERT(StreamData->Tags[Index].Used == FALSE); } }

1 0

[ekohl] 59136: [NETAPI32] Implement NetLocalGroupDel.
by ekohl＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: ekohl Date: Sat Jun 1 23:10:10 2013 New Revision: 59136 URL: http://svn.reactos.org/svn/reactos?rev=59136&view=rev Log: [NETAPI32] Implement NetLocalGroupDel. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Jun 1 23:10:10 2013 @@ -385,16 +385,121 @@ return NERR_Success; } + /************************************************************ * NetLocalGroupDel (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupDel( +NET_API_STATUS +WINAPI +NetLocalGroupDel( LPCWSTR servername, LPCWSTR groupname) { - FIXME("(%s %s) stub!\n", debugstr_w(servername), debugstr_w(groupname)); - return NERR_Success; -} + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %s)\n", debugstr_w(servername), debugstr_w(groupname)); + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + DELETE, + &AliasHandle); + if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED) + { + TRACE("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + if (AliasHandle == NULL) + { + if (DomainHandle != NULL) + { + SamCloseHandle(DomainHandle); + DomainHandle = NULL; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + DELETE, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + } + + /* Delete the alias */ + Status = SamDeleteAlias(AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamDeleteAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + /************************************************************ * NetLocalGroupDelMember (NETAPI32.@) @@ -424,10 +529,13 @@ return NERR_Success; } + /************************************************************ * NetLocalGroupEnum (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupEnum( +NET_API_STATUS +WINAPI +NetLocalGroupEnum( LPCWSTR servername, DWORD level, LPBYTE* bufptr, @@ -881,3 +989,5 @@ debugstr_w(groupname), level, buf, totalentries); return NERR_Success; } + +/* EOF */

1 0

[hbelusca] 59135: [KERNEL32-CONSRV] - Implement SetConsoleCursor and ShowConsoleCursor (set the shape of the cursor, and show/hide it). It appears that SetConsoleCursor acts only on graphics screen...
by hbelusca＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: hbelusca Date: Sat Jun 1 22:49:50 2013 New Revision: 59135 URL: http://svn.reactos.org/svn/reactos?rev=59135&view=rev Log: [KERNEL32-CONSRV] - Implement SetConsoleCursor and ShowConsoleCursor (set the shape of the cursor, and show/hide it). It appears that SetConsoleCursor acts only on graphics screen buffers (tested on Windows). I personnaly think it's a limitation we can suppress, but at the moment I keep it. - Implement SetConsoleMaximumWindowSize which does nothing else than returning TRUE but doesn't give any constraint on the maximum size of the console window (tested on Windows Server 2003). See http://undoc.airesoft.co.uk/kernel32.dll/SetConsoleCursor.php , http://undoc.airesoft.co.uk/kernel32.dll/ShowConsoleCursor.php and http://undoc.airesoft.co.uk/kernel32.dll/SetConsoleMaximumWindowSize.php for more details. Useful for the NTVDM interface ! [CONSRV:Gui frontend] - Fix "Select all" action. - Enable or disable "Copy" and "Paste" commands in the edition menu. Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/include/psdk/wincon.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/consrv/api.h trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/init.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -541,16 +541,32 @@ /* - * @unimplemented (Undocumented) - */ -BOOL -WINAPI -SetConsoleCursor(DWORD Unknown0, - DWORD Unknown1) -{ - DPRINT1("SetConsoleCursor(0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + * @implemented (Undocumented) + * @note See http://undoc.airesoft.co.uk/kernel32.dll/SetConsoleCursor.php + */ +BOOL +WINAPI +SetConsoleCursor(HANDLE hConsoleOutput, + HCURSOR hCursor) +{ + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETCURSOR SetCursorRequest = &ApiMessage.Data.SetCursorRequest; + + SetCursorRequest->OutputHandle = hConsoleOutput; + SetCursorRequest->hCursor = hCursor; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursor), + sizeof(CONSOLE_SETCURSOR)); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } @@ -652,16 +668,18 @@ /* - * @unimplemented (Undocumented) - */ -BOOL -WINAPI -SetConsoleMaximumWindowSize(DWORD Unknown0, - DWORD Unknown1) -{ - DPRINT1("SetConsoleMaximumWindowSize(0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + * @implemented (Undocumented) + * @note See http://undoc.airesoft.co.uk/kernel32.dll/SetConsoleMaximumWindowSize.php + * Does nothing, returns TRUE only. Checked on Windows Server 2003. + */ +BOOL +WINAPI +SetConsoleMaximumWindowSize(HANDLE hConsoleOutput, + COORD dwMaximumSize) +{ + DPRINT1("SetConsoleMaximumWindowSize(0x%x, {%d, %d}) does nothing\n", + hConsoleOutput, dwMaximumSize.X, dwMaximumSize.Y); + return TRUE; } @@ -707,16 +725,27 @@ } /* - * @unimplemented (Undocumented) - */ -DWORD -WINAPI -ShowConsoleCursor(DWORD Unknown0, - DWORD Unknown1) -{ - DPRINT1("ShowConsoleCursor(0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + * @implemented (Undocumented) + * @note See http://undoc.airesoft.co.uk/kernel32.dll/ShowConsoleCursor.php + */ +INT +WINAPI +ShowConsoleCursor(HANDLE hConsoleOutput, + BOOL bShow) +{ + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SHOWCURSOR ShowCursorRequest = &ApiMessage.Data.ShowCursorRequest; + + ShowCursorRequest->OutputHandle = hConsoleOutput; + ShowCursorRequest->Show = bShow; + ShowCursorRequest->RefCount = 0; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepShowCursor), + sizeof(CONSOLE_SHOWCURSOR)); + + return ShowCursorRequest->RefCount; } Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -456,6 +456,10 @@ HMENU WINAPI ConsoleMenuControl(_In_ HANDLE, _In_ DWORD, _In_ DWORD); /* Undocumented */ BOOL WINAPI SetConsoleMenuClose(_In_ BOOL); +/* Undocumented, see http://undoc.airesoft.co.uk/kernel32.dll/SetConsoleCursor.php */ +BOOL WINAPI SetConsoleCursor(_In_ HANDLE, _In_ HCURSOR); +/* Undocumented, see http://undoc.airesoft.co.uk/kernel32.dll/ShowConsoleCursor.php */ +INT WINAPI ShowConsoleCursor(_In_ HANDLE, _In_ BOOL); BOOL WINAPI WriteConsoleA(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID); BOOL WINAPI WriteConsoleW(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID); Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -62,8 +62,8 @@ ConsolepCreateScreenBuffer, ConsolepInvalidateBitMapRect, // ConsolepVDMOperation, - // ConsolepSetCursor, - // ConsolepShowCursor, + ConsolepSetCursor, + ConsolepShowCursor, ConsolepMenuControl, // ConsolepSetPalette, ConsolepSetDisplayMode, @@ -221,6 +221,19 @@ typedef struct { HANDLE OutputHandle; + BOOL Show; + INT RefCount; +} CONSOLE_SHOWCURSOR, *PCONSOLE_SHOWCURSOR; + +typedef struct +{ + HANDLE OutputHandle; + HCURSOR hCursor; +} CONSOLE_SETCURSOR, *PCONSOLE_SETCURSOR; + +typedef struct +{ + HANDLE OutputHandle; CONSOLE_CURSOR_INFO Info; } CONSOLE_GETSETCURSORINFO, *PCONSOLE_GETSETCURSORINFO; @@ -627,6 +640,8 @@ CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest; /* Cursor */ + CONSOLE_SHOWCURSOR ShowCursorRequest; + CONSOLE_SETCURSOR SetCursorRequest; CONSOLE_GETSETCURSORINFO CursorInfoRequest; CONSOLE_SETCURSORPOSITION SetCursorPositionRequest; Modified: trunk/reactos/win32ss/user/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/api.h?… ============================================================================== --- trunk/reactos/win32ss/user/consrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/api.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -54,6 +54,8 @@ CSR_API(SrvGetConsoleDisplayMode); CSR_API(SrvSetConsoleDisplayMode); CSR_API(SrvGetLargestConsoleWindowSize); +CSR_API(SrvShowConsoleCursor); +CSR_API(SrvSetConsoleCursor); CSR_API(SrvConsoleMenuControl); CSR_API(SrvSetConsoleMenuClose); CSR_API(SrvSetConsoleWindowInfo); Modified: trunk/reactos/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conio.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -40,6 +40,10 @@ (Console)->TermIFace.Vtbl->GetDisplayMode(Console) #define ConioSetDisplayMode(Console, NewMode) \ (Console)->TermIFace.Vtbl->SetDisplayMode((Console), (NewMode)) +#define ConioShowMouseCursor(Console, Show) \ + (Console)->TermIFace.Vtbl->ShowMouseCursor((Console), (Show)) +#define ConioSetMouseCursor(Console, hCursor) \ + (Console)->TermIFace.Vtbl->SetMouseCursor((Console), (hCursor)) #define ConioMenuControl(Console, CmdIdLow, CmdIdHigh) \ (Console)->TermIFace.Vtbl->MenuControl((Console), (CmdIdLow), (CmdIdHigh)) #define ConioSetMenuClose(Console, Enable) \ Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -617,7 +617,8 @@ Console->LineMaxSize = Console->LineSize = Console->LinePos = 0; Console->LineComplete = Console->LineUpPressed = Console->LineInsertToggle = FALSE; // LineWakeupMask - // Selection + RtlZeroMemory(&Console->Selection, sizeof(CONSOLE_SELECTION_INFO)); + Console->Selection.dwFlags = CONSOLE_NO_SELECTION; // dwSelectionCursor Console->CodePage = GetOEMCP(); @@ -1398,6 +1399,54 @@ return STATUS_SUCCESS; } +CSR_API(SrvShowConsoleCursor) +{ + NTSTATUS Status; + PCONSOLE_SHOWCURSOR ShowCursorRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ShowCursorRequest; + PCONSOLE Console; + PCONSOLE_SCREEN_BUFFER Buff; + + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + ShowCursorRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Console = Buff->Header.Console; + + ShowCursorRequest->RefCount = ConioShowMouseCursor(Console, ShowCursorRequest->Show); + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; +} + +CSR_API(SrvSetConsoleCursor) +{ + NTSTATUS Status; + BOOL Success; + PCONSOLE_SETCURSOR SetCursorRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorRequest; + PCONSOLE Console; + PCONSOLE_SCREEN_BUFFER Buff; + + // FIXME: Tests show that this function is used only for graphics screen buffers + // and otherwise it returns false + set last error to invalid handle. + // NOTE: I find that behaviour is ridiculous but ok, let's accept that at the moment... + Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetCursorRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Console = Buff->Header.Console; + + Success = ConioSetMouseCursor(Console, SetCursorRequest->hCursor); + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + CSR_API(SrvConsoleMenuControl) { NTSTATUS Status; Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -47,9 +47,12 @@ HWND hWindow; /* Handle to the console's window */ HICON hIcon; /* Handle to the console's icon (big) */ HICON hIconSm; /* Handle to the console's icon (small) */ + + HCURSOR hCursor; /* Handle to the mouse cursor */ + INT MouseCursorRefCount; /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */ BOOL IgnoreNextMouseSignal; /* Used in cases where we don't want to treat a mouse signal */ - BOOL IsCloseButtonEnabled; /* TRUE if the Close button and the corresponding system menu item are enabled, FALSE otherwise */ + BOOL IsCloseButtonEnabled; /* TRUE if the Close button and the corresponding system menu item are enabled (default), FALSE otherwise */ UINT cmdIdLow ; /* Lowest menu id of the user-reserved menu id range */ UINT cmdIdHigh; /* Highest menu id of the user-reserved menu id range */ Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -276,11 +276,23 @@ case ID_SYSTEM_EDIT_SELECTALL: { + LPWSTR WindowTitle = NULL; + SIZE_T Length = 0; + Console->Selection.dwSelectionAnchor.X = 0; Console->Selection.dwSelectionAnchor.Y = 0; Console->dwSelectionCursor.X = ActiveBuffer->ViewSize.X - 1; Console->dwSelectionCursor.Y = ActiveBuffer->ViewSize.Y - 1; + Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION; GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); + + Length = Console->Title.Length + sizeof(L"Selection - ")/sizeof(WCHAR) + 1; + WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); + wcscpy(WindowTitle, L"Selection - "); + wcscat(WindowTitle, Console->Title.Buffer); + SetWindowText(GuiData->hWindow, WindowTitle); + ConsoleFreeHeap(WindowTitle); + break; } @@ -1636,6 +1648,54 @@ GuiConsoleHandleTimer(GuiData); break; + case WM_SETCURSOR: + { + /* + * The message was sent because we are manually triggering a change. + * Check whether the mouse is indeed present on this console window + * and take appropriate decisions. + */ + if (wParam == -1 && lParam == -1) + { + POINT mouseCoords; + HWND hWndHit; + + /* Get the placement of the mouse */ + GetCursorPos(&mouseCoords); + + /* On which window is placed the mouse ? */ + hWndHit = WindowFromPoint(mouseCoords); + + /* It's our window. Perform the hit-test to be used later on. */ + if (hWndHit == hWnd) + { + wParam = (WPARAM)hWnd; + lParam = DefWindowProcW(hWndHit, WM_NCHITTEST, 0, + MAKELPARAM(mouseCoords.x, mouseCoords.y)); + } + } + + /* Set the mouse cursor only when we are in the client area */ + if ((HWND)wParam == hWnd && LOWORD(lParam) == HTCLIENT) + { + if (GuiData->MouseCursorRefCount >= 0) + { + /* Show the cursor */ + SetCursor(GuiData->hCursor); + } + else + { + /* Hide the cursor if the reference count is negative */ + SetCursor(NULL); + } + return TRUE; + } + else + { + goto Default; + } + } + case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: @@ -1711,8 +1771,17 @@ HMENU hMenu = (HMENU)wParam; if (hMenu != NULL) { - /* Enables or disables the Close menu item */ - EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | (GuiData->IsCloseButtonEnabled ? MF_ENABLED : MF_GRAYED)); + /* Enable or disable the Close menu item */ + EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | + (GuiData->IsCloseButtonEnabled ? MF_ENABLED : MF_GRAYED)); + + /* Enable or disable the Copy and Paste items */ + EnableMenuItem(hMenu, ID_SYSTEM_EDIT_COPY , MF_BYCOMMAND | + ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && + (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_SYSTEM_EDIT_PASTE, MF_BYCOMMAND | + (!(Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && + IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED)); } if (ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) @@ -2229,6 +2298,9 @@ return FALSE; } +static BOOL WINAPI +GuiSetMouseCursor(PCONSOLE Console, HCURSOR hCursor); + static VOID WINAPI GuiRefreshInternalInfo(PCONSOLE Console) { @@ -2236,6 +2308,19 @@ /* Update the console leader information held by the window */ SetConsoleWndConsoleLeaderCID(GuiData); + + /* + * HACK: + * We reset the cursor here so that, when a console app quits, we reset + * the cursor to the default one. It's quite a hack since it doesn't proceed + * per - console process... This must be fixed. + * + * See GuiInitConsole(...) for more information. + */ + + /* Mouse is shown by default with its default cursor shape */ + GuiData->MouseCursorRefCount = 0; // Reinitialize the reference counter + GuiSetMouseCursor(Console, NULL); } static VOID WINAPI @@ -2370,6 +2455,38 @@ GuiData->GuiInfo.FullScreen = (NewMode & CONSOLE_FULLSCREEN_MODE); // TODO: Change the display mode + return TRUE; +} + +static INT WINAPI +GuiShowMouseCursor(PCONSOLE Console, BOOL Show) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + + /* Set the reference count */ + if (Show) ++GuiData->MouseCursorRefCount; + else --GuiData->MouseCursorRefCount; + + /* Effectively show (or hide) the cursor (use special values for (w|l)Param) */ + PostMessageW(GuiData->hWindow, WM_SETCURSOR, -1, -1); + + return GuiData->MouseCursorRefCount; +} + +static BOOL WINAPI +GuiSetMouseCursor(PCONSOLE Console, HCURSOR hCursor) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + + /* + * Set the cursor's handle. If the given handle is NULL, + * then restore the default cursor. + */ + GuiData->hCursor = (hCursor ? hCursor : ghDefaultCursor); + + /* Effectively modify the shape of the cursor (use special values for (w|l)Param) */ + PostMessageW(GuiData->hWindow, WM_SETCURSOR, -1, -1); + return TRUE; } @@ -2420,6 +2537,8 @@ GuiGetLargestConsoleWindowSize, GuiGetDisplayMode, GuiSetDisplayMode, + GuiShowMouseCursor, + GuiSetMouseCursor, GuiMenuControl, GuiSetMenuClose, }; @@ -2544,6 +2663,13 @@ } } + /* Mouse is shown by default with its default cursor shape */ + GuiData->hCursor = ghDefaultCursor; + GuiData->MouseCursorRefCount = 0; + + /* A priori don't ignore mouse signals */ + GuiData->IgnoreNextMouseSignal = FALSE; + /* Close button and the corresponding system menu item are enabled by default */ GuiData->IsCloseButtonEnabled = TRUE; Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -643,6 +643,18 @@ return TRUE; } +static INT WINAPI +TuiShowMouseCursor(PCONSOLE Console, BOOL Show) +{ + return 0; +} + +static BOOL WINAPI +TuiSetMouseCursor(PCONSOLE Console, HCURSOR hCursor) +{ + return TRUE; +} + static HMENU WINAPI TuiMenuControl(PCONSOLE Console, UINT cmdIdLow, UINT cmdIdHigh) { @@ -652,7 +664,7 @@ static BOOL WINAPI TuiSetMenuClose(PCONSOLE Console, BOOL Enable) { - return FALSE; + return TRUE; } static FRONTEND_VTBL TuiVtbl = @@ -671,6 +683,8 @@ TuiGetLargestConsoleWindowSize, TuiGetDisplayMode, TuiSetDisplayMode, + TuiShowMouseCursor, + TuiSetMouseCursor, TuiMenuControl, TuiSetMenuClose, }; Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… ============================================================================== --- trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -218,6 +218,10 @@ ULONG (WINAPI *GetDisplayMode)(struct _CONSOLE* Console); BOOL (WINAPI *SetDisplayMode)(struct _CONSOLE* Console, ULONG NewMode); + INT (WINAPI *ShowMouseCursor)(struct _CONSOLE* Console, + BOOL Show); + BOOL (WINAPI *SetMouseCursor)(struct _CONSOLE* Console, + HCURSOR hCursor); HMENU (WINAPI *MenuControl)(struct _CONSOLE* Console, UINT cmdIdLow, UINT cmdIdHigh); Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] Sat Jun 1 22:49:50 2013 @@ -72,8 +72,8 @@ SrvCreateConsoleScreenBuffer, SrvInvalidateBitMapRect, // SrvVDMConsoleOperation, - // SrvSetConsoleCursor, - // SrvShowConsoleCursor, + SrvSetConsoleCursor, + SrvShowConsoleCursor, SrvConsoleMenuControl, // SrvSetConsolePalette, SrvSetConsoleDisplayMode, @@ -163,8 +163,8 @@ FALSE, // SrvCreateConsoleScreenBuffer, FALSE, // SrvInvalidateBitMapRect, // FALSE, // SrvVDMConsoleOperation, - // FALSE, // SrvSetConsoleCursor, - // FALSE, // SrvShowConsoleCursor, + FALSE, // SrvSetConsoleCursor, + FALSE, // SrvShowConsoleCursor, FALSE, // SrvConsoleMenuControl, // FALSE, // SrvSetConsolePalette, FALSE, // SrvSetConsoleDisplayMode, @@ -254,8 +254,8 @@ "CreateConsoleScreenBuffer", "InvalidateBitMapRect", // "VDMConsoleOperation", - // "SetConsoleCursor", - // "ShowConsoleCursor", + "SetConsoleCursor", + "ShowConsoleCursor", "ConsoleMenuControl", // "SetConsolePalette", "SetConsoleDisplayMode",

1 0

[tfaber] 59134: [NTOS:IO] - Do not dereference an unsafe ObjectAttributes pointer in IoCreateFile. Spotted by Aleksandar Andrejevic (I'm removing the OriginalAttributes assignment completely becaus...
by tfaber＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: tfaber Date: Sat Jun 1 20:50:13 2013 New Revision: 59134 URL: http://svn.reactos.org/svn/reactos?rev=59134&view=rev Log: [NTOS:IO] - Do not dereference an unsafe ObjectAttributes pointer in IoCreateFile. Spotted by Aleksandar Andrejevic (I'm removing the OriginalAttributes assignment completely because it's never used, and it generally makes no sense to copy this. ObOpenObjectByName already takes care of everything in attributes) CORE-7167 Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Jun 1 20:50:13 2013 @@ -1761,7 +1761,7 @@ SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, EaLength, TAG_EA); - if(!SystemEaBuffer) + if (!SystemEaBuffer) { _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } @@ -1840,7 +1840,6 @@ RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); OpenPacket.Type = IO_TYPE_OPEN_PACKET; OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.OriginalAttributes = *ObjectAttributes; OpenPacket.AllocationSize = SafeAllocationSize; OpenPacket.CreateOptions = CreateOptions; OpenPacket.FileAttributes = (USHORT)FileAttributes;

1 0

[akhaldi] 59133: [NTOSKRNL] * Properly fail when the read pointer is out of the file. Brought to you by Sergey Chernov. CORE-7249 #resolve #comment Committed in r59133. Thanks !
by akhaldi＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: akhaldi Date: Sat Jun 1 18:47:11 2013 New Revision: 59133 URL: http://svn.reactos.org/svn/reactos?rev=59133&view=rev Log: [NTOSKRNL] * Properly fail when the read pointer is out of the file. Brought to you by Sergey Chernov. CORE-7249 #resolve #comment Committed in r59133. Thanks ! Modified: trunk/reactos/ntoskrnl/cache/section/io.c Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Sat Jun 1 18:47:11 2013 @@ -187,7 +187,9 @@ } DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - Status = ReadStatus->Status == STATUS_END_OF_FILE ? STATUS_SUCCESS : ReadStatus->Status; + /* When "ReadStatus->Information > 0" is false and "ReadStatus->Status == STATUS_END_OF_FILE" is true + * it means that read pointer is out of file, so we must fail */ + Status = ReadStatus->Status == STATUS_END_OF_FILE && ReadStatus->Information > 0 ? STATUS_SUCCESS : ReadStatus->Status; return Status; }

1 0

[hbelusca] 59132: [CMD] COLOR builtin command of CMD does not format output color correctly. When changing the color of the foreground of the console with the command "color 3" for instance, the co...
by hbelusca＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: hbelusca Date: Sat Jun 1 18:45:04 2013 New Revision: 59132 URL: http://svn.reactos.org/svn/reactos?rev=59132&view=rev Log: [CMD] COLOR builtin command of CMD does not format output color correctly. When changing the color of the foreground of the console with the command "color 3" for instance, the confirmation message "Color 3" appears whereas it should say "Color 03" as the number is output in 1-byte hexadecimal form. Patch by Radek Liška CORE-7246 #resolve #comment Committed in revision r59132. Thanks :) Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -633,7 +633,7 @@ STRING_CMD_ERROR5, "AusfÃ¼hrend cmdexit.bat...\n" STRING_COLOR_ERROR1, "Fehler: Hinter- und Vordergrund kÃ¶nnen nicht die selben Farben haben!" STRING_COLOR_ERROR2, "Fehler in der Farbangabe" -STRING_COLOR_ERROR3, "Farbe %x\n" +STRING_COLOR_ERROR3, "Farbe %02x\n" STRING_CONSOLE_ERROR, "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1, "Fehler: Quelle kann nicht geÃ¶ffnet werden - %s!\n" STRING_COPY_ERROR2, "Fehler: Kann nicht Ã¼ber sich selbst kopiert werden.\n" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -633,7 +633,7 @@ STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "ÎÎ³Î½ÏÏÏÎ¿ ÏÏÎ¬Î»Î¼Î±: %d\n" STRING_COPY_ERROR1, "Î£ÏÎ¬Î»Î¼Î±: ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÏ ÏÎ¿ Î¬Î½Î¿Î¹Î³Î¼Î± ÏÎ·Ï ÏÎ·Î³Î®Ï - %s!\n" STRING_COPY_ERROR2, "Î£ÏÎ¬Î»Î¼Î±: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Unknown error: %d\n" STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ STRING_CMD_ERROR5, "Ejecutando cmdexit.bat...\n" STRING_COLOR_ERROR1, "Â¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" STRING_COLOR_ERROR2, "Error en la especificaciÃ³n del color" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "Error desconocido: %d\n" STRING_COPY_ERROR1, "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2, "Error: Â¡No se puede copiar sobre si mismo!\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -651,7 +651,7 @@ STRING_CMD_ERROR5, "Lance cmdexit.bat...\n" STRING_COLOR_ERROR1, "L'arriÃ¨re plan et l'avant plan ne peuvent Ãªtre de la mÃªme couleur" STRING_COLOR_ERROR2, "Erreur dans la spÃ©cification des couleurs" -STRING_COLOR_ERROR3, "Couleur %x\n" +STRING_COLOR_ERROR3, "Couleur %02x\n" STRING_CONSOLE_ERROR, "Erreur inconnue : %d\n" STRING_COPY_ERROR1, "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2, "Erreur : Ne peut copier le fichier sur lui-mÃªme !\n" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -615,7 +615,7 @@ STRING_CMD_ERROR5, "cmdexit.bat futtatÃ¡sa...\n" STRING_COLOR_ERROR1, "Ugyanaz a szÃn nem lehet! (Az elÃµ- Ã©s hÃ¡ttÃ©rszÃn nem lehet ugyanolyan)" STRING_COLOR_ERROR2, "HibÃ¡s szÃn megadÃ¡s" -STRING_COLOR_ERROR3, "SzÃn %x\n" +STRING_COLOR_ERROR3, "SzÃn %02x\n" STRING_CONSOLE_ERROR, "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1, "Hiba: a forrÃ¡s nem nyithatÃ³ meg - %s!\n" STRING_COPY_ERROR2, "Hiba: nem mÃ¡solhatod Ã¶nmagÃ¡ra az Ã¡llomÃ¡nyt!\n" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -635,7 +635,7 @@ STRING_CMD_ERROR5, "Menjalankan cmdexit.bat...\n" STRING_COLOR_ERROR1, "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" STRING_COLOR_ERROR2, "Kesalahan dalam spesifikasi warna" -STRING_COLOR_ERROR3, "Warna %x\n" +STRING_COLOR_ERROR3, "Warna %02x\n" STRING_CONSOLE_ERROR, "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1, "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2, "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -641,7 +641,7 @@ STRING_CMD_ERROR5, "Esecuzione di cmdexit.bat...\n" STRING_COLOR_ERROR1, "Il colore di primo piano e sfondo non possono essere uguali" STRING_COLOR_ERROR2, "errore nella indicazione dei colori" -STRING_COLOR_ERROR3, "Colore %x\n" +STRING_COLOR_ERROR3, "Colore %02x\n" STRING_CONSOLE_ERROR, "errore sconosciuto: %d\n" STRING_COPY_ERROR1, "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2, "Errore: Impossibile copiare un file su se stesso!\n" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -641,7 +641,7 @@ STRING_CMD_ERROR5, "cmdexit.bat ãå®è¡ãã¦ãã¾ã...\n" STRING_COLOR_ERROR1, "ã¨ã©ã¼! åãè²ãæå®ããã¾ããã\n (åæ¯è²ã¨èæ¯è²ãåãè²ã«ãããã¨ã¯ã§ãã¾ãã)" STRING_COLOR_ERROR2, "è²ã®æå®ã«åé¡ãããã¾ãã" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "ä¸æãªã¨ã©ã¼: %d\n" STRING_COPY_ERROR1, "ã¨ã©ã¼: åã®ãã¡ã¤ã« %s ãéãã¾ãã!\n" STRING_COPY_ERROR2, "ã¨ã©ã¼: ã³ãã¼åã¨ã³ãã¼åãä¸ç·ã§ã!\n" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -628,7 +628,7 @@ STRING_CMD_ERROR5, "KjÃ¸rer cmdexit.bat...\n" STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" -STRING_COLOR_ERROR3, "Farge %x\n" +STRING_COLOR_ERROR3, "Farge %02x\n" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan ikke Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan ikke kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -636,7 +636,7 @@ STRING_CMD_ERROR5, "Wykonywanie cmdexit.bat...\n" STRING_COLOR_ERROR1, "BÅÄd! Kolor tÅa i tekstu nie moÅ¼e byÄ taki sam" STRING_COLOR_ERROR2, "BÅÄd w oznaczeniu kolorÃ³w." -STRING_COLOR_ERROR3, "Kolor %x\n" +STRING_COLOR_ERROR3, "Kolor %02x\n" STRING_CONSOLE_ERROR, "Nieznany bÅÄd: %d\n" STRING_COPY_ERROR1, "BÅÄd: Nie moÅ¼na otworzyÄ ÅºrÃ³dÅa - %s!\n" STRING_COPY_ERROR2, "BÅÄd: Nie moÅ¼na przekopiowaÄ pliku na niego samego!\n" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -680,7 +680,7 @@ STRING_CMD_ERROR5, "Executare Â«cmdexit.batÂ»...\n" STRING_COLOR_ERROR1, "Eroare de culoare identicÄ! (Culorile nu trebuie sÄ fie identice)" STRING_COLOR_ERROR2, "Eroare la specificarea culorii" -STRING_COLOR_ERROR3, "Culoare %x\n" +STRING_COLOR_ERROR3, "Culoare %02x\n" STRING_CONSOLE_ERROR, "Eroare necunoscutÄ: %d\n" STRING_COPY_ERROR1, "Eroare: Nu se poate deschide fiÈierul - Â«%sÂ»!\n" STRING_COPY_ERROR2, "Eroare: Nu se poate copia peste el Ã®nsuÈi!\n" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -640,7 +640,7 @@ STRING_CMD_ERROR5, "ÐÐ°Ð¿ÑÑÐº cmdexit.bat...\n" STRING_COLOR_ERROR1, "ÐÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐµ ÑÐ²ÐµÑÐ°! (Ð¦Ð²ÐµÑÐ° ÑÐ¾Ð½Ð° Ð¸ ÑÐµÐºÑÑÐ° Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸)" STRING_COLOR_ERROR2, "Ð¾ÑÐ¸Ð±ÐºÐ° Ð² ÑÐºÐ°Ð·Ð°Ð½Ð¸Ð¸ ÑÐ²ÐµÑÐ°" -STRING_COLOR_ERROR3, "Ð¦Ð²ÐµÑ %x\n" +STRING_COLOR_ERROR3, "Ð¦Ð²ÐµÑ %02x\n" STRING_CONSOLE_ERROR, "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" STRING_COPY_ERROR1, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - %s!\n" STRING_COPY_ERROR2, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² ÑÐµÐ±Ñ!\n" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -640,7 +640,7 @@ STRING_CMD_ERROR5, "Running cmdexit.bat...\n" STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR3, "Color %02x\n" STRING_CONSOLE_ERROR, "NeznÃ¡ma chyba: %d\n" STRING_COPY_ERROR1, "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Chyba: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -628,7 +628,7 @@ STRING_CMD_ERROR5, "KÃ¶r cmdexit.bat...\n" STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn och forgrunn kan inte ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" -STRING_COLOR_ERROR3, "Farge %x\n" +STRING_COLOR_ERROR3, "Farge %02x\n" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan inte Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan inte kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -642,7 +642,7 @@ STRING_CMD_ERROR5, "ÐÐ°Ð¿ÑÑÐº cmdexit.bat...\n" STRING_COLOR_ERROR1, "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° - Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²i ÐºÐ¾Ð»ÑÐ¾ÑÐ¸! (ÑÐ»Ð¾ ÑÐ° ÑÐµÐºÑÑ Ð½Ðµ Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑÐ¸ Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð»ÑÐ¾ÑÑ)" STRING_COLOR_ERROR2, "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð½i ÐºÐ¾Ð»ÑÐ¾ÑÑ" -STRING_COLOR_ERROR3, "ÐÐ¾Ð»iÑ %x\n" +STRING_COLOR_ERROR3, "ÐÐ¾Ð»iÑ %02x\n" STRING_CONSOLE_ERROR, "ÐÐµÐ²iÐ´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: %d\n" STRING_COPY_ERROR1, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²iÐ´ÐºÑÐ¸ÑÐ¸ Ð´Ð¶ÐµÑÐµÐ»Ð¾ - %s!\n" STRING_COPY_ERROR2, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÐºÐ¾Ð¿iÑÐ²Ð°ÑÐ¸ Ð² ÑÐµÐ±Ðµ!\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sat Jun 1 18:45:04 2013 @@ -600,7 +600,7 @@ STRING_CMD_ERROR5, "æ£å¨è¿è¡ cmdexit.bat...\n" STRING_COLOR_ERROR1, "åæ ·é¢è²éè¯¯ï¼ (èæ¯ååæ¯ä¸è½åè²)" STRING_COLOR_ERROR2, "é¢è²æå®éè¯¯" -STRING_COLOR_ERROR3, "é¢è² %x\n" +STRING_COLOR_ERROR3, "é¢è² %02x\n" STRING_CONSOLE_ERROR, "æªç¥éè¯¯ï¼%d\n" STRING_COPY_ERROR1, "éè¯¯ï¼æ æ³æå¼æº - %sï¼\n" STRING_COPY_ERROR2, "éè¯¯ï¼æ æ³å¤å¶å°èªèº«ï¼\n"

1 0

[tfaber] 59131: [CMAKE] - Don't check for unsupported gcc 4.6 - Disable -Wmaybe-uninitialized. It's just not useful.
by tfaber＠svn.reactos.org 01 Jun '13

01 Jun '13

Author: tfaber Date: Sat Jun 1 16:24:07 2013 New Revision: 59131 URL: http://svn.reactos.org/svn/reactos?rev=59131&view=rev Log: [CMAKE] - Don't check for unsupported gcc 4.6 - Disable -Wmaybe-uninitialized. It's just not useful. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59131&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jun 1 16:24:07 2013 @@ -46,12 +46,10 @@ # Warnings add_compile_flags("-Werror -Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") -if(GCC_VERSION VERSION_LESS 4.6) +if(GCC_VERSION VERSION_LESS 4.7) add_compile_flags("-Wno-error=uninitialized") -elseif((GCC_VERSION VERSION_GREATER 4.6 OR GCC_VERSION VERSION_EQUAL 4.6) AND GCC_VERSION VERSION_LESS 4.7) - add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=uninitialized") elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) - add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=maybe-uninitialized -Wno-error=delete-non-virtual-dtor -Wno-error=narrowing") + add_compile_flags("-Wno-error=unused-but-set-variable -Wno-maybe-uninitialized -Wno-error=delete-non-virtual-dtor -Wno-error=narrowing") endif() if(ARCH STREQUAL "amd64")

1 0

[spetreolle] 59130: Fix configure on *nixes. Arch, don't use brackets, thats meant to execute something.
by spetreolle＠svn.reactos.org 31 May '13

31 May '13

Author: spetreolle Date: Fri May 31 21:27:50 2013 New Revision: 59130 URL: http://svn.reactos.org/svn/reactos?rev=59130&view=rev Log: Fix configure on *nixes. Arch, don't use brackets, thats meant to execute something. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59130&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri May 31 21:27:50 2013 @@ -9,7 +9,7 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ ("$1" = "Makefiles") -o ("$1" = "makefiles") ]; then +if [ "$1" = "Makefiles" -o "$1" = "makefiles" ]; then CMAKE_GENERATOR="Unix Makefiles" else CMAKE_GENERATOR="Ninja" @@ -34,6 +34,6 @@ cd ../reactos rm -f CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DNEWCC=0 -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: ninja, make, makex, etc...$.

1 0

[hbelusca] 59129: Finally, ... ... use Ninja by default for compiling ReactOS !! Users now have to do: ./configure to use Ninja for building ReactOS. The old method (using makefiles) is available by...
by hbelusca＠svn.reactos.org 31 May '13

31 May '13

Author: hbelusca Date: Fri May 31 21:04:28 2013 New Revision: 59129 URL: http://svn.reactos.org/svn/reactos?rev=59129&view=rev Log: Finally,... ... use Ninja by default for compiling ReactOS !! Users now have to do: ./configure to use Ninja for building ReactOS. The old method (using makefiles) is available by doing: ./configure Makefiles (or: ./configure makefiles ) Tested by Amine and Sylvain (blame them ;) ) Modified: trunk/reactos/configure.cmd trunk/reactos/configure.sh Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59129&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Fri May 31 21:04:28 2013 @@ -35,10 +35,10 @@ set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" ) else if /I "%1" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" - ) else if /I "%1" == "Ninja" ( + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="MinGW Makefiles" + ) else ( set CMAKE_GENERATOR="Ninja" - ) else ( - set CMAKE_GENERATOR="MinGW Makefiles" ) ) else if defined DDK_TARGET_OS ( @@ -128,12 +128,10 @@ set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" ) else if /I "%1" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" - ) else if /I "%1" == "JOM" ( - set CMAKE_GENERATOR="NMake Makefiles JOM" - ) else if /I "%1" == "Ninja" ( + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="NMake Makefiles" + ) else ( set CMAKE_GENERATOR="Ninja" - ) else ( - set CMAKE_GENERATOR="NMake Makefiles" ) ) Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59129&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri May 31 21:04:28 2013 @@ -9,10 +9,10 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$1" = "ninja" ]; then +if [ ("$1" = "Makefiles") -o ("$1" = "makefiles") ]; then +CMAKE_GENERATOR="Unix Makefiles" +else CMAKE_GENERATOR="Ninja" -else -CMAKE_GENERATOR="Unix Makefiles" fi if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then

1 0

[akhaldi] 59128: [CABINET_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 31 May '13

31 May '13

Author: akhaldi Date: Fri May 31 16:57:58 2013 New Revision: 59128 URL: http://svn.reactos.org/svn/reactos?rev=59128&view=rev Log: [CABINET_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt trunk/rostests/winetests/cabinet/extract.c trunk/rostests/winetests/cabinet/fdi.c trunk/rostests/winetests/cabinet/testlist.c Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] Fri May 31 16:57:58 2013 @@ -1,8 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(cabinet_winetest extract.c fdi.c testlist.c) target_link_libraries(cabinet_winetest wine) set_module_type(cabinet_winetest win32cui) Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… ============================================================================== --- trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] Fri May 31 16:57:58 2013 @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> -#include "fci.h" -#include "fdi.h" -#include "wine/test.h" +//#include <stdio.h> +//#include <windows.h> +#include <wine/test.h> +#include <fci.h> +#include <fdi.h> /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 Modified: trunk/rostests/winetests/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?r… ============================================================================== --- trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] Fri May 31 16:57:58 2013 @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> -#include "fci.h" -#include "fdi.h" -#include "wine/test.h" +//#include <stdio.h> +//#include <windows.h> +#include <wine/test.h> +#include <fci.h> +#include <fdi.h> /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 Modified: trunk/rostests/winetests/cabinet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/testlis… ============================================================================== --- trunk/rostests/winetests/cabinet/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/testlist.c [iso-8859-1] Fri May 31 16:57:58 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_extract(void); extern void func_fdi(void);

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