Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 65002: [DDK]: VDD IO handlers are WINAPI and not something undefined (CDECL ... ?). Double-checked by V.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 26 01:28:32 2014 New Revision: 65002 URL: http://svn.reactos.org/svn/reactos?rev=65002&view=rev Log: [DDK]: VDD IO handlers are WINAPI and not something undefined (CDECL ... ?). Double-checked by V. Modified: trunk/reactos/include/ddk/nt_vdd.h Modified: trunk/reactos/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/nt_vdd.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] Sun Oct 26 01:28:32 2014 @@ -45,14 +45,14 @@ * I/O Port services */ -typedef VOID (*PFNVDD_INB) (WORD iport, PBYTE data); -typedef VOID (*PFNVDD_INW) (WORD iport, PWORD data); -typedef VOID (*PFNVDD_INSB) (WORD iport, PBYTE data, WORD count); -typedef VOID (*PFNVDD_INSW) (WORD iport, PWORD data, WORD count); -typedef VOID (*PFNVDD_OUTB) (WORD iport, BYTE data); -typedef VOID (*PFNVDD_OUTW) (WORD iport, WORD data); -typedef VOID (*PFNVDD_OUTSB) (WORD iport, PBYTE data, WORD count); -typedef VOID (*PFNVDD_OUTSW) (WORD iport, PWORD data, WORD count); +typedef VOID (WINAPI *PFNVDD_INB) (WORD iport, PBYTE data); +typedef VOID (WINAPI *PFNVDD_INW) (WORD iport, PWORD data); +typedef VOID (WINAPI *PFNVDD_INSB) (WORD iport, PBYTE data, WORD count); +typedef VOID (WINAPI *PFNVDD_INSW) (WORD iport, PWORD data, WORD count); +typedef VOID (WINAPI *PFNVDD_OUTB) (WORD iport, BYTE data); +typedef VOID (WINAPI *PFNVDD_OUTW) (WORD iport, WORD data); +typedef VOID (WINAPI *PFNVDD_OUTSB) (WORD iport, PBYTE data, WORD count); +typedef VOID (WINAPI *PFNVDD_OUTSW) (WORD iport, PWORD data, WORD count); typedef struct _VDD_IO_HANDLERS {

9 years, 10 months

[gadamopoulos] 65001: [user32] - Properly notify the theme engine that the caption needs to be repainted on WM_SETICON - Fixes a classic frame appearing when themes are enabled and we navigate to a...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Oct 26 00:58:52 2014 New Revision: 65001 URL: http://svn.reactos.org/svn/reactos?rev=65001&view=rev Log: [user32] - Properly notify the theme engine that the caption needs to be repainted on WM_SETICON - Fixes a classic frame appearing when themes are enabled and we navigate to a different folder Modified: branches/shell-experiments/win32ss/user/user32/windows/defwnd.c Modified: branches/shell-experiments/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Oct 26 00:58:52 2014 @@ -447,6 +447,27 @@ return TRUE; } +static void +UserPaintCaption(HWND hwnd) +{ + /* FIXME: this is not 100% correct */ + + /* + * When themes are not enabled we can go on and paint the non client area. + * However if we do that with themes enabled we will draw a classic frame. + * This is sovled by sending a themes specific message to notify the themes + * engine that the caption needs to be redrawn + */ + if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) + { + SendMessage(hwnd, WM_NCUAHDRAWCAPTION,0,0); + } + else + { + DefWndNCPaint(hwnd, HRGN_WINDOW, -1); + } +} + // WM_SETICON LRESULT FASTCALL DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) @@ -481,7 +502,7 @@ NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) - DefWndNCPaint(UserHMGetHandle(pWnd), HRGN_WINDOW, -1); /* Repaint caption */ + UserPaintCaption(UserHMGetHandle(pWnd)); /* Repaint caption */ return (LRESULT)hIconOld; } @@ -1454,17 +1475,7 @@ DefSetText(hWnd, (PCWSTR)lParam, TRUE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - /* FIXME: this is not 100% correct */ - if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) - { - SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0); - } - else - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - } + UserPaintCaption(hWnd); Result = 1; break; } @@ -1626,17 +1637,7 @@ DefSetText(hWnd, (PCWSTR)lParam, FALSE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - /* FIXME: this is not 100% correct */ - if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) - { - SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0); - } - else - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - } + UserPaintCaption(hWnd); Result = 1; break; }

9 years, 10 months

[akhaldi] 65000: [ADVAPI32] * Update OpenThreadToken(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 22:37:02 2014 New Revision: 65000 URL: http://svn.reactos.org/svn/reactos?rev=65000&view=rev Log: [ADVAPI32] * Update OpenThreadToken(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Oct 25 22:37:02 2014 @@ -364,28 +364,29 @@ return TRUE; } -/* - * @implemented +/****************************************************************************** + * OpenThreadToken [ADVAPI32.@] + * + * Opens the access token associated with a thread handle. + * + * PARAMS + * ThreadHandle [I] Handle to process + * DesiredAccess [I] Desired access to the thread + * OpenAsSelf [I] ??? + * TokenHandle [O] Destination for the token handle + * + * RETURNS + * Success: TRUE. TokenHandle contains the access token. + * Failure: FALSE. + * + * NOTES + * See NtOpenThreadToken. */ BOOL WINAPI -OpenThreadToken(HANDLE ThreadHandle, - DWORD DesiredAccess, - BOOL OpenAsSelf, - PHANDLE TokenHandle) -{ - NTSTATUS Status; - - Status = NtOpenThreadToken(ThreadHandle, - DesiredAccess, - OpenAsSelf, - TokenHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +OpenThreadToken( HANDLE ThreadHandle, DWORD DesiredAccess, + BOOL OpenAsSelf, HANDLE *TokenHandle) +{ + return set_ntstatus( NtOpenThreadToken(ThreadHandle, DesiredAccess, OpenAsSelf, TokenHandle)); } /*

9 years, 10 months

[jimtabor] 64999: [NtUser] - Do not block sending messages from a dying thread. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 25 22:06:13 2014 New Revision: 64999 URL: http://svn.reactos.org/svn/reactos?rev=64999&view=rev Log: [NtUser] - Do not block sending messages from a dying thread. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Oct 25 22:06:13 2014 @@ -973,8 +973,15 @@ /* Don't send from or to a dying thread */ if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) { + // Unless we are dying and need to tell our parents. + if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) + { + // Parent notify is the big one. Fire and forget! + TRACE("Send message from dying thread %d\n",Msg); + co_MsqSendMessageAsync(ptirec, Wnd, Msg, wParam, lParam, NULL, 0, FALSE, HookMessage); + } if (uResult) *uResult = -1; - ERR("MsqSM: Current pti %lu or Rec pti %lu\n", pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); + TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); return STATUS_UNSUCCESSFUL; }

9 years, 10 months

[ekohl] 64998: [NET] Implement and use console-aware print functions to print strings and resources.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 25 21:27:05 2014 New Revision: 64998 URL: http://svn.reactos.org/svn/reactos?rev=64998&view=rev Log: [NET] Implement and use console-aware print functions to print strings and resources. Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/cmdHelpMsg.c trunk/reactos/base/applications/network/net/cmdLocalGroup.c trunk/reactos/base/applications/network/net/cmdStart.c trunk/reactos/base/applications/network/net/cmdUser.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -48,7 +48,7 @@ if (_wcsicmp(argv[i], L"/domain") == 0) { - printf("The /DOMAIN option is not supported yet!\n"); + PrintToConsole(L"The /DOMAIN option is not supported yet!\n"); #if 0 Domain = TRUE; #endif @@ -74,7 +74,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - printf("You entered an invalid value for the /FORCELOGOFF option.\n"); + PrintToConsole(L"You entered an invalid value for the /FORCELOGOFF option.\n"); result = 1; goto done; } @@ -89,7 +89,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - printf("You entered an invalid value for the /MINPWLEN option.\n"); + PrintToConsole(L"You entered an invalid value for the /MINPWLEN option.\n"); result = 1; goto done; } @@ -111,7 +111,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - printf("You entered an invalid value for the /MAXPWAGE option.\n"); + PrintToConsole(L"You entered an invalid value for the /MAXPWAGE option.\n"); result = 1; goto done; } @@ -126,7 +126,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - printf("You entered an invalid value for the /MINPWAGE option.\n"); + PrintToConsole(L"You entered an invalid value for the /MINPWAGE option.\n"); result = 1; goto done; } @@ -140,7 +140,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - printf("You entered an invalid value for the /UNIQUEPW option.\n"); + PrintToConsole(L"You entered an invalid value for the /UNIQUEPW option.\n"); result = 1; goto done; } @@ -168,51 +168,51 @@ RtlGetNtProductType(&ProductType); - printf("Force logoff after: "); + PrintToConsole(L"Force logoff after: "); if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER) - printf("Never\n"); - else - printf("%lu seconds\n", Info0->usrmod0_force_logoff); - - printf("Minimum password age (in days): %lu\n", Info0->usrmod0_min_passwd_age / 86400); - printf("Maximum password age (in days): %lu\n", Info0->usrmod0_max_passwd_age / 86400); - printf("Minimum password length: %lu\n", Info0->usrmod0_min_passwd_len); - - printf("Password history length: "); + PrintToConsole(L"Never\n"); + else + PrintToConsole(L"%lu seconds\n", Info0->usrmod0_force_logoff); + + PrintToConsole(L"Minimum password age (in days): %lu\n", Info0->usrmod0_min_passwd_age / 86400); + PrintToConsole(L"Maximum password age (in days): %lu\n", Info0->usrmod0_max_passwd_age / 86400); + PrintToConsole(L"Minimum password length: %lu\n", Info0->usrmod0_min_passwd_len); + + PrintToConsole(L"Password history length: "); if (Info0->usrmod0_password_hist_len == 0) - printf("None\n"); - else - printf("%lu\n", Info0->usrmod0_password_hist_len); - - printf("Lockout threshold: "); + PrintToConsole(L"None\n"); + else + PrintToConsole(L"%lu\n", Info0->usrmod0_password_hist_len); + + PrintToConsole(L"Lockout threshold: "); if (Info3->usrmod3_lockout_threshold == 0) - printf("Never\n"); - else - printf("%lu\n", Info3->usrmod3_lockout_threshold); - - printf("Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); - printf("Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); - - printf("Computer role: "); + PrintToConsole(L"Never\n"); + else + PrintToConsole(L"%lu\n", Info3->usrmod3_lockout_threshold); + + PrintToConsole(L"Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); + PrintToConsole(L"Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); + + PrintToConsole(L"Computer role: "); if (Info1->usrmod1_role == UAS_ROLE_PRIMARY) { if (ProductType == NtProductLanManNt) { - printf("Primary server\n"); + PrintToConsole(L"Primary server\n"); } else if (ProductType == NtProductServer) { - printf("Standalone server\n"); + PrintToConsole(L"Standalone server\n"); } else { - printf("Workstation\n"); - } - } - else - { - printf("Backup server\n"); + PrintToConsole(L"Workstation\n"); + } + } + else + { + PrintToConsole(L"Backup server\n"); } } Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -49,12 +49,12 @@ 0, NULL)) { - printf("\n%S\n", lpBuffer); + PrintToConsole(L"\n%s\n", lpBuffer); LocalFree(lpBuffer); } else { - printf("Unrecognized error code: %ld\n", errNum); + PrintToConsole(L"Unrecognized error code: %ld\n", errNum); } return 0; Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -38,8 +38,8 @@ if (Status != NERR_Success) return Status; - printf("\nAliases for \\\\%S\n\n", pServer->sv100_name); - printf("------------------------------------------\n"); + PrintToConsole(L"\nAliases for \\\\%s\n\n", pServer->sv100_name); + PrintToConsole(L"------------------------------------------\n"); NetApiBufferFree(pServer); @@ -58,12 +58,10 @@ sizeof(PLOCALGROUP_INFO_0), CompareInfo); -// printf("dwRead: %lu dwTotal: %lu\n", dwRead, dwTotal); for (i = 0; i < dwRead; i++) { -// printf("%p\n", pBuffer[i].lgrpi0_name); if (pBuffer[i].lgrpi0_name) - printf("*%S\n", pBuffer[i].lgrpi0_name); + PrintToConsole(L"*%s\n", pBuffer[i].lgrpi0_name); } NetApiBufferFree(pBuffer); @@ -129,17 +127,17 @@ pNames[i] = pMembers[i].lgrmi3_domainandname; } - printf("Alias name %S\n", pGroupInfo->lgrpi1_name); - printf("Comment %S\n", pGroupInfo->lgrpi1_comment); - printf("\n"); - printf("Members\n"); - printf("\n"); - printf("------------------------------------------\n"); + PrintToConsole(L"Alias name %s\n", pGroupInfo->lgrpi1_name); + PrintToConsole(L"Comment %s\n", pGroupInfo->lgrpi1_comment); + PrintToConsole(L"\n"); + PrintToConsole(L"Members\n"); + PrintToConsole(L"\n"); + PrintToConsole(L"------------------------------------------\n"); for (i = 0; i < dwRead; i++) { - if (pNames[i]) - printf("%S\n", pNames[i]); + if (pNames[i]) + PrintToConsole(L"%s\n", pNames[i]); } done: Modified: trunk/reactos/base/applications/network/net/cmdStart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdStart.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdStart.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -57,11 +57,11 @@ &dwServiceCount, &dwResumeHandle)) { - printf("The following services hav been started:\n\n"); + PrintToConsole(L"The following services hav been started:\n\n"); for (i = 0; i < dwServiceCount; i++) { - printf(" %S\n", lpServiceBuffer[i].lpDisplayName); + PrintToConsole(L" %s\n", lpServiceBuffer[i].lpDisplayName); } } Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -37,11 +37,11 @@ if (Status != NERR_Success) return Status; - printf("\nUser accounts for \\\\%S\n\n", pServer->sv100_name); + PrintToConsole(L"\nUser accounts for \\\\%s\n\n", pServer->sv100_name); NetApiBufferFree(pServer); - printf("------------------------------------------\n"); + PrintToConsole(L"------------------------------------------\n"); Status = NetUserEnum(NULL, 0, @@ -64,7 +64,7 @@ { // printf("%p\n", pBuffer[i].lgrpi0_name); if (pBuffer[i].usri0_name) - printf("%S\n", pBuffer[i].usri0_name); + PrintToConsole(L"%s\n", pBuffer[i].usri0_name); } NetApiBufferFree(pBuffer); @@ -102,7 +102,7 @@ TimeBuffer, 80); - printf("%S %S\n", DateBuffer, TimeBuffer); + PrintToConsole(L"%s %s\n", DateBuffer, TimeBuffer); } @@ -110,6 +110,7 @@ NET_API_STATUS DisplayUser(LPWSTR lpUserName) { + PUSER_MODALS_INFO_0 pUserModals = NULL; PUSER_INFO_4 pUserInfo = NULL; NET_API_STATUS Status; @@ -121,39 +122,56 @@ if (Status != NERR_Success) return Status; - printf("User name %S\n", pUserInfo->usri4_name); - printf("Full name %S\n", pUserInfo->usri4_full_name); - printf("Comment %S\n", pUserInfo->usri4_comment); - printf("User comment %S\n", pUserInfo->usri4_usr_comment); - printf("Country code %03ld ()\n", pUserInfo->usri4_country_code); - printf("Account active %S\n", (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT) ? L"Locked" : L"Yes")); - printf("Account expires "); + Status = NetUserModalsGet(NULL, + 0, + (LPBYTE*)&pUserModals); + if (Status != NERR_Success) + goto done; + + PrintToConsole(L"User name %s\n", pUserInfo->usri4_name); + PrintToConsole(L"Full name %s\n", pUserInfo->usri4_full_name); + PrintToConsole(L"Comment %s\n", pUserInfo->usri4_comment); + PrintToConsole(L"User comment %s\n", pUserInfo->usri4_usr_comment); + PrintToConsole(L"Country code %03ld ()\n", pUserInfo->usri4_country_code); + PrintToConsole(L"Account active %s\n", (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT) ? L"Locked" : L"Yes")); + PrintToConsole(L"Account expires "); if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER) - printf("Never\n"); + PrintToConsole(L"Never\n"); else PrintDateTime(pUserInfo->usri4_acct_expires); - printf("\n"); - printf("Password last set \n"); - printf("Password expires \n"); - printf("Password changeable \n"); - printf("Password required \n"); - printf("User may change password \n"); - printf("\n"); - printf("Workstation allowed %S\n", pUserInfo->usri4_workstations); - printf("Logon script %S\n", pUserInfo->usri4_script_path); - printf("User profile %S\n", pUserInfo->usri4_profile); - printf("Home directory %S\n", pUserInfo->usri4_home_dir); - printf("Last logon "); + PrintToConsole(L"\n"); + PrintToConsole(L"Password last set \n"); + + PrintToConsole(L"Password expires "); + if (pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER) + PrintToConsole(L"Never\n"); + else + PrintDateTime(pUserInfo->usri4_acct_expires); + + PrintToConsole(L"Password changeable \n"); + PrintToConsole(L"Password required \n"); + PrintToConsole(L"User may change password \n"); + + PrintToConsole(L"\n"); + PrintToConsole(L"Workstation allowed %s\n", pUserInfo->usri4_workstations); + PrintToConsole(L"Logon script %s\n", pUserInfo->usri4_script_path); + PrintToConsole(L"User profile %s\n", pUserInfo->usri4_profile); + PrintToConsole(L"Home directory %s\n", pUserInfo->usri4_home_dir); + PrintToConsole(L"Last logon "); if (pUserInfo->usri4_last_logon == 0) - printf("Never\n"); + PrintToConsole(L"Never\n"); else PrintDateTime(pUserInfo->usri4_last_logon); - printf("\n"); - printf("Logon hours allowed \n"); - printf("\n"); - printf("Local group memberships \n"); - printf("Global group memberships \n"); + PrintToConsole(L"\n"); + PrintToConsole(L"Logon hours allowed \n"); + PrintToConsole(L"\n"); + PrintToConsole(L"Local group memberships \n"); + PrintToConsole(L"Global group memberships \n"); + +done: + if (pUserModals != NULL) + NetApiBufferFree(pUserModals); if (pUserInfo != NULL) NetApiBufferFree(pUserInfo); Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -51,13 +51,70 @@ INT resID, ...) { - WCHAR szMsgBuf[MAX_BUFFER_SIZE]; + WCHAR szMsgBuffer[MAX_BUFFER_SIZE]; + WCHAR szOutBuffer[MAX_BUFFER_SIZE]; va_list arg_ptr; va_start(arg_ptr, resID); - LoadStringW(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); - vwprintf(szMsgBuf, arg_ptr); + LoadStringW(GetModuleHandle(NULL), resID, szMsgBuffer, MAX_BUFFER_SIZE); + _vsnwprintf(szOutBuffer, MAX_BUFFER_SIZE, szMsgBuffer, arg_ptr); va_end(arg_ptr); + + WriteToConsole(szOutBuffer); +} + + +VOID +PrintToConsole( + LPWSTR lpFormat, + ...) +{ + WCHAR szBuffer[MAX_BUFFER_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, lpFormat); + _vsnwprintf(szBuffer, MAX_BUFFER_SIZE, lpFormat, arg_ptr); + va_end(arg_ptr); + + WriteToConsole(szBuffer); +} + + +VOID +WriteToConsole( + LPWSTR lpString) +{ + CHAR szOemBuffer[MAX_BUFFER_SIZE * 2]; + HANDLE hOutput; + DWORD dwLength; + + dwLength = wcslen(lpString); + + hOutput = GetStdHandle(STD_OUTPUT_HANDLE); + if ((GetFileType(hOutput) & ~FILE_TYPE_REMOTE) == FILE_TYPE_CHAR) + { + WriteConsoleW(hOutput, + lpString, + dwLength, + &dwLength, + NULL); + } + else + { + dwLength = WideCharToMultiByte(CP_OEMCP, + 0, + lpString, + dwLength, + szOemBuffer, + MAX_BUFFER_SIZE * 2, + NULL, + NULL); + WriteFile(hOutput, + szOemBuffer, + dwLength, + &dwLength, + NULL); + } } Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sat Oct 25 21:27:05 2014 @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#include <wincon.h> #include <winuser.h> #include <winsvc.h> #include <stdio.h> @@ -29,6 +30,15 @@ INT resID, ...); +VOID +PrintToConsole( + LPWSTR lpFormat, + ...); + +VOID +WriteToConsole( + LPWSTR lpString); + VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv);

9 years, 10 months

[tkreuzer] 64997: [WIN32k] Stop ASSERTing, that we always have all the resources we need in IntCreateCompatibleBitmap

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 25 21:16:17 2014 New Revision: 64997 URL: http://svn.reactos.org/svn/reactos?rev=64997&view=rev Log: [WIN32k] Stop ASSERTing, that we always have all the resources we need in IntCreateCompatibleBitmap Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sat Oct 25 21:16:17 2014 @@ -239,6 +239,12 @@ Planes ? Planes : 1, Bpp ? Bpp : Dc->ppdev->gdiinfo.cBitsPixel, NULL); + if (Bmp == NULL) + { + DPRINT1("Failed to allocate a bitmap!\n"); + return NULL; + } + psurf = SURFACE_ShareLockSurface(Bmp); ASSERT(psurf);

9 years, 10 months

[akhaldi] 64996: * Sync up to trunk head (r64995).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 19:46:12 2014 New Revision: 64996 URL: http://svn.reactos.org/svn/reactos?rev=64996&view=rev Log: * Sync up to trunk head (r64995). Removed: branches/shell-experiments/base/applications/rapps/rapps/ants.txt branches/shell-experiments/base/applications/rapps/rapps/devcpp_mingw32.txt Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c branches/shell-experiments/base/applications/rapps/rapps/abyss.txt branches/shell-experiments/base/applications/rapps/rapps/alreader.txt branches/shell-experiments/base/applications/rapps/rapps/audiograbber.txt branches/shell-experiments/base/applications/rapps/rapps/bittorrent.txt branches/shell-experiments/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt branches/shell-experiments/base/applications/rapps/rapps/doublecommander.txt branches/shell-experiments/base/applications/rapps/rapps/firefox.txt branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt branches/shell-experiments/base/applications/rapps/rapps/irfanview.txt branches/shell-experiments/base/applications/rapps/rapps/irfanviewplugins.txt branches/shell-experiments/base/applications/rapps/rapps/lazaruside.txt branches/shell-experiments/base/applications/rapps/rapps/libreoffice.txt branches/shell-experiments/base/applications/rapps/rapps/miktex.txt branches/shell-experiments/base/applications/rapps/rapps/mirandaim.txt branches/shell-experiments/base/applications/rapps/rapps/mono2.txt branches/shell-experiments/base/applications/rapps/rapps/mpc.txt branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt branches/shell-experiments/base/applications/rapps/rapps/openttd.txt branches/shell-experiments/base/applications/rapps/rapps/peazip.txt branches/shell-experiments/base/applications/rapps/rapps/pspad.txt branches/shell-experiments/base/applications/rapps/rapps/python.txt branches/shell-experiments/base/applications/rapps/rapps/python2.txt branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt branches/shell-experiments/base/applications/rapps/rapps/scite.txt branches/shell-experiments/base/applications/rapps/rapps/seamonkey.txt branches/shell-experiments/base/applications/rapps/rapps/sumatrapdf.txt branches/shell-experiments/base/applications/rapps/rapps/thunderbird.txt branches/shell-experiments/base/applications/rapps/rapps/ultravnc.txt branches/shell-experiments/base/applications/rapps/rapps/utorrent.txt branches/shell-experiments/base/applications/taskmgr/taskmgr.c branches/shell-experiments/configure.cmd branches/shell-experiments/dll/ntdll/rtl/libsupp.c branches/shell-experiments/dll/win32/advapi32/misc/logon.c branches/shell-experiments/dll/win32/advapi32/sec/ac.c branches/shell-experiments/dll/win32/advapi32/sec/misc.c branches/shell-experiments/dll/win32/advapi32/sec/sec.c branches/shell-experiments/dll/win32/advapi32/sec/trustee.c branches/shell-experiments/dll/win32/advapi32/token/token.c branches/shell-experiments/dll/win32/advapi32/wine/security.c branches/shell-experiments/lib/fast486/common.h branches/shell-experiments/lib/fast486/extraops.c branches/shell-experiments/lib/fast486/fpu.c branches/shell-experiments/lib/fast486/fpu.h branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/fast486/opcodes.h branches/shell-experiments/lib/fast486/opgroups.c branches/shell-experiments/lib/rtl/heappage.c branches/shell-experiments/lib/rtl/rtlp.h branches/shell-experiments/lib/sdk/crt/string/i386/tcscat.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcschr.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcscmp.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcslen.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcsncat.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcsncmp.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcsncpy.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcsnlen.inc branches/shell-experiments/lib/sdk/crt/string/i386/tcsrchr.inc branches/shell-experiments/ntoskrnl/rtl/libsupp.c branches/shell-experiments/subsystems/ntvdm/clock.c branches/shell-experiments/win32ss/gdi/dib/dib16bpp.c branches/shell-experiments/win32ss/gdi/eng/mouse.c branches/shell-experiments/win32ss/gdi/eng/pdevobj.h branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c branches/shell-experiments/win32ss/gdi/ntgdi/bitmaps.c branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c branches/shell-experiments/win32ss/gdi/ntgdi/intgdi.h branches/shell-experiments/win32ss/user/ntuser/class.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/menu.c branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c branches/shell-experiments/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Removed: branches/shell-experiments/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Removed: branches/shell-experiments/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/configure.cmd… Modified: branches/shell-experiments/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/rtl… Modified: branches/shell-experiments/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/e… Modified: branches/shell-experiments/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/heapp… Modified: branches/shell-experiments/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/rtlp.… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcscat.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcschr.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcscmp.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsncat.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsncmp.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsncpy.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsnlen.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/i386/tcsrchr.inc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/rtl/… Modified: branches/shell-experiments/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/gdi/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/d… Modified: branches/shell-experiments/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

9 years, 10 months

[akhaldi] 64995: [WININET_WINETEST] * ROSTESTS-73 is not fixed yet.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 18:35:58 2014 New Revision: 64995 URL: http://svn.reactos.org/svn/reactos?rev=64995&view=rev Log: [WININET_WINETEST] * ROSTESTS-73 is not fixed yet. Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat Oct 25 18:35:58 2014 @@ -3269,7 +3269,11 @@ SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); +#ifdef ROSTESTS_73_FIXED WaitForSingleObject(hCompleteEvent, INFINITE); +#else /* ROSTESTS_73_FIXED */ + ok(WaitForSingleObject(hCompleteEvent, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); +#endif /* ROSTESTS_73_FIXED */ ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION);

9 years, 10 months

[akhaldi] 64994: [ADVAPI32] * Update ImpersonateNamedPipeClient(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 18:30:05 2014 New Revision: 64994 URL: http://svn.reactos.org/svn/reactos?rev=64994&view=rev Log: [ADVAPI32] * Update ImpersonateNamedPipeClient(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Oct 25 18:30:05 2014 @@ -954,37 +954,14 @@ return TRUE; } -/********************************************************************** - * ImpersonateNamedPipeClient EXPORTED - * - * @implemented - */ -BOOL -WINAPI -ImpersonateNamedPipeClient(HANDLE hNamedPipe) -{ - IO_STATUS_BLOCK StatusBlock; - NTSTATUS Status; - - TRACE("ImpersonateNamedPipeClient() called\n"); - - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &StatusBlock, - FSCTL_PIPE_IMPERSONATE, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +BOOL WINAPI ImpersonateNamedPipeClient( HANDLE hNamedPipe ) +{ + IO_STATUS_BLOCK io_block; + + TRACE("(%p)\n", hNamedPipe); + + return set_ntstatus( NtFsControlFile(hNamedPipe, NULL, NULL, NULL, + &io_block, FSCTL_PIPE_IMPERSONATE, NULL, 0, NULL, 0) ); } /*

9 years, 10 months

[jgardou] 64993: [WIN32K] - Use a palette created from the DIB infos for surface created through CreateDIBitmap(CBM_CREATEDIB) CORE-8695 #comment Booting in 16bpp mode is now OK, but some problems ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 25 18:11:36 2014 New Revision: 64993 URL: http://svn.reactos.org/svn/reactos?rev=64993&view=rev Log: [WIN32K] - Use a palette created from the DIB infos for surface created through CreateDIBitmap(CBM_CREATEDIB) CORE-8695 #comment Booting in 16bpp mode is now OK, but some problems remain when switching mode from 16bpp to 32bpp Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat Oct 25 18:11:36 2014 @@ -1359,8 +1359,22 @@ { if (init & CBM_CREATDIB) { + PSURFACE Surface; + PPALETTE Palette; + /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); + if (!handle) + return NULL; + /* The palette must also match the given data */ + Surface = SURFACE_ShareLockSurface(handle); + ASSERT(Surface); + Palette = CreateDIBPalette(data, Dc, coloruse); + ASSERT(Palette); + SURFACE_vSetPalette(Surface, Palette); + + PALETTE_ShareUnlockPalette(Palette); + SURFACE_ShareUnlockSurface(Surface); } else { @@ -1382,45 +1396,6 @@ if ((NULL != handle) && (CBM_INIT & init)) { - if (init & CBM_CREATDIB) - { - PSURFACE Surface; - PPALETTE Palette; - NTSTATUS Status = STATUS_SUCCESS; - - Surface = SURFACE_ShareLockSurface(handle); - ASSERT(Surface); - - Palette = CreateDIBPalette(data, Dc, coloruse); - ASSERT(Palette); - SURFACE_vSetPalette(Surface, Palette); - PALETTE_ShareUnlockPalette(Palette); - - if (Surface->SurfObj.pvBits) - { - _SEH2_TRY - { - RtlCopyMemory(Surface->SurfObj.pvBits, bits, - abs(Surface->sizlDim.cy * Surface->SurfObj.lDelta)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - } - - SURFACE_ShareUnlockSurface(Surface); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GreDeleteObject(handle); - handle = NULL; - } - return handle; - } - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); } @@ -1544,13 +1519,13 @@ { BITMAPCOREHEADER* CoreHeader = (BITMAPCOREHEADER*)&pbmi->bmiHeader; bpp = CoreHeader->bcBitCount; - planes = CoreHeader->bcPlanes; + planes = CoreHeader->bcPlanes ? CoreHeader->bcPlanes : 1; compression = BI_RGB; } else { bpp = pbmi->bmiHeader.biBitCount; - planes = pbmi->bmiHeader.biPlanes; + planes = pbmi->bmiHeader.biPlanes ? pbmi->bmiHeader.biPlanes : 1; compression = pbmi->bmiHeader.biCompression; } }

9 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
73
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 October 2014