Author: cfinck
Date: Tue Jun 30 16:08:16 2015
New Revision: 68324
URL: http://svn.reactos.org/svn/reactos?rev=68324&view=rev
Log:
[LOCALSPL]
Bugfix: The RegEnum* functions take the buffer size _including_ the terminating null character as input and only return the actual data length _without_ the terminating null character as output.
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c
Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c
URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea…
==============================================================================
--- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original)
+++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Tue Jun 30 16:08:16 2015
@@ -192,7 +192,7 @@
}
// Get the name of this Print Processor.
- cchPrintProcessorName = cchMaxSubKey;
+ cchPrintProcessorName = cchMaxSubKey + 1;
lStatus = RegEnumKeyExW(hSubKey, i, pwszPrintProcessorName, &cchPrintProcessorName, NULL, NULL, NULL, NULL);
if (lStatus != ERROR_SUCCESS)
{
@@ -498,7 +498,7 @@
{
// RegEnumKeyExW sucks! Unlike similar API functions, it only returns the actual numbers of characters copied when you supply a buffer large enough.
// So use pwszTemp with its size cchMaxSubKey for this.
- cchPrintProcessor = cchMaxSubKey;
+ cchPrintProcessor = cchMaxSubKey + 1;
dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, pwszTemp, &cchPrintProcessor, NULL, NULL, NULL, NULL);
if (dwErrorCode != ERROR_SUCCESS)
{
@@ -524,7 +524,7 @@
for (i = 0; i < *pcReturned; i++)
{
// This isn't really correct, but doesn't cause any harm, because we've extensively checked the size of the supplied buffer above.
- cchPrintProcessor = cchMaxSubKey;
+ cchPrintProcessor = cchMaxSubKey + 1;
// Copy the Print Processor name.
dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, (PWSTR)pCurrentOutputPrintProcessor, &cchPrintProcessor, NULL, NULL, NULL, NULL);
Author: cfinck
Date: Tue Jun 30 16:02:26 2015
New Revision: 68323
URL: http://svn.reactos.org/svn/reactos?rev=68323&view=rev
Log:
[LOCALSPL, WINPRINT]
Bugfix: I want to dereference the pointer and then increment its value, not increment the pointer address.
Modified:
branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c
branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c
branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c
Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c
URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea…
==============================================================================
--- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original)
+++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Tue Jun 30 16:02:26 2015
@@ -131,7 +131,7 @@
// Also calculate the offset in the output buffer of the pointer to this datatype string.
*pCurrentOffset = *pcReturned * sizeof(DATATYPES_INFO_1W) + FIELD_OFFSET(DATATYPES_INFO_1W, pName);
- *pcReturned++;
+ (*pcReturned)++;
pCurrentOffset++;
}
@@ -198,7 +198,7 @@
goto Cleanup;
}
- // Create a new WINPRINT_HANDLE structure. and fill the relevant fields.
+ // Create a new WINPRINT_HANDLE structure and fill the relevant fields.
pHandle = DllAllocSplMem(sizeof(WINPRINT_HANDLE));
// Check what datatype was given.
Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c
URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea…
==============================================================================
--- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original)
+++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Tue Jun 30 16:02:26 2015
@@ -943,7 +943,7 @@
_LocalGetJobLevel2(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded);
// We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first.
- *pcReturned++;
+ (*pcReturned)++;
pNode = pNode->Next[0];
}
@@ -976,7 +976,7 @@
goto Cleanup;
// We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first.
- *pcReturned++;
+ (*pcReturned)++;
pNode = pNode->Next[0];
}
Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c
URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea…
==============================================================================
--- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original)
+++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue Jun 30 16:02:26 2015
@@ -347,7 +347,7 @@
cbDescription = cchComputerName * sizeof(WCHAR) + cbName + cbComment + sizeof(WCHAR);
*pcbNeeded += sizeof(PRINTER_INFO_1W) + cchComputerName * sizeof(WCHAR) + cbName + cbComment + cbDescription;
- *pcReturned++;
+ (*pcReturned)++;
}
// Check if the supplied buffer is large enough.
Author: tfaber
Date: Tue Jun 30 11:34:34 2015
New Revision: 68319
URL: http://svn.reactos.org/svn/reactos?rev=68319&view=rev
Log:
[MSI_WINETEST]
- Skip msi:msi test if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further
ROSTESTS-180
ONLINE-441 ROSTESTS-179
Modified:
trunk/rostests/winetests/msi/msi.c
Modified: trunk/rostests/winetests/msi/msi.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6…
==============================================================================
--- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Tue Jun 30 11:34:34 2015
@@ -14367,6 +14367,15 @@
DWORD len;
char temp_path[MAX_PATH], prev_path[MAX_PATH];
+#ifdef __REACTOS__
+ if (!winetest_interactive &&
+ !strcmp(winetest_platform, "windows"))
+ {
+ skip("ROSTESTS-180: Skipping msi_winetest:msi because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n");
+ return;
+ }
+#endif
+
init_functionpointers();
if (pIsWow64Process)