Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[jimtabor] 71906: [Win32SS] - Update (Sync/Port) User32:Text to Wine Staging 1.9.11, see CORE-11368.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 12 20:06:30 2016 New Revision: 71906 URL: http://svn.reactos.org/svn/reactos?rev=71906&view=rev Log: [Win32SS] - Update (Sync/Port) User32:Text to Wine Staging 1.9.11, see CORE-11368. Modified: trunk/reactos/win32ss/user/rtl/text.c trunk/reactos/win32ss/user/user32/windows/text.c Modified: trunk/reactos/win32ss/user/rtl/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?re… ============================================================================== --- trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] Tue Jul 12 20:06:30 2016 @@ -1189,7 +1189,7 @@ if (flags & DT_EXPANDTABS) { - int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; + int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8; tabwidth = tm.tmAveCharWidth * tabstop; } Modified: trunk/reactos/win32ss/user/user32/windows/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/text.c [iso-8859-1] Tue Jul 12 20:06:30 2016 @@ -203,7 +203,7 @@ WINAPI CharToOemA(LPCSTR s, LPSTR d) { - if (!s || !d) return TRUE; + if (!s || !d) return FALSE; return CharToOemBuffA(s, d, strlen(s) + 1); } @@ -215,6 +215,8 @@ CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len) { WCHAR* bufW; + + if ( !s || !d ) return FALSE; bufW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (bufW) { @@ -233,7 +235,7 @@ CharToOemBuffW(LPCWSTR s, LPSTR d, DWORD len) { if (!s || !d) - return TRUE; + return FALSE; WideCharToMultiByte(CP_OEMCP, 0, s, len, d, len, NULL, NULL); return TRUE; } @@ -245,6 +247,7 @@ WINAPI CharToOemW(LPCWSTR s, LPSTR d) { + if ( !s || !d ) return FALSE; return CharToOemBuffW(s, d, wcslen(s) + 1); } @@ -420,6 +423,7 @@ WINAPI OemToCharA(LPCSTR s, LPSTR d) { + if ( !s || !d ) return FALSE; return OemToCharBuffA(s, d, strlen(s) + 1); } @@ -429,6 +433,8 @@ BOOL WINAPI OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len) { WCHAR* bufW; + + if ( !s || !d ) return FALSE; bufW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (bufW) { @@ -446,6 +452,7 @@ WINAPI OemToCharBuffW(LPCSTR s, LPWSTR d, DWORD len) { + if ( !s || !d ) return FALSE; MultiByteToWideChar(CP_OEMCP, 0, s, len, d, len); return TRUE; } @@ -455,6 +462,7 @@ */ BOOL WINAPI OemToCharW(LPCSTR s, LPWSTR d) { + if ( !s || !d ) return FALSE; return OemToCharBuffW(s, d, strlen(s) + 1); }

8 years, 5 months

[zhu] 71905: Multitude of bug fixes for state TCP Context state transitions, memory allocation/deallocation, and LIST_ENTRY usage. Corrected handling of dying sockets. Previously, connected sockets...

by zhu＠svn.reactos.org

Author: zhu Date: Tue Jul 12 19:22:33 2016 New Revision: 71905 URL: http://svn.reactos.org/svn/reactos?rev=71905&view=rev Log: Multitude of bug fixes for state TCP Context state transitions, memory allocation/deallocation, and LIST_ENTRY usage. Corrected handling of dying sockets. Previously, connected sockets assigned by lwIP through the accepted callback were not assigned an error callback. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Tue Jul 12 19:22:33 2016 @@ -46,7 +46,6 @@ PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; PTCP_REQUEST Request; - NTSTATUS Status; DPRINT1("Prepare for cancel\n"); @@ -56,8 +55,7 @@ if (!Request) { DPRINT1("Allocation failed, out of memory\n"); - Status = STATUS_NO_MEMORY; - goto RETURN; + return STATUS_NO_MEMORY; } IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -71,10 +69,8 @@ IoSetCancelRoutine(Irp, CancelRoutine); InsertTailList(&Context->RequestListHead, &Request->ListEntry); - Status = STATUS_SUCCESS; DPRINT1("Prepared for cancel\n"); - - goto RETURN; + return STATUS_SUCCESS; } DPRINT1("Already cancelled\n"); @@ -82,8 +78,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; -RETURN: - return Status; + return STATUS_CANCELLED; } /* implementation in testing */ @@ -114,6 +109,12 @@ case TDI_CONNECTION_FILE : Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; goto TCP_CANCEL; + case TCP_REQUEST_STRUCT : + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoSetCancelRoutine(Irp, NULL); + ExFreePoolWithTag(IrpSp->FileObject->FsContext, TAG_TCP_REQUEST); + goto FINISH; default : DPRINT1("Cancellation error\n"); goto FINISH; @@ -142,6 +143,7 @@ { AddressFile->lwip_tcp_pcb = NULL; } + DPRINT1("Aborting PCB at %p\n", Context->lwip_tcp_pcb); tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); @@ -162,6 +164,7 @@ { AddressFile->lwip_tcp_pcb = NULL; } + DPRINT1("Closing PCB at %p\n", Context->lwip_tcp_pcb); tcp_close(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); @@ -200,8 +203,6 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); DPRINT1("CancelRequestRoutine Exiting\n"); - - return; } void @@ -234,10 +235,11 @@ PLIST_ENTRY RequestHead; PLIST_ENTRY RequestEntry; PLIST_ENTRY Entry; - PLIST_ENTRY Temp; PIRP Irp; KIRQL OldIrql; + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; switch (err) @@ -258,7 +260,7 @@ DPRINT1("lwIP invalid arguments\n"); break; case ERR_IF : - DPRINT1("Low=level error\n"); + DPRINT1("Low-level error\n"); break; default : DPRINT1("Unsupported lwIP error code: %d\n", err); @@ -301,25 +303,23 @@ Irp = Request->PendingIrp; if (Irp) { - if (Irp->Cancel) - { - Irp->Cancel = FALSE; - IoSetCancelRoutine(Irp, NULL); - } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + RequestEntry = RequestEntry->Flink; + RemoveEntryList(&Request->ListEntry); + IrpSp->FileObject->FsContext = Request; + IrpSp->FileObject->FsContext2 = (PVOID)TCP_REQUEST_STRUCT; + continue; } - Temp = RequestEntry->Flink; - RemoveEntryList(RequestEntry); + RequestEntry = RequestEntry->Flink; + RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - RequestEntry = Temp; } KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); if (Context->lwip_tcp_pcb != AddressFile->lwip_tcp_pcb) { + DPRINT1("Aborting PCB at %p\n", Context->lwip_tcp_pcb); tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); @@ -339,7 +339,7 @@ Context = (PTCP_CONTEXT)arg; DPRINT1("AddressFile at %p\n", Context->AddressFile); KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); - + RequestHead = &Context->RequestListHead; RequestEntry = RequestHead->Flink; while (RequestEntry != RequestHead) @@ -348,19 +348,16 @@ Irp = Request->PendingIrp; if (Irp) { - if (Irp->Cancel) - { - Irp->Cancel = FALSE; - IoSetCancelRoutine(Irp, NULL); - } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + RequestEntry = RequestEntry->Flink; + RemoveEntryList(&Request->ListEntry); + IrpSp->FileObject->FsContext = Request; + IrpSp->FileObject->FsContext2 = (PVOID)TCP_REQUEST_STRUCT; + continue; } - Temp = RequestEntry->Flink; - RemoveEntryList(RequestEntry); + RequestEntry = RequestEntry->Flink; + RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - RequestEntry = Temp; } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); @@ -507,6 +504,7 @@ KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); Context->lwip_tcp_pcb = newpcb; + tcp_err(Context->lwip_tcp_pcb, lwip_tcp_err_callback); InterlockedIncrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); Context->TcpState = TCP_STATE_ACCEPTED; @@ -690,7 +688,6 @@ UCHAR *CurrentSrceLocation; PLIST_ENTRY Head; PLIST_ENTRY Entry; - PLIST_ENTRY NextEntry; NTSTATUS Status; err_t lwip_err; @@ -714,23 +711,19 @@ Head = &Context->RequestListHead; Entry = Head->Flink; Irp = NULL; - DPRINT1("Entering Loop\n"); while (Entry != Head) { - DPRINT1("Fetching Request\n"); Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); - DPRINT1("Request Fetched. Points to %08x\n", Request); if (!Request->PendingIrp) { - DPRINT1("IRP pointer dereferenced\n"); - NextEntry = Entry->Flink; - RemoveEntryList(Entry); - DPRINT1("Entry removed\n"); - Entry = NextEntry; + Entry = Entry->Flink; + RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); continue; } if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) { Irp = Request->PendingIrp; Entry = Entry->Flink; + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); break; } Entry = Entry->Flink; @@ -747,7 +740,7 @@ Irp->Cancel = FALSE; if (Context->lwip_tcp_pcb != tpcb) { - DPRINT1("Receive tcp_pcb mismatch\n"); + DPRINT1("Receive tcp_pcb mismatch\nAborting PCB at %p\n", tpcb); tcp_arg(tpcb, NULL); tcp_abort(tpcb); InterlockedDecrement(&PcbCount); @@ -759,7 +752,8 @@ lwip_err = ERR_ABRT; goto BAD; } - if (!(Context->TcpState & (TCP_STATE_RECEIVING|TCP_STATE_ACCEPTED|TCP_STATE_CONNECTED))) { + if (!(Context->TcpState & TCP_STATE_RECEIVING) || + !(Context->TcpState & (TCP_STATE_CONNECTED|TCP_STATE_ACCEPTED))) { DPRINT1("Invalid TCP state: %08x\n", Context->TcpState); // TODO: better return code Status = STATUS_UNSUCCESSFUL; @@ -817,13 +811,19 @@ } RETURN: - DPRINT1("Receive CopiedLength = %d\n", CopiedLength); + DPRINT1("Receive CopiedLength = %d\nReceived on PCB at %p\n", CopiedLength, tpcb); tcp_recved(tpcb, CopiedLength); while (Entry != Head) { Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (!Request->PendingIrp) { + Entry = Entry->Flink; + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + continue; + } if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) { - tcp_recv(tpcb, lwip_tcp_receive_callback); + tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); break; } Entry = Entry->Flink; @@ -831,11 +831,7 @@ lwip_err = ERR_OK; BAD: - RemoveEntryList(&Request->ListEntry); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); - - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = CopiedLength; @@ -1137,24 +1133,25 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); + if (Protocol != IPPROTO_TCP) + { + DPRINT1("Creating connection context for non-TCP protocoln"); + return STATUS_INVALID_PARAMETER; + } + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_TCP_CONTEXT); if (!Context) { return STATUS_NO_MEMORY; } - - if (Protocol != IPPROTO_TCP) - { - DPRINT1("Creating connection context for non-TCP protocoln"); - return STATUS_INVALID_PARAMETER; - } Context->Type = TDI_CONNECTION_FILE; + Context->TcpState = TCP_STATE_CREATED; Context->Protocol = Protocol; RtlCopyMemory(&Context->RequestAddress, Address, sizeof(*Address)); + Context->AddressFile = NULL; KeInitializeSpinLock(&Context->RequestListLock); InitializeListHead(&Context->RequestListHead); Context->lwip_tcp_pcb = NULL; - Context->TcpState = TCP_STATE_CREATED; IrpSp->FileObject->FsContext = (PVOID)Context; IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; @@ -1203,10 +1200,12 @@ { if (AddressFile->lwip_tcp_pcb->state == LISTEN) { + DPRINT1("Closing PCB at %p\n", AddressFile->lwip_tcp_pcb); lwip_err = tcp_close(AddressFile->lwip_tcp_pcb); } else { + DPRINT1("Aborting PCB at %p\n", AddressFile->lwip_tcp_pcb); tcp_arg(AddressFile->lwip_tcp_pcb, NULL); tcp_abort(AddressFile->lwip_tcp_pcb); lwip_err = ERR_OK; @@ -1275,18 +1274,31 @@ KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + AddressFile = Context->AddressFile; + if (Context->lwip_tcp_pcb == AddressFile->lwip_tcp_pcb) + { + Context->lwip_tcp_pcb = NULL; + } + if (Context->lwip_tcp_pcb) { + if (Context->lwip_tcp_pcb == AddressFile->lwip_tcp_pcb) + { + Context->lwip_tcp_pcb = NULL; + } if (Context->TcpState == TCP_STATE_LISTENING) { + DPRINT1("Closing PCB at %p\n", Context->lwip_tcp_pcb); lwip_err = tcp_close(Context->lwip_tcp_pcb); } else { + DPRINT1("Aborting PCB at %p\n", Context->lwip_tcp_pcb); tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); lwip_err = ERR_OK; } + Context->lwip_tcp_pcb = NULL; InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); if (lwip_err != ERR_OK) @@ -1322,8 +1334,6 @@ } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); - - AddressFile = Context->AddressFile; ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Tue Jul 12 19:22:33 2016 @@ -4,6 +4,8 @@ #define TCP_REQUEST_CANCEL_MODE_ABORT 1 #define TCP_REQUEST_CANCEL_MODE_CLOSE 2 #define TCP_REQUEST_CANCEL_MODE_PRESERVE 3 + +#define TCP_REQUEST_STRUCT 255 #define TCP_REQUEST_PENDING_GENERAL 0 #define TCP_REQUEST_PENDING_SEND 1 @@ -49,13 +51,13 @@ typedef struct _TCP_CONTEXT { UCHAR Type; // must be the first member LIST_ENTRY ListEntry; - PADDRESS_FILE AddressFile; + ULONG TcpState; IPPROTO Protocol; TDI_ADDRESS_IP RequestAddress; + PADDRESS_FILE AddressFile; KSPIN_LOCK RequestListLock; LIST_ENTRY RequestListHead; struct tcp_pcb* lwip_tcp_pcb; - ULONG TcpState; } TCP_CONTEXT, *PTCP_CONTEXT; typedef struct _TCP_REQUEST { Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Tue Jul 12 19:22:33 2016 @@ -269,9 +269,9 @@ DPRINT1("\nPTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], temp[3], temp[2], temp[1], temp[0]);*/ - DPRINT1("Call into TcpIpCreateAddress\n"); + // DPRINT1("Call into TcpIpCreateAddress\n"); Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); - DPRINT1("Returned from TcpIpCreateAddress\n"); + // DPRINT1("Returned from TcpIpCreateAddress\n"); if (Status != STATUS_SUCCESS) { goto Quickie;

8 years, 5 months

[jimtabor] 71904: [Win32SS] - Cleanup error codes for Classes and Menus. - Update (Sync/Port) User32:Dialog to Wine Staging 1.9.11, see CORE-11368. - Now pass exactly the same tests as windows, exc...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 12 18:23:04 2016 New Revision: 71904 URL: http://svn.reactos.org/svn/reactos?rev=71904&view=rev Log: [Win32SS] - Cleanup error codes for Classes and Menus. - Update (Sync/Port) User32:Dialog to Wine Staging 1.9.11, see CORE-11368. - Now pass exactly the same tests as windows, except for the two ToDos lines 1596 & 1617. The other test failures are on wine for not being compatible! Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Tue Jul 12 18:23:04 2016 @@ -1283,11 +1283,7 @@ } else { - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); - } - else + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) { SetLastNtError(Status); } @@ -1362,7 +1358,6 @@ Link); if (Class == NULL) { - EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); return (RTL_ATOM)0; }else{TRACE("Step 4: 0x%p\n",Class );} @@ -1415,7 +1410,6 @@ ERR("Class \"%wZ\" not found\n", ClassName); } - EngSetLastError(ERROR_CANNOT_FIND_WND_CLASS); return NULL; } @@ -1539,6 +1533,7 @@ &Link); if (ClassAtom == (RTL_ATOM)0) { + EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); TRACE("UserUnregisterClass: No Class found.\n"); return FALSE; } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Tue Jul 12 18:23:04 2016 @@ -1921,6 +1921,7 @@ Class = IntGetAndReferenceClass(ClassName, Cs->hInstance, FALSE); if(!Class) { + EngSetLastError(ERROR_CANNOT_FIND_WND_CLASS); ERR("Failed to find class %wZ\n", ClassName); goto cleanup; } @@ -2856,6 +2857,7 @@ if (!IntGetAtomFromStringOrAtom(&ClassName, &ClassAtom)) { + EngSetLastError(ERROR_CANNOT_FIND_WND_CLASS); _SEH2_LEAVE; } } Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Tue Jul 12 18:23:04 2016 @@ -16,7 +16,7 @@ #define HAS_THINFRAME(Style, ExStyle) \ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) -#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && IntIsMenu(UlongToHandle(pWnd->IDMenu))) +#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && (pWnd->IDMenu) && IntIsMenu(UlongToHandle(pWnd->IDMenu))) #define IntIsDesktopWindow(WndObj) \ (WndObj->spwndParent == NULL) Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Tue Jul 12 18:23:04 2016 @@ -308,7 +308,7 @@ if (GET_WORD(p)) { - info->data = p + 1; + info->data = p; p += GET_WORD(p) / sizeof(WORD); } else info->data = NULL; @@ -931,7 +931,10 @@ { pos.x += MulDiv(template.x, xBaseUnit, 4); pos.y += MulDiv(template.y, yBaseUnit, 8); - if (!(template.style & (WS_CHILD|DS_ABSALIGN))) ClientToScreen( owner, &pos ); + // + // REACTOS : Need an owner to be passed!!! + // + if (!(template.style & (WS_CHILD|DS_ABSALIGN)) && owner ) ClientToScreen( owner, &pos ); } if ( !(template.style & WS_CHILD) ) { @@ -1067,6 +1070,7 @@ if (template.style & WS_VISIBLE && !(GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ + UpdateWindow( hwnd ); IntNotifyWinEvent(EVENT_SYSTEM_DIALOGSTART, hwnd, OBJID_WINDOW, CHILDID_SELF, 0); } return hwnd; @@ -1674,7 +1678,7 @@ BOOL result = FALSE; /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info( hDlg, TRUE ))) return 0; + if(!(dlgInfo = DIALOG_get_info( hDlg, Msg == WM_NCCREATE ))) return 0; SetWindowLongPtrW( hDlg, DWLP_MSGRESULT, 0 ); @@ -1734,7 +1738,7 @@ BOOL result = FALSE; /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info( hDlg, TRUE ))) return 0; + if(!(dlgInfo = DIALOG_get_info( hDlg, Msg == WM_NCCREATE ))) return 0; SetWindowLongPtrW( hDlg, DWLP_MSGRESULT, 0 );

8 years, 5 months

[akhaldi] 71903: [SCHTASKS] Import from Wine Staging 1.9.14. CORE-11576

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 15:35:42 2016 New Revision: 71903 URL: http://svn.reactos.org/svn/reactos?rev=71903&view=rev Log: [SCHTASKS] Import from Wine Staging 1.9.14. CORE-11576 Added: trunk/reactos/base/applications/cmdutils/schtasks/ trunk/reactos/base/applications/cmdutils/schtasks/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/schtasks/schtasks.c (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Jul 12 15:35:42 2016 @@ -10,6 +10,7 @@ add_subdirectory(mode) add_subdirectory(more) add_subdirectory(reg) +add_subdirectory(schtasks) add_subdirectory(sort) add_subdirectory(taskkill) add_subdirectory(tree) Added: trunk/reactos/base/applications/cmdutils/schtasks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/schtasks/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/schtasks/CMakeLists.txt [iso-8859-1] Tue Jul 12 15:35:42 2016 @@ -0,0 +1,6 @@ + +add_executable(schtasks schtasks.c) +target_link_libraries(schtasks wine) +set_module_type(schtasks win32cui UNICODE) +add_importlibs(schtasks msvcrt kernel32 ntdll) +add_cd_file(TARGET schtasks DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/schtasks/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/schtasks/schtasks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/schtasks/schtasks.c (added) +++ trunk/reactos/base/applications/cmdutils/schtasks/schtasks.c [iso-8859-1] Tue Jul 12 15:35:42 2016 @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schtasks); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} Propchange: trunk/reactos/base/applications/cmdutils/schtasks/schtasks.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jul 12 15:35:42 2016 @@ -231,6 +231,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.11 +reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.11

8 years, 5 months

[akhaldi] 71902: [UXTHEME_WINETEST] Sync with Wine Staging 1.9.14.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 11:13:34 2016 New Revision: 71902 URL: http://svn.reactos.org/svn/reactos?rev=71902&view=rev Log: [UXTHEME_WINETEST] Sync with Wine Staging 1.9.14. Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt trunk/rostests/winetests/uxtheme/system.c Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/CMakeLi… ============================================================================== --- trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] Tue Jul 12 11:13:34 2016 @@ -1,5 +1,5 @@ add_executable(uxtheme_winetest system.c testlist.c) set_module_type(uxtheme_winetest win32cui) -add_importlibs(uxtheme_winetest user32 msvcrt kernel32) +add_importlibs(uxtheme_winetest uxtheme user32 msvcrt kernel32) add_cd_file(TARGET uxtheme_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/system.… ============================================================================== --- trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] Tue Jul 12 11:13:34 2016 @@ -26,53 +26,14 @@ #include "wine/test.h" -static HRESULT (WINAPI * pCloseThemeData)(HTHEME); -static HRESULT (WINAPI * pGetCurrentThemeName)(LPWSTR, int, LPWSTR, int, LPWSTR, int); -static HTHEME (WINAPI * pGetWindowTheme)(HWND); -static BOOL (WINAPI * pIsAppThemed)(VOID); -static BOOL (WINAPI * pIsThemeActive)(VOID); -static BOOL (WINAPI * pIsThemePartDefined)(HTHEME, int, int); -static HTHEME (WINAPI * pOpenThemeData)(HWND, LPCWSTR); static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); -static HRESULT (WINAPI * pSetWindowTheme)(HWND, LPCWSTR, LPCWSTR); - -static HMODULE hUxtheme = 0; #define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func); -static BOOL InitFunctionPtrs(void) -{ - hUxtheme = LoadLibraryA("uxtheme.dll"); - if(!hUxtheme) { - trace("Could not load uxtheme.dll\n"); - return FALSE; - } - if (hUxtheme) - { - UXTHEME_GET_PROC(CloseThemeData) - UXTHEME_GET_PROC(GetCurrentThemeName) - UXTHEME_GET_PROC(GetWindowTheme) - UXTHEME_GET_PROC(IsAppThemed) - UXTHEME_GET_PROC(IsThemeActive) - UXTHEME_GET_PROC(IsThemePartDefined) - UXTHEME_GET_PROC(OpenThemeData) - UXTHEME_GET_PROC(OpenThemeDataEx) - UXTHEME_GET_PROC(SetWindowTheme) - } - /* The following functions should be available, if not return FALSE. The Vista functions will - * be checked (at some point in time) within the single tests if needed. All used functions for - * now are present on WinXP, W2K3 and Wine. - */ - if (!pCloseThemeData || !pGetCurrentThemeName || - !pGetWindowTheme || !pIsAppThemed || - !pIsThemeActive || !pIsThemePartDefined || - !pOpenThemeData || !pSetWindowTheme) - { - FreeLibrary(hUxtheme); - return FALSE; - } - - return TRUE; +static void init_funcs(void) +{ + HMODULE hUxtheme = GetModuleHandleA("uxtheme.dll"); + UXTHEME_GET_PROC(OpenThemeDataEx) } static void test_IsThemed(void) @@ -81,14 +42,14 @@ BOOL bAppThemed; BOOL bTPDefined; - bThemeActive = pIsThemeActive(); + bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); - bAppThemed = pIsAppThemed(); + bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); SetLastError(0xdeadbeef); - bTPDefined = pIsThemePartDefined(NULL, 0 , 0); + bTPDefined = IsThemePartDefined(NULL, 0 , 0); ok( bTPDefined == FALSE, "Expected FALSE\n"); ok( GetLastError() == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", @@ -102,7 +63,7 @@ BOOL bDestroyed; SetLastError(0xdeadbeef); - hTheme = pGetWindowTheme(NULL); + hTheme = GetWindowTheme(NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); todo_wine ok( GetLastError() == E_HANDLE, @@ -114,7 +75,7 @@ if (!hWnd) return; SetLastError(0xdeadbeef); - hTheme = pGetWindowTheme(hWnd); + hTheme = GetWindowTheme(hWnd); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08x\n", @@ -132,7 +93,7 @@ HWND hWnd; BOOL bDestroyed; - hRes = pSetWindowTheme(NULL, NULL, NULL); + hRes = SetWindowTheme(NULL, NULL, NULL); todo_wine ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); @@ -140,7 +101,7 @@ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); if (!hWnd) return; - hRes = pSetWindowTheme(hWnd, NULL, NULL); + hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); bDestroyed = DestroyWindow(hWnd); @@ -163,11 +124,11 @@ WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; - bThemeActive = pIsThemeActive(); + bThemeActive = IsThemeActive(); /* All NULL */ SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(NULL, NULL); + hTheme = OpenThemeData(NULL, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", @@ -175,7 +136,7 @@ /* A NULL hWnd and an invalid classlist */ SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(NULL, szInvalidClassList); + hTheme = OpenThemeData(NULL, szInvalidClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); todo_wine ok( GetLastError() == E_PROP_ID_UNSUPPORTED, @@ -183,7 +144,7 @@ GetLastError()); SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(NULL, szClassList); + hTheme = OpenThemeData(NULL, szClassList); if (bThemeActive) { ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); @@ -206,14 +167,14 @@ if (!hWnd) return; SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, NULL); + hTheme = OpenThemeData(hWnd, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, szInvalidClassList); + hTheme = OpenThemeData(hWnd, szInvalidClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); todo_wine ok( GetLastError() == E_PROP_ID_UNSUPPORTED, @@ -223,7 +184,7 @@ if (!bThemeActive) { SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, szButtonClassList); + hTheme = OpenThemeData(hWnd, szButtonClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); todo_wine ok( GetLastError() == E_PROP_ID_UNSUPPORTED, @@ -236,7 +197,7 @@ /* Only do the next checks if we have an active theme */ SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, szButtonClassList); + hTheme = OpenThemeData(hWnd, szButtonClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); todo_wine ok( GetLastError() == ERROR_SUCCESS, @@ -245,15 +206,15 @@ /* Test with bUtToN instead of Button */ SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, szButtonClassList2); - ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - - SetLastError(0xdeadbeef); - hTheme = pOpenThemeData(hWnd, szClassList); + hTheme = OpenThemeData(hWnd, szButtonClassList2); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = OpenThemeData(hWnd, szClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); todo_wine ok( GetLastError() == ERROR_SUCCESS, @@ -262,24 +223,24 @@ /* GetWindowTheme should return the last handle opened by OpenThemeData */ SetLastError(0xdeadbeef); - hTheme2 = pGetWindowTheme(hWnd); + hTheme2 = GetWindowTheme(hWnd); ok( hTheme == hTheme2, "Expected the same HTHEME handle (%p<->%p)\n", hTheme, hTheme2); ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - hRes = pCloseThemeData(hTheme); + hRes = CloseThemeData(hTheme); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); /* Close a second time */ - hRes = pCloseThemeData(hTheme); + hRes = CloseThemeData(hTheme); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); /* See if closing makes a difference for GetWindowTheme */ SetLastError(0xdeadbeef); hTheme2 = NULL; - hTheme2 = pGetWindowTheme(hWnd); + hTheme2 = GetWindowTheme(hWnd); ok( hTheme == hTheme2, "Expected the same HTHEME handle (%p<->%p)\n", hTheme, hTheme2); ok( GetLastError() == 0xdeadbeef, @@ -287,7 +248,7 @@ GetLastError()); SetLastError(0xdeadbeef); - bTPDefined = pIsThemePartDefined(hTheme, 0 , 0); + bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine { ok( bTPDefined == FALSE, "Expected FALSE\n"); @@ -320,7 +281,7 @@ return; } - bThemeActive = pIsThemeActive(); + bThemeActive = IsThemeActive(); /* All NULL */ SetLastError(0xdeadbeef); @@ -455,23 +416,23 @@ WCHAR currentColor[MAX_PATH]; WCHAR currentSize[MAX_PATH]; - bThemeActive = pIsThemeActive(); + bThemeActive = IsThemeActive(); /* All NULLs */ - hRes = pGetCurrentThemeName(NULL, 0, NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(NULL, 0, NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Number of characters given is 0 */ - hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine ok(hRes == E_NOT_SUFFICIENT_BUFFER || @@ -481,7 +442,7 @@ ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The same is true if the number of characters is too small for Color and/or Size */ - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, 2, currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) @@ -493,14 +454,14 @@ ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Given number of characters is correct */ - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Given number of characters for the theme name is too large */ - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == E_POINTER || hRes == S_OK, "Expected E_POINTER or S_OK, got 0x%08x\n", hRes); else @@ -509,7 +470,7 @@ "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The too large case is only for the theme name, not for color name or size name */ - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentTheme), currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) @@ -517,7 +478,7 @@ else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentTheme) / sizeof(WCHAR), currentSize, sizeof(currentSize)); if (bThemeActive) @@ -526,7 +487,7 @@ ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Correct call */ - hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentColor) / sizeof(WCHAR), currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) @@ -539,14 +500,15 @@ { HRESULT hRes; - hRes = pCloseThemeData(NULL); + hRes = CloseThemeData(NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = CloseThemeData(INVALID_HANDLE_VALUE); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } START_TEST(system) { - if(!InitFunctionPtrs()) - return; + init_funcs(); /* No real functional tests will be done (yet). The current tests * only show input/return behaviour @@ -579,6 +541,4 @@ /* CloseThemeData */ trace("Starting test_CloseThemeData()\n"); test_CloseThemeData(); - - FreeLibrary(hUxtheme); -} +}

8 years, 5 months

[akhaldi] 71901: [UXTHEME] Apply Wine commit 997e204 by Louis Lenders: Fix CloseThemeData with invalid handle value. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 11:12:58 2016 New Revision: 71901 URL: http://svn.reactos.org/svn/reactos?rev=71901&view=rev Log: [UXTHEME] Apply Wine commit 997e204 by Louis Lenders: Fix CloseThemeData with invalid handle value. CORE-11368 Modified: trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Tue Jul 12 11:12:58 2016 @@ -878,7 +878,7 @@ HRESULT WINAPI CloseThemeData(HTHEME hTheme) { TRACE("(%p)\n", hTheme); - if(!hTheme) + if(!hTheme || hTheme == INVALID_HANDLE_VALUE) return E_HANDLE; return MSSTYLES_CloseThemeClass(hTheme); }

8 years, 5 months

[akhaldi] 71900: [SHELL32_WINETEST] Sync with Wine Staging 1.9.14.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 10:49:51 2016 New Revision: 71900 URL: http://svn.reactos.org/svn/reactos?rev=71900&view=rev Log: [SHELL32_WINETEST] Sync with Wine Staging 1.9.14. Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/brsfolder.c trunk/rostests/winetests/shell32/ebrowser.c trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… ============================================================================== --- trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] Tue Jul 12 10:49:51 2016 @@ -196,9 +196,8 @@ #define test_window_rects(a, b) \ ok(!IntersectRect(&rc, &windows[a].allocated_rect, &windows[b].allocated_rect), \ - "rectangles intersect (%i,%i,%i,%i)/(%i,%i,%i,%i)\n", \ - windows[a].allocated_rect.left, windows[a].allocated_rect.top, windows[a].allocated_rect.right, windows[a].allocated_rect.bottom, \ - windows[b].allocated_rect.left, windows[b].allocated_rect.top, windows[b].allocated_rect.right, windows[b].allocated_rect.bottom) + "rectangles intersect %s / %s\n", wine_dbgstr_rect(&windows[a].allocated_rect), \ + wine_dbgstr_rect(&windows[b].allocated_rect)) static void test_setpos(void) { Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… ============================================================================== --- trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] Tue Jul 12 10:49:51 2016 @@ -104,31 +104,36 @@ { IQueryAssociations *assoc; HRESULT hr; - WCHAR *buffer; + WCHAR *buffer = NULL; DWORD len; hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok_(__FILE__, line)(hr == S_OK, "failed to create IQueryAssociations, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, assocName, progIdKey, NULL); ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); - if (hr != S_FALSE) { - if (expected_string) { - ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); - } else { - ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); + if (expected_string) { + ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); + if (hr != S_FALSE) { + /* don't try to allocate memory using uninitialized len */ + IQueryAssociations_Release(assoc); + return; } - } - - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); - - if (expected_string) { + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%x, expected S_OK\n", hr); + ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); - } + } else { + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); + } + + IQueryAssociations_Release(assoc); + HeapFree(GetProcessHeap(), 0, buffer); } static void test_IQueryAssociations_GetString(void) @@ -176,17 +181,18 @@ getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + RegDeleteKeyW(test_progid_key, DefaultIconW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); - RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(len > 0, "got wrong needed length, %d\n", len); @@ -195,7 +201,7 @@ WCHAR buffW[MAX_PATH]; DWORD len; - hr = IQueryAssociations_Init(assoc, 0, ptr->key, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, ptr->key, NULL, NULL); ok(hr == S_OK, "%d: Init failed, 0x%x\n", i, hr); len = ptr->len; @@ -232,17 +238,17 @@ hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, NULL, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, badW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, badW, NULL, NULL); ok(hr == S_OK || broken(hr == S_FALSE) /* pre-vista */, "Init failed, 0x%08x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || broken(hr == E_FAIL) /* pre-vista */, "got 0x%08x\n", hr); IQueryAssociations_Release(assoc); Modified: trunk/rostests/winetests/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/brsfold… ============================================================================== --- trunk/rostests/winetests/shell32/brsfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/brsfolder.c [iso-8859-1] Tue Jul 12 10:49:51 2016 @@ -248,10 +248,8 @@ shfileop.fFlags = FOF_NOCONFIRMATION|FOF_NOERRORUI|FOF_SILENT; SHFileOperationA(&shfileop); - if (pidl) - CoTaskMemFree(pidl); - if (test_folder_pidl) - CoTaskMemFree(test_folder_pidl); + CoTaskMemFree(pidl); + CoTaskMemFree(test_folder_pidl); test_folder_object->lpVtbl->Release(test_folder_object); CoUninitialize(); @@ -346,16 +344,12 @@ /* test without flags */ bi.ulFlags = 0; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); /* test with flag */ bi.ulFlags = BIF_NEWDIALOGSTYLE; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); IShellFolder_Release(desktop_object); Modified: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… ============================================================================== --- trunk/rostests/winetests/shell32/ebrowser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/ebrowser.c [iso-8859-1] Tue Jul 12 10:49:51 2016 @@ -818,8 +818,7 @@ ok(hr == S_OK, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); - ok(EqualRect(&eb_rc, &exp_rc), "Got client rect (%d, %d)-(%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got client rect %s\n", wine_dbgstr_rect(&eb_rc)); GetWindowRect(eb_hwnd, &eb_rc); ok(eb_rc.right - eb_rc.left == 50, "Got window width %d\n", eb_rc.right - eb_rc.left); @@ -1142,8 +1141,7 @@ GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); /* Try resizing with invalid hdwp */ rc.bottom = 25; @@ -1152,16 +1150,14 @@ ok(hr == E_FAIL, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); hdwp = NULL; hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); ok(hr == S_OK, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc2), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc2), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); IShellBrowser_Release(psb); } Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Tue Jul 12 10:49:51 2016 @@ -3088,7 +3088,7 @@ punkimpl->ifaces = ifaces; punkimpl->unknown = 0; - hres = pSHGetIDListFromObject((IUnknown*)punkimpl, &pidl); + hres = pSHGetIDListFromObject(&punkimpl->IUnknown_iface, &pidl); ok(hres == E_NOINTERFACE, "Got %x\n", hres); ok(ifaces[0].count, "interface not requested.\n"); ok(ifaces[1].count, "interface not requested.\n"); @@ -3260,7 +3260,7 @@ punkimpl->unknown = 0; /* The same as SHGetIDListFromObject */ - hres = pSHGetIDListFromObject((IUnknown*)punkimpl, &pidl); + hres = pSHGetIDListFromObject(&punkimpl->IUnknown_iface, &pidl); ok(hres == E_NOINTERFACE, "Got %x\n", hres); ok(ifaces[0].count, "interface not requested.\n"); ok(ifaces[1].count, "interface not requested.\n");

8 years, 5 months

[akhaldi] 71899: [PSDK] Add some missing ASSOCF_* enum elements.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 10:46:22 2016 New Revision: 71899 URL: http://svn.reactos.org/svn/reactos?rev=71899&view=rev Log: [PSDK] Add some missing ASSOCF_* enum elements. Modified: trunk/reactos/sdk/include/psdk/shlwapi.h Modified: trunk/reactos/sdk/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlwapi.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlwapi.h [iso-8859-1] Tue Jul 12 10:46:22 2016 @@ -578,18 +578,22 @@ /* IQueryAssociation and helpers */ enum { - ASSOCF_INIT_NOREMAPCLSID = 0x001, /* Don't map clsid->progid */ - ASSOCF_INIT_BYEXENAME = 0x002, /* .exe name given */ - ASSOCF_OPEN_BYEXENAME = 0x002, /* Synonym */ - ASSOCF_INIT_DEFAULTTOSTAR = 0x004, /* Use * as base */ - ASSOCF_INIT_DEFAULTTOFOLDER = 0x008, /* Use folder as base */ - ASSOCF_NOUSERSETTINGS = 0x010, /* No HKCU reads */ - ASSOCF_NOTRUNCATE = 0x020, /* Don't truncate return */ - ASSOCF_VERIFY = 0x040, /* Verify data */ - ASSOCF_REMAPRUNDLL = 0x080, /* Get rundll args */ - ASSOCF_NOFIXUPS = 0x100, /* Don't fixup errors */ - ASSOCF_IGNOREBASECLASS = 0x200, /* Don't read baseclass */ - ASSOCF_INIT_IGNOREUNKNOWN = 0x400, /* Fail for unknown progid */ + ASSOCF_NONE = 0x0000, + ASSOCF_INIT_NOREMAPCLSID = 0x0001, /* Don't map clsid->progid */ + ASSOCF_INIT_BYEXENAME = 0x0002, /* .exe name given */ + ASSOCF_OPEN_BYEXENAME = 0x0002, /* Synonym */ + ASSOCF_INIT_DEFAULTTOSTAR = 0x0004, /* Use * as base */ + ASSOCF_INIT_DEFAULTTOFOLDER = 0x0008, /* Use folder as base */ + ASSOCF_NOUSERSETTINGS = 0x0010, /* No HKCU reads */ + ASSOCF_NOTRUNCATE = 0x0020, /* Don't truncate return */ + ASSOCF_VERIFY = 0x0040, /* Verify data */ + ASSOCF_REMAPRUNDLL = 0x0080, /* Get rundll args */ + ASSOCF_NOFIXUPS = 0x0100, /* Don't fixup errors */ + ASSOCF_IGNOREBASECLASS = 0x0200, /* Don't read baseclass */ + ASSOCF_INIT_IGNOREUNKNOWN = 0x0400, /* Fail for unknown progid */ + ASSOCF_INIT_FIXED_PROGID = 0x0800, /* Used passed string as progid, don't try to map it */ + ASSOCF_IS_PROTOCOL = 0x1000, /* Treat as protocol, that should be mapped */ + ASSOCF_INIT_FOR_FILE = 0x2000, /* progid is for file extension association */ }; typedef DWORD ASSOCF;

8 years, 5 months

[akhaldi] 71898: [ADVAPI32_WINETEST] Sync with Wine Staging 1.9.14.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 12 10:38:36 2016 New Revision: 71898 URL: http://svn.reactos.org/svn/reactos?rev=71898&view=rev Log: [ADVAPI32_WINETEST] Sync with Wine Staging 1.9.14. Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Jul 12 10:38:36 2016 @@ -3844,8 +3844,9 @@ char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; - PSID system_sid = (PSID) system_ptr, user_sid; + PSID system_sid = (PSID) system_ptr, user_sid, localsys_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; int users_ace_id = -1, admins_ace_id = -1, i; @@ -4149,10 +4150,15 @@ NULL, NULL, NULL, NULL, &pSD); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + bret = AllocateAndInitializeSid(&SIDAuthNT, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &localsys_sid); + ok(bret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID (%s) != Administrators SID (%s).\n", debugstr_sid(owner), debugstr_sid(admin_sid)); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, localsys_sid), + "MACHINE\\Software owner SID (%s) != Administrators SID (%s) or Local System Sid (%s).\n", + debugstr_sid(owner), debugstr_sid(admin_sid), debugstr_sid(localsys_sid)); bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); @@ -4208,11 +4214,14 @@ flags = ((ACE_HEADER *)ace)->AceFlags; ok(flags == 0x0 || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ - || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)), /* win7 */ + || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) /* win7 */ + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)), /* win8+ */ "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS); } + + FreeSid(localsys_sid); LocalFree(pSD); }

8 years, 5 months

[tthompson] 71897: [NTFS] Add error-checking to InternalGetNextAttribute(); don't crash if CurrAttr->Length is invalid.

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 12 09:57:16 2016 New Revision: 71897 URL: http://svn.reactos.org/svn/reactos?rev=71897&view=rev Log: [NTFS] Add error-checking to InternalGetNextAttribute(); don't crash if CurrAttr->Length is invalid. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 12 09:57:16 2016 @@ -181,6 +181,14 @@ } NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + + if (NextAttribute > Context->LastAttr || NextAttribute < Context->FirstAttr) + { + DPRINT1("Broken length: 0x%lx!\n", Context->CurrAttr->Length); + Context->CurrAttr = (PVOID)-1; + return NULL; + } + Context->Offset += ((ULONG_PTR)NextAttribute - (ULONG_PTR)Context->CurrAttr); Context->CurrAttr = NextAttribute;

8 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016