Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 60559: [SETUPAPI] Add stubs for SetupVerifyInfFile, called by VMWare tools installer.
by spetreolle＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: spetreolle Date: Sun Oct 6 12:56:48 2013 New Revision: 60559 URL: http://svn.reactos.org/svn/reactos?rev=60559&view=rev Log: [SETUPAPI] Add stubs for SetupVerifyInfFile, called by VMWare tools installer. Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Oct 6 12:56:48 2013 @@ -530,8 +530,8 @@ @ stub SetupUninstallNewlyCopiedInfs @ stdcall SetupUninstallOEMInfA(str long ptr) @ stdcall SetupUninstallOEMInfW(wstr long ptr) -@ stub SetupVerifyInfFileA -@ stub SetupVerifyInfFileW +@ stdcall SetupVerifyInfFileA(str ptr ptr) +@ stdcall SetupVerifyInfFileW(wstr ptr ptr) @ stdcall UnicodeToMultiByte(wstr long) pSetupUnicodeToMultiByte @ stub VerifyCatalogFile @ stub pSetupAccessRunOnceNodeList Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sun Oct 6 12:56:48 2013 @@ -113,7 +113,7 @@ } /*********************************************************************** - * SetupDiRemoveDevice(SETUPAPI.@) + * SetupDiRemoveDevice(SETUPAPI.@) */ BOOL WINAPI SetupDiRemoveDevice( @@ -127,7 +127,7 @@ /*********************************************************************** - * SetupDiUnremoveDevice(SETUPAPI.@) + * SetupDiUnremoveDevice(SETUPAPI.@) */ BOOL WINAPI SetupDiUnremoveDevice( @@ -154,3 +154,31 @@ return FALSE; } +/*********************************************************************** + * SetupVerifyInfFileA(SETUPAPI.@) + */ +BOOL WINAPI +SetupVerifyInfFileA( + IN PCSTR InfName, + IN PSP_ALTPLATFORM_INFO AltPlatformInfo, + OUT PSP_INF_SIGNER_INFO_A InfFileName) +{ + FIXME ("Stub %s %p %p\n", debugstr_a(InfName), AltPlatformInfo, InfFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupVerifyInfFileW(SETUPAPI.@) + */ +BOOL WINAPI +SetupVerifyInfFileW( + IN PCWSTR InfName, + IN PSP_ALTPLATFORM_INFO AltPlatformInfo, + OUT PSP_INF_SIGNER_INFO_W InfFileName) +{ + FIXME ("Stub %s %p %p\n", debugstr_w(InfName), AltPlatformInfo, InfFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} +

1 0

[spetreolle] 60558: [SETUPAPI] Add _SP_INF_SIGNER_INFO and _SP_ALTPLATFORM_INFO defines.
by spetreolle＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: spetreolle Date: Sun Oct 6 12:56:01 2013 New Revision: 60558 URL: http://svn.reactos.org/svn/reactos?rev=60558&view=rev Log: [SETUPAPI] Add _SP_INF_SIGNER_INFO and _SP_ALTPLATFORM_INFO defines. Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sun Oct 6 12:56:01 2013 @@ -678,14 +678,47 @@ DWORD InfCount; BYTE VersionData[ANYSIZE_ARRAY]; } SP_INF_INFORMATION, *PSP_INF_INFORMATION; -typedef struct _SP_ALTPLATFORM_INFO { +typedef struct _SP_INF_SIGNER_INFO_A { + DWORD cbSize; + CHAR CatalogFile; + CHAR DigitalSigner; + CHAR DigitalSignerVersion; +} SP_INF_SIGNER_INFO_A, *PSP_INF_SIGNER_INFO_A; +typedef struct _SP_INF_SIGNER_INFO_W { + DWORD cbSize; + WCHAR CatalogFile; + WCHAR DigitalSigner; + WCHAR DigitalSignerVersion; +} SP_INF_SIGNER_INFO_W, *PSP_INF_SIGNER_INFO_W; +typedef struct _SP_ALTPLATFORM_INFO_V1 { DWORD cbSize; DWORD Platform; DWORD MajorVersion; DWORD MinorVersion; WORD ProcessorArchitecture; WORD Reserved; -} SP_ALTPLATFORM_INFO, *PSP_ALTPLATFORM_INFO; +} SP_ALTPLATFORM_INFO_V1, *PSP_ALTPLATFORM_INFO_V1; +typedef struct _SP_ALTPLATFORM_INFO_V2 { + DWORD cbSize; + DWORD Platform; + DWORD MajorVersion; + DWORD MinorVersion; + WORD ProcessorArchitecture; + union + { + WORD Reserved; + WORD Flags; + } DUMMYUNIONNAME; + DWORD FirstValidatedMajorVersion; + DWORD FirstValidatedMinorVersion; +} SP_ALTPLATFORM_INFO_V2, *PSP_ALTPLATFORM_INFO_V2; +#if _WIN32_WINNT <= 0x0500 +typedef SP_ALTPLATFORM_INFO_V1 SP_ALTPLATFORM_INFO; +typedef PSP_ALTPLATFORM_INFO_V1 PSP_ALTPLATFORM_INFO; +#else +typedef SP_ALTPLATFORM_INFO_V2 SP_ALTPLATFORM_INFO; +typedef PSP_ALTPLATFORM_INFO_V2 PSP_ALTPLATFORM_INFO; +#endif typedef struct _SP_ORIGINAL_FILE_INFO_A { DWORD cbSize; CHAR OriginalInfName[MAX_PATH];

1 0

[tfaber] 60557: [POWERCFG.CPL] - Use Yes/No instead of Ok/Cancel for "Are you sure you want to delete the power scheme?" Patch by Lee Schroeder. - Remove some unnecessary casts CORE-7503 #resolve
by tfaber＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: tfaber Date: Sun Oct 6 10:31:02 2013 New Revision: 60557 URL: http://svn.reactos.org/svn/reactos?rev=60557&view=rev Log: [POWERCFG.CPL] - Use Yes/No instead of Ok/Cancel for "Are you sure you want to delete the power scheme?" Patch by Lee Schroeder. - Remove some unnecessary casts CORE-7503 #resolve Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Sun Oct 6 10:31:02 2013 @@ -471,7 +471,7 @@ LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR)); LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) == IDOK) + if (MessageBox(hwnd, szBuf, szBufT, MB_YESNO | MB_ICONQUESTION) == IDYES) { UINT Current;

1 0

[hbelusca] 60556: [CSRSRV]: Fix long-time SMSS port name typo (it is SbApiPort).
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 00:30:29 2013 New Revision: 60556 URL: http://svn.reactos.org/svn/reactos?rev=60556&view=rev Log: [CSRSRV]: Fix long-time SMSS port name typo (it is SbApiPort). Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/sr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] Sun Oct 6 00:30:29 2013 @@ -49,7 +49,7 @@ #define SESSION_ROOT L"\\Sessions" #define GLOBAL_ROOT L"\\GLOBAL??" #define SYMLINK_NAME L"SymbolicLink" -#define SB_PORT_NAME L"SbAbiPort" +#define SB_PORT_NAME L"SbApiPort" #define CSR_PORT_NAME L"ApiPort" #define UNICODE_PATH_SEP L"\\"

1 0

[hbelusca] 60555: [CSRSRV]: Less PPORT_MESSAGE casts.
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 00:04:18 2013 New Revision: 60555 URL: http://svn.reactos.org/svn/reactos?rev=60555&view=rev Log: [CSRSRV]: Less PPORT_MESSAGE casts. Modified: trunk/reactos/subsystems/win32/csrsrv/session.c Modified: trunk/reactos/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Sun Oct 6 00:04:18 2013 @@ -443,7 +443,7 @@ /* Accept the connection */ Status = NtAcceptConnectPort(&hPort, NULL, - (PPORT_MESSAGE)Message, + &Message->h, TRUE, NULL, &RemotePortView);

1 0

[hbelusca] 60554: [CSRSRV]: Add the 0x prefix when we display some hex output.
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 23:56:12 2013 New Revision: 60554 URL: http://svn.reactos.org/svn/reactos?rev=60554&view=rev Log: [CSRSRV]: Add the 0x prefix when we display some hex output. Modified: trunk/reactos/subsystems/win32/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Oct 5 23:56:12 2013 @@ -969,7 +969,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: NtQuerySystemInformation failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: NtQuerySystemInformation failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -981,7 +981,7 @@ Status = CsrSetProcessSecurity(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrSetProcessSecurity failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrSetProcessSecurity failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -990,7 +990,7 @@ Status = CsrInitializeNtSessionList(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitializeSessions failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitializeSessions failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -999,7 +999,7 @@ Status = CsrInitializeProcessStructure(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitializeProcessStructure failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitializeProcessStructure failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1008,7 +1008,7 @@ Status = CsrParseServerCommandLine(ArgumentCount, Arguments); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrParseServerCommandLine failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrParseServerCommandLine failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1017,7 +1017,7 @@ Status = CsrInitCsrRootProcess(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitCsrRootProcess failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitCsrRootProcess failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1026,7 +1026,7 @@ Status = CsrApiPortInitialize(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrApiPortInitialize failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrApiPortInitialize failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1035,7 +1035,7 @@ Status = CsrSbApiPortInitialize(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrSbApiPortInitialize failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrSbApiPortInitialize failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1047,7 +1047,7 @@ &CsrSmApiPort); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: SmConnectToSm failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: SmConnectToSm failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1056,7 +1056,7 @@ Status = NtSetDefaultHardErrorPort(CsrApiPort); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: NtSetDefaultHardErrorPort failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: NtSetDefaultHardErrorPort failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; }

1 0

[hbelusca] 60553: [CSRSRV][CONSRV] CSR_WAIT_FUNCTION functions are callbacks and therefore are __stdcall aka. NTAPI. Fix this. Now, using either our csrsrv or win2k3' csrsrv works without problems; ...
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 23:34:25 2013 New Revision: 60553 URL: http://svn.reactos.org/svn/reactos?rev=60553&view=rev Log: [CSRSRV][CONSRV] CSR_WAIT_FUNCTION functions are callbacks and therefore are __stdcall aka. NTAPI. Fix this. Now, using either our csrsrv or win2k3' csrsrv works without problems; there is no console key-press problems anymore (aka. stack corruption when calling multiple times CsrNotifyWait, which called those CSR_WAIT_FUNCTION functions). Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -134,7 +134,7 @@ */ typedef BOOLEAN -(*CSR_WAIT_FUNCTION)( +(NTAPI *CSR_WAIT_FUNCTION)( IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -78,6 +78,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI ReadCharsThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, @@ -193,6 +194,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI ReadInputBufferThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -308,6 +308,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI WriteConsoleThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage,

1 0

[spetreolle] 60552: [GDI32_WINETEST] [USER32_WINETEST] Use Jira bug ids.
by spetreolle＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: spetreolle Date: Sat Oct 5 22:20:32 2013 New Revision: 60552 URL: http://svn.reactos.org/svn/reactos?rev=60552&view=rev Log: [GDI32_WINETEST] [USER32_WINETEST] Use Jira bug ids. Modified: trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -336,7 +336,7 @@ if(!winetest_interactive) { - skip("reactos bug 5401: Skipping bitmap font tests!\n"); + skip("reactos bug ROSTESTS-8: Skipping bitmap font tests!\n"); return; } Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -1737,7 +1737,7 @@ if(!winetest_interactive) { - skip("skipping match_emf_record(), bug 5393\n"); + skip("skipping match_emf_record(), bug ROSTESTS-4\n"); return 0; } Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -7575,7 +7575,7 @@ test_SetForegroundWindow(hwndMain); if(!winetest_interactive) - skip("bug 5957: skipping test_shell_window, it crashes ros/win7 explorer\n"); + skip("bug ROSTESTS-23: skipping test_shell_window, it crashes ros/win7 explorer\n"); else test_shell_window(); test_handles( hwndMain );

1 0

[hbelusca] 60551: [CSRSRV][CONSRV] - Fix the second parameter WaitType (aka. NotifyAll) of CsrNotifyWait. Indeed, we used before the constants WaitAll == 0 / WaitAny == 1 (see the WAIT_TYPE enum); ...
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 22:17:34 2013 New Revision: 60551 URL: http://svn.reactos.org/svn/reactos?rev=60551&view=rev Log: [CSRSRV][CONSRV] - Fix the second parameter WaitType (aka. NotifyAll) of CsrNotifyWait. Indeed, we used before the constants WaitAll == 0 / WaitAny == 1 (see the WAIT_TYPE enum); however, it appeared that Win2k3's CsrNotifyWait wanted a WaitType parameter == 1 when waiting for all the waits in a given wait-list. Therefore we would have to use WaitAll for waiting for any of the wait blocks, and WaitAny for waiting for all the wait blocks... looks illogical. Therefore I use instead a BOOLEAN variable (that I call NotifyAll) which is TRUE when I want to wait for all the wait blocks, and FALSE otherwise (as done e.g. for the WaitForMultipleObjects API). - Fix its usage in CONSRV. Magically fix key presses problems in console, when using Win2k3 csrsrv.dll ... Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/wait.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -349,7 +349,7 @@ BOOLEAN NTAPI CsrNotifyWait(IN PLIST_ENTRY WaitList, - IN ULONG WaitType, + IN BOOLEAN NotifyAll, IN PVOID WaitArgument1, IN PVOID WaitArgument2); Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -372,8 +372,8 @@ * @param WaitList * Pointer to the wait list whose wait blocks will be notified. * - * @param WaitType - * Type of the wait to perform, either WaitAny or WaitAll. + * @param NotifyAll + * Whether or not we must notify all the waits. * * @param WaitArgument[1-2] * User-defined argument to pass on to the wait function. @@ -386,7 +386,7 @@ BOOLEAN NTAPI CsrNotifyWait(IN PLIST_ENTRY WaitList, - IN ULONG WaitType, + IN BOOLEAN NotifyAll, IN PVOID WaitArgument1, IN PVOID WaitArgument2) { @@ -420,8 +420,11 @@ 0, FALSE); - /* We've already done a wait, so leave unless this is a Wait All */ - if (WaitType != WaitAll) break; + /* + * We've already done a wait, so leave unless + * we want to notify all the waits... + */ + if (!NotifyAll) break; } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -101,7 +101,7 @@ SetEvent(Console->InputBuffer.ActiveEvent); CsrNotifyWait(&Console->InputBuffer.ReadWaitQueue, - WaitAny, + FALSE, NULL, NULL); if (!IsListEmpty(&Console->InputBuffer.ReadWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -282,7 +282,7 @@ Console->UnpauseEvent = NULL; CsrNotifyWait(&Console->WriteWaitQueue, - WaitAll, + TRUE, NULL, NULL); if (!IsListEmpty(&Console->WriteWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -123,7 +123,7 @@ Console->UnpauseEvent = NULL; CsrNotifyWait(&Console->WriteWaitQueue, - WaitAll, + TRUE, NULL, NULL); if (!IsListEmpty(&Console->WriteWaitQueue)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sat Oct 5 22:17:34 2013 @@ -89,7 +89,7 @@ * return. */ CsrNotifyWait(&InputBuffer->ReadWaitQueue, - WaitAll, + TRUE, NULL, (PVOID)Entry); if (!IsListEmpty(&InputBuffer->ReadWaitQueue))

1 0

[akhaldi] 60550: [RPCSS] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 21:05:04 2013 New Revision: 60550 URL: http://svn.reactos.org/svn/reactos?rev=60550&view=rev Log: [RPCSS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/base/services/rpcss/epmp.c trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -19,6 +19,7 @@ */ #include <epm_s.h> + #include <wine/debug.h> #include <wine/list.h> @@ -88,16 +89,16 @@ WINE_FIXME("%p\n", entry_handle); } -void ept_insert(handle_t h, - unsigned32 num_ents, - ept_entry_t entries[], - boolean32 replace, - error_status_t *status) +void __cdecl ept_insert(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + boolean32 replace, + error_status_t *status) { unsigned32 i; RPC_STATUS rpc_status; - WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); + WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status); *status = RPC_S_OK; @@ -119,7 +120,7 @@ &entry->address); if (rpc_status != RPC_S_OK) { - WINE_WARN("TowerExplode failed %lu\n", rpc_status); + WINE_WARN("TowerExplode failed %u\n", rpc_status); *status = rpc_status; break; /* FIXME: more cleanup? */ } @@ -138,17 +139,17 @@ LeaveCriticalSection(&csEpm); } -void ept_delete(handle_t h, - unsigned32 num_ents, - ept_entry_t entries[], - error_status_t *status) +void __cdecl ept_delete(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + error_status_t *status) { unsigned32 i; RPC_STATUS rpc_status; *status = RPC_S_OK; - WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); + WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status); EnterCriticalSection(&csEpm); @@ -179,30 +180,30 @@ LeaveCriticalSection(&csEpm); } -void ept_lookup(handle_t h, - unsigned32 inquiry_type, - uuid_p_t object, - rpc_if_id_p_t interface_id, - unsigned32 vers_option, - ept_lookup_handle_t *entry_handle, - unsigned32 max_ents, - unsigned32 *num_ents, - ept_entry_t entries[], - error_status_t *status) +void __cdecl ept_lookup(handle_t h, + unsigned32 inquiry_type, + uuid_p_t object, + rpc_if_id_p_t interface_id, + unsigned32 vers_option, + ept_lookup_handle_t *entry_handle, + unsigned32 max_ents, + unsigned32 *num_ents, + ept_entry_t entries[], + error_status_t *status) { WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); *status = EPT_S_CANT_PERFORM_OP; } -void ept_map(handle_t h, - uuid_p_t object, - twr_p_t map_tower, - ept_lookup_handle_t *entry_handle, - unsigned32 max_towers, - unsigned32 *num_towers, - twr_p_t *towers, - error_status_t *status) +void __cdecl ept_map(handle_t h, + uuid_p_t object, + twr_p_t map_tower, + ept_lookup_handle_t *entry_handle, + unsigned32 max_towers, + unsigned32 *num_towers, + twr_p_t *towers, + error_status_t *status) { RPC_STATUS rpc_status; RPC_SYNTAX_IDENTIFIER iface, syntax; @@ -212,7 +213,7 @@ *status = RPC_S_OK; *num_towers = 0; - WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, + WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower, entry_handle, max_towers, num_towers, towers, status); rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, @@ -253,31 +254,31 @@ LeaveCriticalSection(&csEpm); } -void ept_lookup_handle_free(handle_t h, - ept_lookup_handle_t *entry_handle, +void __cdecl ept_lookup_handle_free(handle_t h, + ept_lookup_handle_t *entry_handle, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void __cdecl ept_inq_object(handle_t h, + GUID *ept_object, error_status_t *status) { - WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); - - *status = EPT_S_CANT_PERFORM_OP; -} - -void ept_inq_object(handle_t h, - GUID *ept_object, - error_status_t *status) -{ WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status); *status = EPT_S_CANT_PERFORM_OP; } -void ept_mgmt_delete(handle_t h, - boolean32 object_speced, - uuid_p_t object, - twr_p_t tower, - error_status_t *status) -{ - WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); - - *status = EPT_S_CANT_PERFORM_OP; -} +void __cdecl ept_mgmt_delete(handle_t h, + boolean32 object_speced, + uuid_p_t object, + twr_p_t tower, + error_status_t *status) +{ + WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + + *status = EPT_S_CANT_PERFORM_OP; +} Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -1,5 +1,5 @@ /* - * Running Object Table + * Running Object Table * * Copyright 2007 Robert Shearman * @@ -60,7 +60,7 @@ } } -HRESULT IrotRegister( +HRESULT __cdecl IrotRegister( IrotHandle h, const MonikerComparisonData *data, const InterfaceData *obj, @@ -140,7 +140,7 @@ return hr; } -HRESULT IrotRevoke( +HRESULT __cdecl IrotRevoke( IrotHandle h, IrotCookie cookie, IrotContextHandle *ctxt_handle, @@ -187,7 +187,7 @@ return E_INVALIDARG; } -HRESULT IrotIsRunning( +HRESULT __cdecl IrotIsRunning( IrotHandle h, const MonikerComparisonData *data) { @@ -212,7 +212,7 @@ return hr; } -HRESULT IrotGetObject( +HRESULT __cdecl IrotGetObject( IrotHandle h, const MonikerComparisonData *moniker_data, PInterfaceData *obj, @@ -254,7 +254,7 @@ return MK_E_UNAVAILABLE; } -HRESULT IrotNoteChangeTime( +HRESULT __cdecl IrotNoteChangeTime( IrotHandle h, IrotCookie cookie, const FILETIME *last_modified_time) @@ -278,7 +278,7 @@ return E_INVALIDARG; } -HRESULT IrotGetTimeOfLastChange( +HRESULT __cdecl IrotGetTimeOfLastChange( IrotHandle h, const MonikerComparisonData *moniker_data, FILETIME *time) @@ -306,7 +306,7 @@ return hr; } -HRESULT IrotEnumRunning( +HRESULT __cdecl IrotEnumRunning( IrotHandle h, PInterfaceList *list) { Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Sat Oct 5 21:05:04 2013 @@ -122,7 +122,7 @@ return TRUE; } -#if 0 +#ifndef __REACTOS__ int main( int argc, char **argv ) { /* 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] Sat Oct 5 21:05:04 2013 @@ -233,7 +233,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 reactos/base/applications/wordpad # Synced to Wine-1.5.26 -reactos/base/services/rpcss # Synced to Wine-20081105 +reactos/base/services/rpcss # Synced to Wine-1.7.1 reactos/base/system/expand # Synced to Wine-1.5.26 reactos/base/system/msiexec # Synced to Wine-1.5.26 reactos/modules/rosapps/winfile # Autosync

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs