Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 68471: It's bugfixing time! [LOCALSPL] - A Print Job has more optional fields than I thought. Only do a wcslen on them if they are not NULL. - Make the code for checking changed fields mor...
by cfinck＠svn.reactos.org 20 Jul '15

20 Jul '15

Author: cfinck Date: Mon Jul 20 15:21:03 2015 New Revision: 68471 URL: http://svn.reactos.org/svn/reactos?rev=68471&view=rev Log: It's bugfixing time! [LOCALSPL] - A Print Job has more optional fields than I thought. Only do a wcslen on them if they are not NULL. - Make the code for checking changed fields more robust. Add checks for NULL to the Find and Compare functions. - Fix some wrong parameters given to CopyMemory. - Set the pPort field of a LOCAL_PRINTER structure. [WINSPOOL] Only pass the datatype from the DOC_INFO_1W structure of StartDocPrinterW to SetJobW if it's not NULL. For StartDocPrinterW, this means that the datatype shall not be changed while SetJobW would return ERROR_INVALID_DATATYPE if none was passed. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -89,7 +89,9 @@ } // Add our document information. - pJobInfo1->pDatatype = pDocInfo1->pDatatype; + if (pDocInfo1->pDatatype) + pJobInfo1->pDatatype = pDocInfo1->pDatatype; + pJobInfo1->pDocument = pDocInfo1->pDocName; // Set the new job information. 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] Mon Jul 20 15:21:03 2015 @@ -13,6 +13,36 @@ // Local Variables static DWORD _dwLastJobID; + +/** + * @name _EqualStrings + * + * Returns whether two strings are equal. + * Unlike wcscmp, this function also works with NULL strings. + * + * @param pwszA + * First string to compare. + * + * @param pwszB + * Second string to compare. + * + * @return + * TRUE if the strings are equal, FALSE if they differ. + */ +static __inline BOOL +_EqualStrings(PCWSTR pwszA, PCWSTR pwszB) +{ + if (!pwszA && !pwszB) + return TRUE; + + if (pwszA && !pwszB) + return FALSE; + + if (!pwszA && pwszB) + return FALSE; + + return (wcscmp(pwszA, pwszB) == 0); +} static BOOL _GetNextJobID(PDWORD dwJobID) @@ -112,8 +142,8 @@ if (pwszOutput) { - CopyMemory(pwszOutput, wszSpoolDirectory, cchSpoolDirectory); - CopyMemory(&pwszOutput[cchSpoolDirectory], wszPrintersPath, cchPrintersPath); + CopyMemory(pwszOutput, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); + CopyMemory(&pwszOutput[cchSpoolDirectory], wszPrintersPath, cchPrintersPath * sizeof(WCHAR)); swprintf(&pwszOutput[cchSpoolDirectory + cchPrintersPath], L"%05lu.", dwJobID); CopyMemory(&pwszOutput[cchSpoolDirectory + cchPrintersPath + cchSpoolerFile], pwszExtension, (cchExtension + 1) * sizeof(WCHAR)); } @@ -291,7 +321,7 @@ cchMachineName = wcslen(pwszMachineName); pJob->pwszMachineName = DllAllocSplMem((cchMachineName + cchDoubleBackslash + 1) * sizeof(WCHAR)); CopyMemory(pJob->pwszMachineName, wszDoubleBackslash, cchDoubleBackslash * sizeof(WCHAR)); - CopyMemory(pJob->pwszMachineName + cchDoubleBackslash, pwszMachineName, (cchMachineName + 1) * sizeof(WCHAR)); + CopyMemory(&pJob->pwszMachineName[cchDoubleBackslash], pwszMachineName, (cchMachineName + 1) * sizeof(WCHAR)); // Add the job to the Global Job List. if (!InsertElementSkiplist(&GlobalJobList, pJob)) @@ -406,17 +436,23 @@ _LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); - DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = 0; DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbStatus = 0; - DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD cbUserName = 0; DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; - // A Status Message is optional. + // Calculate the lengths of the optional values. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. *pcbNeeded += sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; @@ -431,10 +467,6 @@ JobInfo1.pDatatype = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); - *ppEnd -= cbDocumentName; - JobInfo1.pDocument = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); - *ppEnd -= cbMachineName; JobInfo1.pMachineName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); @@ -443,6 +475,14 @@ JobInfo1.pPrinterName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); + // Copy the optional values. + if (cbDocumentName) + { + *ppEnd -= cbDocumentName; + JobInfo1.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + } + if (cbStatus) { *ppEnd -= cbStatus; @@ -450,9 +490,12 @@ CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); } - *ppEnd -= cbUserName; - JobInfo1.pUserName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + if (cbUserName) + { + *ppEnd -= cbUserName; + JobInfo1.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + } // Fill the rest of the structure. JobInfo1.JobId = pJob->dwJobID; @@ -475,15 +518,15 @@ { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; - DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = 0; DWORD cbDriverName = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - DWORD cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + DWORD cbNotifyName = 0; DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessorParameters = 0; DWORD cbStatus = 0; - DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD cbUserName = 0; DWORD dwErrorCode; FILETIME ftNow; FILETIME ftSubmitted; @@ -491,12 +534,21 @@ ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; - // Print Processor Parameters and Status Message are optional. + // Calculate the lengths of the optional values. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + + if (pJob->pwszNotifyName) + cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + if (pJob->pwszPrintProcessorParameters) cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + cbDevMode + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; @@ -515,10 +567,6 @@ JobInfo2.pDevMode = (PDEVMODEW)*ppEnd; CopyMemory(*ppEnd, pJob->pDevMode, cbDevMode); - *ppEnd -= cbDocumentName; - JobInfo2.pDocument = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); - *ppEnd -= cbDriverName; JobInfo2.pDriverName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterDriver, cbDriverName); @@ -527,10 +575,6 @@ JobInfo2.pMachineName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); - *ppEnd -= cbNotifyName; - JobInfo2.pNotifyName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); - *ppEnd -= cbPrinterName; JobInfo2.pPrinterName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); @@ -539,6 +583,21 @@ JobInfo2.pPrintProcessor = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrintProcessor->pwszName, cbPrintProcessor); + // Copy the optional values. + if (cbDocumentName) + { + *ppEnd -= cbDocumentName; + JobInfo2.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + } + + if (cbNotifyName) + { + *ppEnd -= cbNotifyName; + JobInfo2.pNotifyName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); + } + if (cbPrintProcessorParameters) { *ppEnd -= cbPrintProcessorParameters; @@ -553,9 +612,12 @@ CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); } - *ppEnd -= cbUserName; - JobInfo2.pUserName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + if (cbUserName) + { + *ppEnd -= cbUserName; + JobInfo2.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + } // Time in JOB_INFO_2W is the number of milliseconds elapsed since the job was submitted. Calculate this time. if (!SystemTimeToFileTime(&pJob->stSubmitted, &ftSubmitted)) @@ -658,7 +720,7 @@ } // Check if the datatype has changed. - if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + if (!_EqualStrings(pJob->pwszDatatype, pJobInfo->pDatatype)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) @@ -669,8 +731,8 @@ } } - // Check if the document name has changed. - if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + // Check if the document name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszDocumentName, pJobInfo->pDocument)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) @@ -681,8 +743,8 @@ } } - // Check if the status message has changed. - if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + // Check if the status message has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszStatus, pJobInfo->pStatus)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) @@ -693,8 +755,8 @@ } } - // Check if the user name has changed. - if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + // Check if the user name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName) != 0) { // The new user name doesn't need to exist, so no additional verification is required. @@ -763,7 +825,7 @@ } // Check if the datatype has changed. - if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + if (!_EqualStrings(pJob->pwszDatatype, pJobInfo->pDatatype)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) @@ -774,8 +836,8 @@ } } - // Check if the document name has changed. - if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + // Check if the document name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszDocumentName, pJobInfo->pDocument)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) @@ -786,8 +848,8 @@ } } - // Check if the notify name has changed. - if (wcscmp(pJob->pwszNotifyName, pJobInfo->pNotifyName) != 0) + // Check if the notify name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszNotifyName, pJobInfo->pNotifyName)) { // The new notify name doesn't need to exist, so no additional verification is required. @@ -800,8 +862,8 @@ } } - // Check if the (optional) Print Processor Parameters have changed. - if ((!pJob->pwszPrintProcessorParameters && pJobInfo->pParameters) || wcscmp(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters) != 0) + // Check if the Print Processor Parameters have changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) @@ -812,8 +874,8 @@ } } - // Check if the (optional) Status Message has changed. - if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + // Check if the Status Message has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszStatus, pJobInfo->pStatus)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) @@ -824,8 +886,8 @@ } } - // Check if the user name has changed. - if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + // Check if the user name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName)) { // The new user name doesn't need to exist, so no additional verification is required. @@ -1201,15 +1263,21 @@ pJob->pPrintProcessor = pPrintProcessor; pJob->pDevMode = DuplicateDevMode((PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode)); pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); - pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszMachineName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offMachineName)); - pJob->pwszNotifyName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offNotifyName)); + CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); + + // Copy the optional values. + if (pShadowFile->offDocumentName) + pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); + + if (pShadowFile->offNotifyName) + pJob->pwszNotifyName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offNotifyName)); if (pShadowFile->offPrintProcessorParameters) pJob->pwszPrintProcessorParameters = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessorParameters)); - pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); - CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); + if (pShadowFile->offUserName) + pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); // Jobs read from shadow files were always added using AddJob. pJob->bAddedJob = TRUE; @@ -1230,17 +1298,17 @@ WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob) { BOOL bReturnValue = FALSE; - DWORD cbDatatype; - DWORD cbDevMode; - DWORD cbDocumentName; + DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + DWORD cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; + DWORD cbDocumentName = 0; DWORD cbFileSize; - DWORD cbMachineName; - DWORD cbNotifyName; - DWORD cbPrinterDriver; - DWORD cbPrinterName; - DWORD cbPrintProcessor; + DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); + DWORD cbNotifyName = 0; + DWORD cbPrinterDriver = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessorParameters = 0; - DWORD cbUserName; + DWORD cbUserName = 0; DWORD cbWritten; DWORD dwCurrentOffset; HANDLE hSHDFile = INVALID_HANDLE_VALUE; @@ -1255,20 +1323,18 @@ goto Cleanup; } - // Compute the total size of the shadow file. - cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); - cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; - cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); - cbPrinterDriver = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); - cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); - cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); - cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); - - // Print Processor Parameters are optional. + // Calculate the lengths of the optional values and the total size of the shadow file. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + + if (pJob->pwszNotifyName) + cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + if (pJob->pwszPrintProcessorParameters) cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + cbDevMode + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; @@ -1306,10 +1372,6 @@ pShadowFile->offDatatype = dwCurrentOffset; dwCurrentOffset += cbDatatype; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); - pShadowFile->offDocumentName = dwCurrentOffset; - dwCurrentOffset += cbDocumentName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pDevMode, cbDevMode); pShadowFile->offDevMode = dwCurrentOffset; dwCurrentOffset += cbDevMode; @@ -1323,10 +1385,6 @@ pShadowFile->offMachineName = dwCurrentOffset; dwCurrentOffset += cbMachineName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszNotifyName, cbNotifyName); - pShadowFile->offNotifyName = dwCurrentOffset; - dwCurrentOffset += cbNotifyName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterName, cbPrinterName); pShadowFile->offPrinterName = dwCurrentOffset; dwCurrentOffset += cbPrinterName; @@ -1335,6 +1393,21 @@ pShadowFile->offPrintProcessor = dwCurrentOffset; dwCurrentOffset += cbPrintProcessor; + // Copy the optional values. + if (cbDocumentName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); + pShadowFile->offDocumentName = dwCurrentOffset; + dwCurrentOffset += cbDocumentName; + } + + if (cbNotifyName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszNotifyName, cbNotifyName); + pShadowFile->offNotifyName = dwCurrentOffset; + dwCurrentOffset += cbNotifyName; + } + if (cbPrintProcessorParameters) { CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); @@ -1342,9 +1415,12 @@ dwCurrentOffset += cbPrintProcessorParameters; } - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); - pShadowFile->offUserName = dwCurrentOffset; - dwCurrentOffset += cbUserName; + if (cbUserName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); + pShadowFile->offUserName = dwCurrentOffset; + dwCurrentOffset += cbUserName; + } // Write the file. if (!WriteFile(hSHDFile, pShadowFile, cbFileSize, &cbWritten, NULL)) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -16,6 +16,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PRINT_MONITOR pPrintMonitor; + + if (!pwszName) + return NULL; for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -16,6 +16,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PORT pPort; + + if (!pwszName) + return NULL; for (pEntry = _PortList.Flink; pEntry != &_PortList; pEntry = pEntry->Flink) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -129,9 +129,9 @@ PLOCAL_PRINT_PROCESSOR pPrintProcessor; /** Associated Print Processor to this Job */ DWORD dwPriority; /** Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY */ SYSTEMTIME stSubmitted; /** Time of the submission of this Job */ - PWSTR pwszUserName; /** User that submitted the Job */ - PWSTR pwszNotifyName; /** User that shall be notified about the status of the Job */ - PWSTR pwszDocumentName; /** Name of the Document that is printed */ + PWSTR pwszUserName; /** Optional; User that submitted the Job */ + PWSTR pwszNotifyName; /** Optional; User that shall be notified about the status of the Job */ + PWSTR pwszDocumentName; /** Optional; Name of the Document that is printed */ PWSTR pwszDatatype; /** Datatype of the Document */ PWSTR pwszOutputFile; /** Output File to spool the Job to */ PWSTR pwszPrintProcessorParameters; /** Optional; Parameters for the chosen Print Processor */ 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] Mon Jul 20 15:21:03 2015 @@ -167,6 +167,7 @@ pPrinter->pwszPrinterName = AllocSplStr(wszPrinterName); pPrinter->pPrintProcessor = pPrintProcessor; + pPrinter->pPort = pPort; InitializePrinterJobList(pPrinter); // Get the printer driver. 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] Mon Jul 20 15:21:03 2015 @@ -78,6 +78,9 @@ DWORD i; PDATATYPES_INFO_1W pCurrentDatatype = pPrintProcessor->pDatatypesInfo1; + if (!pwszDatatype) + return FALSE; + for (i = 0; i < pPrintProcessor->dwDatatypeCount; i++) { if (wcsicmp(pCurrentDatatype->pName, pwszDatatype) == 0) @@ -94,6 +97,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PRINT_PROCESSOR pPrintProcessor; + + if (!pwszName) + return NULL; for (pEntry = _PrintProcessorList.Flink; pEntry != &_PrintProcessorList; pEntry = pEntry->Flink) {

1 0

[akhaldi] 68470: [OLE32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:12:15 2015 New Revision: 68470 URL: http://svn.reactos.org/svn/reactos?rev=68470&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/ole32/CMakeLists.txt trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/CMakeList… ============================================================================== --- trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -22,4 +22,9 @@ target_link_libraries(ole32_winetest uuid) set_module_type(ole32_winetest win32cui) add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32) + +if(MSVC) + add_importlibs(ole32_winetest ntdll) +endif() + add_cd_file(TARGET ole32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… ============================================================================== --- trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -102,7 +102,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -135,7 +135,8 @@ EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count, i; - trace("next: count %d cur %d\n", celt, This->cur); + if (winetest_debug > 1) + trace("next: count %d cur %d\n", celt, This->cur); if(!rgelt) return E_INVALIDARG; @@ -207,7 +208,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -1563,7 +1563,7 @@ ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); GetExitCodeThread(thread, &exitcode); hr = exitcode; - ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + ok(hr == RPC_E_WRONG_THREAD || broken(hr == S_OK) /* win8 */, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid); @@ -1973,7 +1973,12 @@ ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); - ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + if (lr) { + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", + GetLastError()); + RegCloseKey(clsidkey); + return; + } hr = pCoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… ============================================================================== --- trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -452,13 +452,16 @@ ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); - - hr = RevokeDragDrop(hwnd); - ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_refs == 0 || - broken(droptarget_refs == 1), /* NT4 */ - "DropTarget refs should be zero not %d\n", droptarget_refs); + + /* Win 8 releases the ref in OleUninitialize() */ + if (droptarget_refs >= 1) + { + hr = RevokeDragDrop(hwnd); + ok_ole_success(hr, "RevokeDragDrop"); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); + } hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -1688,6 +1688,113 @@ IStorage_Release(pStorage); } + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +static IStorage *create_storage( int num ) +{ + IStorage *stg; + IStream *stm; + HRESULT hr; + ULONG written; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_CreateStream( stg, CONTENTS, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); + ok( hr == S_OK, "got %08x\n", hr); + if (num == 1) /* Set biXPelsPerMeter = 0 */ + { + dib[0x26] = 0; + dib[0x27] = 0; + } + hr = IStream_Write( stm, dib, sizeof(dib), &written ); + ok( hr == S_OK, "got %08x\n", hr); + IStream_Release( stm ); + return stg; +} + +static void test_data_cache_dib_contents_stream(int num) +{ + HRESULT hr; + IUnknown *unk; + IPersistStorage *persist; + IDataObject *data; + IViewObject2 *view; + IStorage *stg; + FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM med; + CLSID cls; + SIZEL sz; + + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + + stg = create_storage( num ); + + hr = IPersistStorage_Load( persist, stg ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + IStorage_Release( stg ); + + hr = IPersistStorage_GetClassID( persist, &cls ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + ok( IsEqualCLSID( &cls, &CLSID_Picture_Dib ), "class id mismatch\n" ); + + hr = IDataObject_GetData( data, &fmt, &med ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (SUCCEEDED(hr)) + { + ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); + ReleaseStgMedium( &med ); + } + + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (num == 0) + { + ok( sz.cx == 1000, "got %d\n", sz.cx ); + ok( sz.cy == 250, "got %d\n", sz.cy ); + } + else + { + HDC hdc = GetDC( 0 ); + LONG x = 2 * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + LONG y = 1 * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + ok( sz.cx == x, "got %d %d\n", sz.cx, x ); + ok( sz.cy == y, "got %d %d\n", sz.cy, y ); + + ReleaseDC( 0, hdc ); + } + + IViewObject2_Release( view ); + IDataObject_Release( data ); + IPersistStorage_Release( persist ); + IUnknown_Release( unk ); +} + static void test_default_handler(void) { HRESULT hr; @@ -1970,14 +2077,90 @@ Unknown_Release }; +static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRunnableObject)) { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI OleRun_AddRef(IRunnableObject *iface) +{ + return 2; +} + +static ULONG WINAPI OleRun_Release(IRunnableObject *iface) +{ + return 1; +} + +static HRESULT WINAPI OleRun_GetRunningClass(IRunnableObject *iface, CLSID *clsid) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_Run(IRunnableObject *iface, LPBINDCTX ctx) +{ + ok(ctx == NULL, "got %p\n", ctx); + return 0xdeadc0de; +} + +static BOOL WINAPI OleRun_IsRunning(IRunnableObject *iface) +{ + ok(0, "unxpected\n"); + return FALSE; +} + +static HRESULT WINAPI OleRun_LockRunning(IRunnableObject *iface, BOOL lock, + BOOL last_unlock_closes) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_SetContainedObject(IRunnableObject *iface, BOOL contained) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static const IRunnableObjectVtbl oleruntestvtbl = +{ + OleRun_QueryInterface, + OleRun_AddRef, + OleRun_Release, + OleRun_GetRunningClass, + OleRun_Run, + OleRun_IsRunning, + OleRun_LockRunning, + OleRun_SetContainedObject +}; + static IUnknown unknown = { &UnknownVtbl }; +static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void) { HRESULT hr; + /* doesn't support IRunnableObject */ hr = OleRun(&unknown); ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); + + hr = OleRun((IUnknown*)&testrunnable); + ok(hr == 0xdeadc0de, "got 0x%08x\n", hr); } static void test_OleLockRunning(void) @@ -2393,6 +2576,8 @@ ok_ole_success(hr, "CoRevokeClassObject"); test_data_cache(); + test_data_cache_dib_contents_stream( 0 ); + test_data_cache_dib_contents_stream( 1 ); test_default_handler(); test_runnable(); test_OleRun(); Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… ============================================================================== --- trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -59,6 +59,201 @@ WideCharToMultiByte(CP_ACP, 0, strw1, -1, stra1, sizeof(stra1), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, strw2, -1, stra2, sizeof(stra2), NULL, NULL); return lstrcmpA(stra1, stra2); +} + +typedef struct TestLockBytes { + ILockBytes ILockBytes_iface; + LONG ref; + BYTE* contents; + ULONG size; + ULONG buffer_size; + HRESULT lock_hr; + ULONG locks_supported; + ULONG lock_called; +} TestLockBytes; + +static inline TestLockBytes *impl_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, TestLockBytes, ILockBytes_iface); +} + +static HRESULT WINAPI TestLockBytes_QueryInterface(ILockBytes *iface, REFIID iid, + void **ppv) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ILockBytes, iid)) + *ppv = &This->ILockBytes_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TestLockBytes_AddRef(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG WINAPI TestLockBytes_Release(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + return ref; +} + +static HRESULT WINAPI TestLockBytes_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbRead) pcbRead = &dummy; + + if (ulOffset.QuadPart >= This->size) + { + *pcbRead = 0; + return S_OK; + } + + cb = min(cb, This->size - ulOffset.QuadPart); + + *pcbRead = cb; + memcpy(pv, &This->contents[ulOffset.QuadPart], cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + HRESULT hr; + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbWritten) pcbWritten = &dummy; + + if (ulOffset.QuadPart + cb > This->size) + { + ULARGE_INTEGER new_size; + new_size.QuadPart = ulOffset.QuadPart + cb; + hr = ILockBytes_SetSize(iface, new_size); + if (FAILED(hr)) return hr; + } + + *pcbWritten = cb; + memcpy(&This->contents[ulOffset.QuadPart], pv, cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_SetSize(ILockBytes *iface, + ULARGE_INTEGER cb) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (This->buffer_size < cb.QuadPart) + { + ULONG new_buffer_size = max(This->buffer_size * 2, cb.QuadPart); + BYTE* new_buffer = HeapAlloc(GetProcessHeap(), 0, new_buffer_size); + if (!new_buffer) return E_OUTOFMEMORY; + memcpy(new_buffer, This->contents, This->size); + HeapFree(GetProcessHeap(), 0, This->contents); + This->contents = new_buffer; + } + + if (cb.QuadPart > This->size) + memset(&This->contents[This->size], 0, cb.QuadPart - This->size); + + This->size = cb.QuadPart; + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + This->lock_called++; + return This->lock_hr; +} + +static HRESULT WINAPI TestLockBytes_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + return This->lock_hr; +} + +static HRESULT WINAPI TestLockBytes_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + static const WCHAR dummy_name[] = {'d','u','m','m','y',0}; + + if (!pstatstg) return E_INVALIDARG; + + memset(pstatstg, 0, sizeof(STATSTG)); + + if (!(grfStatFlag & STATFLAG_NONAME)) + { + pstatstg->pwcsName = CoTaskMemAlloc(sizeof(dummy_name)); + if (!pstatstg->pwcsName) return E_OUTOFMEMORY; + memcpy(pstatstg->pwcsName, dummy_name, sizeof(dummy_name)); + } + + pstatstg->type = STGTY_LOCKBYTES; + pstatstg->cbSize.QuadPart = This->size; + pstatstg->grfLocksSupported = This->locks_supported; + + return S_OK; +} + +static ILockBytesVtbl TestLockBytes_Vtbl = { + TestLockBytes_QueryInterface, + TestLockBytes_AddRef, + TestLockBytes_Release, + TestLockBytes_ReadAt, + TestLockBytes_WriteAt, + TestLockBytes_Flush, + TestLockBytes_SetSize, + TestLockBytes_LockRegion, + TestLockBytes_UnlockRegion, + TestLockBytes_Stat +}; + +static void CreateTestLockBytes(TestLockBytes **This) +{ + *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**This)); + + if (*This) + { + (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; + (*This)->ref = 1; + } +} + +static void DeleteTestLockBytes(TestLockBytes *This) +{ + ok(This->ILockBytes_iface.lpVtbl == &TestLockBytes_Vtbl, "test lock bytes %p deleted with incorrect vtable\n", This); + ok(This->ref == 1, "test lock bytes %p deleted with %i references instead of 1\n", This, This->ref); + HeapFree(GetProcessHeap(), 0, This->contents); + HeapFree(GetProcessHeap(), 0, This); } static void test_hglobal_storage_stat(void) @@ -3157,22 +3352,22 @@ BOOL todo; }; -static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; -static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; -static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; -static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; -static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; -static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; -static const int tr_locked_bytes[] = { 0x93, -1 }; +static const int priority_locked_bytes[] = { 0x158, 0x181, 0x193, -1 }; +static const int rwex_locked_bytes[] = { 0x193, 0x1a7, 0x1bb, 0x1cf, -1 }; +static const int rw_locked_bytes[] = { 0x193, 0x1a7, -1 }; +static const int nosn_locked_bytes[] = { 0x16c, 0x193, 0x1a7, 0x1cf, -1 }; +static const int rwdw_locked_bytes[] = { 0x193, 0x1a7, 0x1cf, -1 }; +static const int wodw_locked_bytes[] = { 0x1a7, 0x1cf, -1 }; +static const int tr_locked_bytes[] = { 0x193, -1 }; static const int no_locked_bytes[] = { -1 }; -static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; - -static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; -static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; -static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; -static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; -static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; -static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; +static const int roex_locked_bytes[] = { 0x193, 0x1bb, 0x1cf, -1 }; + +static const int rwex_fail_ranges[] = { 0x193,0x1e3, -1 }; +static const int rw_fail_ranges[] = { 0x1bb,0x1e3, -1 }; +static const int rwdw_fail_ranges[] = { 0x1a7,0x1e3, -1 }; +static const int dw_fail_ranges[] = { 0x1a7,0x1cf, -1 }; +static const int tr_fail_ranges[] = { 0x1bb,0x1cf, -1 }; +static const int pr_fail_ranges[] = { 0x180,0x181, 0x1bb,0x1cf, -1 }; static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { @@ -3189,8 +3384,8 @@ { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, }; static BOOL can_open(LPCWSTR filename, DWORD access, DWORD sharing) @@ -3317,7 +3512,7 @@ ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY, 0, 1, 0, &ol)) locked = FALSE; @@ -3329,7 +3524,7 @@ UnlockFileEx(hfile, 0, 1, 0, &ol); - if ((ol.u.s.Offset&0xff) == *next_lock) + if ((ol.u.s.Offset&0x1ff) == *next_lock) { expect_locked = TRUE; next_lock++; @@ -3366,14 +3561,17 @@ ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (ol.u.s.Offset == 0x7fffff92 || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READWRITE)) || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READ))) continue; /* This makes opens hang */ - LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); + if (ol.u.s.Offset < 0x7fffff00) + LockFileEx(hfile, 0, 0, 1, 0, &ol); + else + LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); ok(hr == S_OK || hr == STG_E_LOCKVIOLATION || hr == STG_E_SHAREVIOLATION, "failed with unexpected hr %x\n", hr); @@ -3383,11 +3581,11 @@ failed = FAILED(hr); - if (!expect_failed && (ol.u.s.Offset&0xff) == next_range[0]) + if (!expect_failed && (ol.u.s.Offset&0x1ff) == next_range[0]) { expect_failed = TRUE; } - else if (expect_failed && (ol.u.s.Offset&0xff) == next_range[1]) + else if (expect_failed && (ol.u.s.Offset&0x1ff) == next_range[1]) { expect_failed = FALSE; next_range += 2; @@ -3644,6 +3842,54 @@ CloseHandle(hfile); DeleteFileA(filenameA); +} + +static void test_custom_lockbytes(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + TestLockBytes* lockbytes; + HRESULT hr; + IStorage* stg; + IStream* stm; + + CreateTestLockBytes(&lockbytes); + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + ok(!lockbytes->lock_called, "unexpected call to LockRegion\n"); + + lockbytes->locks_supported = LOCK_WRITE|LOCK_EXCLUSIVE|LOCK_ONLYONCE; + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + ok(lockbytes->lock_called, "expected LockRegion to be called\n"); + + lockbytes->lock_hr = STG_E_INVALIDFUNCTION; + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==STG_E_INVALIDFUNCTION, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + DeleteTestLockBytes(lockbytes); } START_TEST(storage32) @@ -3694,4 +3940,5 @@ test_locking(); test_transacted_shared(); test_overwrite(); -} + test_custom_lockbytes(); +} Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -50,13 +50,22 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); +ULONG __RPC_USER HBRUSH_UserSize(ULONG *, ULONG, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserMarshal(ULONG *, unsigned char *, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserUnmarshal(ULONG *, unsigned char *, HBRUSH *); +void __RPC_USER HBRUSH_UserFree(ULONG *, HBRUSH *); + +static BOOL g_expect_user_alloc; static void * WINAPI user_allocate(SIZE_T size) { + ok(g_expect_user_alloc, "unexpected user_allocate call\n"); return CoTaskMemAlloc(size); } +static BOOL g_expect_user_free; static void WINAPI user_free(void *p) { + ok(g_expect_user_free, "unexpected user_free call\n"); CoTaskMemFree(p); } @@ -207,7 +216,6 @@ GlobalUnlock(hglobal); actual_size = GlobalSize(hglobal); expected_size = actual_size + 5 * sizeof(DWORD); - trace("%d: actual size %d\n", block_size, actual_size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); /* native is poorly programmed and allocates 4/8 bytes more than it needs to @@ -410,7 +418,6 @@ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = HMETAFILEPICT_UserSize(&umcb.Flags, 0, &hmfp); ok(size > 20, "size should be at least 20 bytes, not %d\n", size); - trace("size is %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer, &hmfp); @@ -476,6 +483,17 @@ HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); HMETAFILEPICT_UserFree(&umcb.Flags, &hmfp2); +} + +typedef struct +{ + IUnknown IUnknown_iface; + LONG refs; +} TestUnknown; + +static inline TestUnknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TestUnknown, IUnknown_iface); } static HRESULT WINAPI Test_IUnknown_QueryInterface( @@ -498,12 +516,14 @@ static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) { - return 2; /* non-heap-based object */ + TestUnknown *This = impl_from_IUnknown(iface); + return InterlockedIncrement(&This->refs); } static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) { - return 1; /* non-heap-based object */ + TestUnknown *This = impl_from_IUnknown(iface); + return InterlockedDecrement(&This->refs); } static const IUnknownVtbl TestUnknown_Vtbl = @@ -548,7 +568,7 @@ /* the rest can be NULLs */ }; -static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; +static TestUnknown Test_Unknown = { {&TestUnknown_Vtbl}, 1 }; static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); @@ -588,7 +608,8 @@ /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then the result of CoMarshalInterface called with the LOWORD of the ctx */ - unk = &Test_Unknown; + unk = &Test_Unknown.IUnknown_iface; + Test_Unknown.refs = 1; CreateStreamOnHGlobal(h, TRUE, &stm); CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); @@ -596,15 +617,17 @@ IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos); marshal_size = pos.u.LowPart; marshal_data = GlobalLock(h); - trace("marshal_size %x\n", marshal_size); +todo_wine + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); ok(size >= marshal_size + 2 * sizeof(DWORD), "marshal size %x got %x\n", marshal_size, size); - trace("WdtpInterfacePointer_UserSize returned %x\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); +todo_wine + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); wireip = buffer; ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p\n", buffer_end, buffer); @@ -625,6 +648,7 @@ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); IUnknown_Release(unk2); @@ -657,7 +681,7 @@ unsigned char *buffer, *buffer_end, *expect_buffer, *expect_buffer_end; ULONG size, expect_size; STGMEDIUM med, med2; - IUnknown *unk = &Test_Unknown; + IUnknown *unk = &Test_Unknown.IUnknown_iface; IStream *stm = &Test_Stream; /* TYMED_NULL with pUnkForRelease */ @@ -753,6 +777,211 @@ STGMEDIUM_UserFree(&umcb.Flags, &med2); HeapFree(GetProcessHeap(), 0, expect_buffer); +} + +static void test_marshal_SNB(void) +{ + static const WCHAR str1W[] = {'s','t','r','i','n','g','1',0}; + static const WCHAR str2W[] = {'s','t','r','2',0}; + unsigned char *buffer, *src, *mbuf; + MIDL_STUB_MESSAGE stub_msg; + WCHAR **ptrW, *dataW; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + RemSNB *wiresnb; + SNB snb, snb2; + ULONG size; + + /* 4 bytes alignment */ + snb = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 3, &snb); + ok(size == 16, "Size should be 16, instead of %d\n", size); + + /* NULL block */ + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 12, "Size should be 12, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + mbuf = SNB_UserMarshal(&umcb.Flags, buffer, &snb); + ok(mbuf == buffer + size, "got %p, %p\n", mbuf, buffer + size); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 0, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 0, "got %u\n", wiresnb->ulCntChar); + ok(*(ULONG*)wiresnb->rgString == 0, "got %u\n", *(ULONG*)wiresnb->rgString); + + snb2 = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + ok(snb2 == NULL, "got %p\n", snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + SNB_UserFree(&umcb.Flags, &snb2); + + /* block with actual data */ + + /* allocate source block, n+1 pointers first, then data */ + src = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR*)*3 + sizeof(str1W) + sizeof(str2W)); + ptrW = (WCHAR**)src; + dataW = *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*)); + ptrW++; + *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*) + sizeof(str1W)); + ptrW++; + *ptrW = NULL; + lstrcpyW(dataW, str1W); + dataW += lstrlenW(str1W) + 1; + lstrcpyW(dataW, str2W); + + snb = (SNB)src; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 38, "Size should be 38, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserMarshal(&umcb.Flags, buffer, &snb); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 13, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 2, "got %u\n", wiresnb->ulCntChar); + /* payload length is stored one more time, as ULONG */ + ok(*(ULONG*)wiresnb->rgString == wiresnb->ulCntStr, "got %u\n", *(ULONG*)wiresnb->rgString); + dataW = &wiresnb->rgString[2]; + ok(!lstrcmpW(dataW, str1W), "marshalled string 0: %s\n", wine_dbgstr_w(dataW)); + dataW += sizeof(str1W)/sizeof(WCHAR); + ok(!lstrcmpW(dataW, str2W), "marshalled string 1: %s\n", wine_dbgstr_w(dataW)); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + + g_expect_user_alloc = TRUE; + snb2 = NULL; + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + g_expect_user_alloc = FALSE; + + ptrW = snb2; + ok(!lstrcmpW(*ptrW, str1W), "unmarshalled string 0: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(!lstrcmpW(*ptrW, str2W), "unmarshalled string 1: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(*ptrW == NULL, "expected terminating NULL ptr, got %p, start %p\n", *ptrW, snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + + g_expect_user_free = TRUE; + SNB_UserFree(&umcb.Flags, &snb2); + g_expect_user_free = FALSE; + + HeapFree(GetProcessHeap(), 0, src); +} + +static void test_marshal_HDC(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HDC hdc = GetDC(0), hdc2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHDC wirehdc; + ULONG size; + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HDC_UserSize(&umcb.Flags, 0, &hdc); + ok(size == sizeof(*wirehdc), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserMarshal(&umcb.Flags, buffer, &hdc); + wirehdc = (wireHDC)buffer; + ok(wirehdc->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehdc->fContext); + ok(wirehdc->u.hInproc == (LONG_PTR)hdc, "Marshaled value should be %p instead of %x\n", hdc, wirehdc->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserUnmarshal(&umcb.Flags, buffer, &hdc2); + ok(hdc == hdc2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HDC_UserFree(&umcb.Flags, &hdc2); + ReleaseDC(0, hdc); +} + +static void test_marshal_HICON(void) +{ + static const BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HICON hIcon, hIcon2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHICON wirehicon; + ULONG size; + + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + ok(hIcon != 0, "CreateIcon failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HICON_UserSize(&umcb.Flags, 0, &hIcon); + ok(size == sizeof(*wirehicon), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserMarshal(&umcb.Flags, buffer, &hIcon); + wirehicon = (wireHICON)buffer; + ok(wirehicon->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehicon->fContext); + ok(wirehicon->u.hInproc == (LONG_PTR)hIcon, "Marshaled value should be %p instead of %x\n", hIcon, wirehicon->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserUnmarshal(&umcb.Flags, buffer, &hIcon2); + ok(hIcon == hIcon2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HICON_UserFree(&umcb.Flags, &hIcon2); + DestroyIcon(hIcon); +} + +static void test_marshal_HBRUSH(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HBRUSH hBrush, hBrush2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + LOGBRUSH logbrush; + wireHBRUSH wirehbrush; + ULONG size; + + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(0, 0, 0); + logbrush.lbHatch = 0; + + hBrush = CreateBrushIndirect(&logbrush); + ok(hBrush != 0, "CreateBrushIndirect failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HBRUSH_UserSize(&umcb.Flags, 0, &hBrush); + ok(size == sizeof(*wirehbrush), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserMarshal(&umcb.Flags, buffer, &hBrush); + wirehbrush = (wireHBRUSH)buffer; + ok(wirehbrush->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehbrush->fContext); + ok(wirehbrush->u.hInproc == (LONG_PTR)hBrush, "Marshaled value should be %p instead of %x\n", hBrush, wirehbrush->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserUnmarshal(&umcb.Flags, buffer, &hBrush2); + ok(hBrush == hBrush2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HBRUSH_UserFree(&umcb.Flags, &hBrush2); + DeleteObject(hBrush); } START_TEST(usrmarshal) @@ -767,6 +996,10 @@ test_marshal_HMETAFILEPICT(); test_marshal_WdtpInterfacePointer(); test_marshal_STGMEDIUM(); + test_marshal_SNB(); + test_marshal_HDC(); + test_marshal_HICON(); + test_marshal_HBRUSH(); CoUninitialize(); }

1 0

[akhaldi] 68469: [OLE32] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:10:53 2015 New Revision: 68469 URL: http://svn.reactos.org/svn/reactos?rev=68469&view=rev Log: [OLE32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/filelockbytes.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2impl.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/olestd.h trunk/reactos/dll/win32/ole32/pointermoniker.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/filelockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filelockby… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2impl.c… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/olestd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/olestd.h?r… Modified: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 68468: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:09:55 2015 New Revision: 68468 URL: http://svn.reactos.org/svn/reactos?rev=68468&view=rev Log: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/odbccp32/CMakeLists.txt trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/CMakeL… ============================================================================== --- trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] Sun Jul 19 23:09:55 2015 @@ -1,5 +1,5 @@ add_executable(odbccp32_winetest misc.c testlist.c) set_module_type(odbccp32_winetest win32cui) -add_importlibs(odbccp32_winetest odbccp32 msvcrt kernel32) +add_importlibs(odbccp32_winetest odbccp32 advapi32 msvcrt kernel32) add_cd_file(TARGET odbccp32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Sun Jul 19 23:09:55 2015 @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "odbcinst.h" static void test_SQLConfigMode(void) @@ -129,9 +130,68 @@ ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); } +static void test_SQLWritePrivateProfileString(void) +{ + static const WCHAR odbc_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; + BOOL ret; + LONG reg_ret; + DWORD error_code; + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", ""); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", NULL); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, odbc_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + } + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + + /* Cleanup key */ + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + } +} + START_TEST(misc) { test_SQLConfigMode(); test_SQLInstallerError(); test_SQLInstallDriverManager(); + test_SQLWritePrivateProfileString(); }

1 0

[akhaldi] 68467: [ODBCCP32] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:09:04 2015 New Revision: 68467 URL: http://svn.reactos.org/svn/reactos?rev=68467&view=rev Log: [ODBCCP32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/dll/win32/odbccp32/odbccp32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Sun Jul 19 23:09:04 2015 @@ -59,6 +59,7 @@ static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n','e','n','t',' ','n','o','t',' ','f','o','u','n','d',0}; static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; +static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -76,6 +77,33 @@ { num_errors = 0; } + +static inline void * heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -239,7 +267,7 @@ BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS) { clear_errors(); - FIXME("\n"); + FIXME("%p %s\n", hwnd, debugstr_w(lpszDS)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -247,7 +275,7 @@ BOOL WINAPI SQLCreateDataSource(HWND hwnd, LPCSTR lpszDS) { clear_errors(); - FIXME("\n"); + FIXME("%p %s\n", hwnd, debugstr_a(lpszDS)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -256,7 +284,7 @@ WORD cbBufMax, WORD *pcbBufOut) { clear_errors(); - FIXME("\n"); + FIXME("%s %p %d %p\n", debugstr_w(lpszInfFile), lpszBuf, cbBufMax, pcbBufOut); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -265,7 +293,7 @@ WORD cbBufMax, WORD *pcbBufOut) { clear_errors(); - FIXME("\n"); + FIXME("%s %p %d %p\n", debugstr_a(lpszInfFile), lpszBuf, cbBufMax, pcbBufOut); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -273,6 +301,7 @@ BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) { clear_errors(); + TRACE("%p\n", pwConfigMode); if (pwConfigMode) *pwConfigMode = config_mode; return TRUE; @@ -290,6 +319,9 @@ BOOL success = FALSE; /* The value we will return */ clear_errors(); + + TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + if (!lpszBuf || cbBufMax == 0) { push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); @@ -345,6 +377,9 @@ int size_wbuf = cbBufMax; LPWSTR wbuf; WORD size_used; + + TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + wbuf = HeapAlloc(GetProcessHeap(), 0, size_wbuf*sizeof(WCHAR)); if (wbuf) { @@ -372,7 +407,9 @@ LPCWSTR lpszFilename) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %p %d %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), + debugstr_w(lpszDefault), RetBuffer, cbRetBuffer, + debugstr_w(lpszFilename)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -382,7 +419,9 @@ LPCSTR lpszFilename) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %p %d %s\n", debugstr_a(lpszSection), debugstr_a(lpszEntry), + debugstr_a(lpszDefault), RetBuffer, cbRetBuffer, + debugstr_a(lpszFilename)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -392,7 +431,8 @@ WORD *pcbPathOut, DWORD *pvOption) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %d %p %p %d %p %p\n", hwndParent, debugstr_w(lpszName), cbNameMax, + pcbNameOut, lpszPath, cbPathMax, pcbPathOut, pvOption); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -402,7 +442,8 @@ WORD *pcbPathOut, DWORD *pvOption) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %d %p %p %d %p %p\n", hwndParent, debugstr_a(lpszName), cbNameMax, + pcbNameOut, lpszPath, cbPathMax, pcbPathOut, pvOption); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -582,7 +623,8 @@ LPCWSTR lpszSrcPath, LPCWSTR lpszDrivers) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %s %s\n", hwndParent, debugstr_w(lpszInfFile), + debugstr_w(lpszSrcPath), debugstr_w(lpszDrivers)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -591,7 +633,8 @@ LPCSTR lpszSrcPath, LPCSTR lpszDrivers) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %s %s\n", hwndParent, debugstr_a(lpszInfFile), + debugstr_a(lpszSrcPath), debugstr_a(lpszDrivers)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -795,21 +838,21 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd) { clear_errors(); - FIXME("\n"); + FIXME("%p\n", hwnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) { - FIXME("\n"); + FIXME("%u %s\n", fErrorCode, debugstr_w(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) { - FIXME("\n"); + FIXME("%u %s\n", fErrorCode, debugstr_a(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -819,7 +862,8 @@ WORD *pcbString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s %d %p\n", debugstr_w(lpszFileName), debugstr_w(lpszAppName), + debugstr_w(lpszKeyName), debugstr_w(lpszString), cbString, pcbString); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -829,7 +873,8 @@ WORD *pcbString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s %d %p\n", debugstr_a(lpszFileName), debugstr_a(lpszAppName), + debugstr_a(lpszKeyName), debugstr_a(lpszString), cbString, pcbString); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -846,7 +891,7 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -855,7 +900,7 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -863,7 +908,7 @@ BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%p\n", pdwUsageCount); if (pdwUsageCount) *pdwUsageCount = 1; return TRUE; } @@ -871,7 +916,7 @@ BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_w(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -879,7 +924,7 @@ BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_a(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -887,7 +932,7 @@ BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); + FIXME("%s %p\n", debugstr_w(lpszTranslator), lpdwUsageCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -895,7 +940,7 @@ BOOL WINAPI SQLRemoveTranslator(LPCSTR lpszTranslator, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); + FIXME("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -903,6 +948,8 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) { clear_errors(); + TRACE("%u\n", wConfigMode); + if (wConfigMode > ODBC_SYSTEM_DSN) { push_error(ODBC_ERROR_INVALID_PARAM_SEQUENCE, odbc_error_invalid_param_sequence); @@ -918,7 +965,7 @@ BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_w(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -926,7 +973,7 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_a(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -934,7 +981,7 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { clear_errors(); - FIXME("\n"); + FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -942,7 +989,7 @@ BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { clear_errors(); - FIXME("\n"); + FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -951,7 +998,8 @@ LPCWSTR lpszKeyName, LPCWSTR lpszString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s\n", debugstr_w(lpszFileName), debugstr_w(lpszAppName), + debugstr_w(lpszKeyName), debugstr_w(lpszString)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -960,7 +1008,8 @@ LPCSTR lpszKeyName, LPCSTR lpszString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s\n", debugstr_a(lpszFileName), debugstr_a(lpszAppName), + debugstr_a(lpszKeyName), debugstr_a(lpszString)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -968,17 +1017,62 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { - clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LONG ret; + HKEY hkey; + WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; + + clear_errors(); + TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), + debugstr_w(lpszString), debugstr_w(lpszFilename)); + + if(!lpszFilename || !*lpszFilename) + { + push_error(ODBC_ERROR_INVALID_STR, odbc_error_invalid_param_string); + return FALSE; + } + + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeyfilename; + + if ((ret = RegCreateKeyW(hkey, lpszFilename, &hkeyfilename)) == ERROR_SUCCESS) + { + HKEY hkey_section; + + if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) + { + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + RegCloseKey(hkey_section); + } + + RegCloseKey(hkeyfilename); + } + + RegCloseKey(hkey); + } + + return ret == ERROR_SUCCESS; } BOOL WINAPI SQLWritePrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, LPCSTR lpszString, LPCSTR lpszFilename) { - clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + BOOL ret; + WCHAR *sect, *entry, *string, *file; + clear_errors(); + TRACE("%s %s %s %s\n", lpszSection, lpszEntry, lpszString, lpszFilename); + + sect = heap_strdupAtoW(lpszSection); + entry = heap_strdupAtoW(lpszEntry); + string = heap_strdupAtoW(lpszString); + file = heap_strdupAtoW(lpszFilename); + + ret = SQLWritePrivateProfileStringW(sect, entry, string, file); + + heap_free(sect); + heap_free(entry); + heap_free(string); + heap_free(file); + + return ret; +} Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] Sun Jul 19 23:09:04 2015 @@ -1,6 +1,6 @@ 2 stdcall SQLInstallDriver(str str str long ptr) 3 stdcall SQLInstallDriverManager(ptr long ptr) -4 stdcall SQLGetInstalledDrivers(str long ptr) +4 stdcall SQLGetInstalledDrivers(ptr long ptr) 5 stdcall SQLGetAvailableDrivers(str ptr long ptr) 6 stdcall SQLConfigDataSource(ptr long str str) 7 stdcall SQLRemoveDefaultDataSource() @@ -11,7 +11,7 @@ 12 stdcall SQLCreateDataSource(ptr str) 13 stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) 14 stdcall SQLWritePrivateProfileString(str str str str) -15 stdcall SQLGetPrivateProfileString(str str str str long str) +15 stdcall SQLGetPrivateProfileString(str str str ptr long str) 16 stdcall SQLValidDSN(str) 17 stdcall SQLRemoveDriverManager(ptr) 18 stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) @@ -31,7 +31,7 @@ 112 stub SelectTransDlg 202 stdcall SQLInstallDriverW(wstr wstr wstr long ptr) 203 stdcall SQLInstallDriverManagerW(ptr long ptr) -204 stdcall SQLGetInstalledDriversW(wstr long ptr) +204 stdcall SQLGetInstalledDriversW(ptr long ptr) 205 stdcall SQLGetAvailableDriversW(wstr ptr long ptr) 206 stdcall SQLConfigDataSourceW(ptr long wstr wstr) 208 stdcall SQLWriteDSNToIniW(wstr wstr) @@ -40,7 +40,7 @@ 212 stdcall SQLCreateDataSourceW(ptr wstr) 213 stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) 214 stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) -215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) +215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr ptr long wstr) 216 stdcall SQLValidDSNW(wstr) 218 stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) 219 stdcall SQLRemoveTranslatorW(wstr ptr) 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] Sun Jul 19 23:09:04 2015 @@ -144,7 +144,7 @@ reactos/dll/win32/ntprint # Synced to WineStaging-1.7.37 reactos/dll/win32/objsel # Synced to WineStaging-1.7.37 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68466: [MSXML3_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:07:29 2015 New Revision: 68466 URL: http://svn.reactos.org/svn/reactos?rev=68466&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Sun Jul 19 23:07:29 2015 @@ -2243,10 +2243,9 @@ ok( tag != NULL, "tag was null\n"); ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); SysFreeString( tag ); + + IXMLDOMElement_Release( element ); } - - if (element) - IXMLDOMElement_Release( element ); ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); free_bstrs();

1 0

[akhaldi] 68465: [MSXML3] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:07:13 2015 New Revision: 68465 URL: http://svn.reactos.org/svn/reactos?rev=68465&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xslpattern.l trunk/reactos/dll/win32/msxml3/xslpattern.yy.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2120,7 +2120,13 @@ case 1: /* Only takes UTF-8 strings. * NOT NULL-terminated. */ - SafeArrayAccessData(psa, (void**)&str); + hr = SafeArrayAccessData(psa, (void**)&str); + if (FAILED(hr)) + { + This->error = hr; + WARN("failed to access array data, 0x%08x\n", hr); + break; + } SafeArrayGetUBound(psa, 1, &len); if ((xmldoc = doparse(This, str, ++len, XML_CHAR_ENCODING_UTF8))) Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -1598,7 +1598,29 @@ FIXME("(%p)->(%p)\n", This, domNodeType); - *domNodeType = This->node.node->type; + switch (This->node.node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + /* we only care about this set of types, libxml2 type values are + exactly what we need */ + *domNodeType = (DOMNodeType)This->node.node->type; + break; + default: + *domNodeType = NODE_INVALID; + break; + } + return S_OK; } @@ -1997,9 +2019,11 @@ pUnk = create_doc_fragment( node ); break; case XML_DTD_NODE: + case XML_DOCUMENT_TYPE_NODE: pUnk = create_doc_type( node ); break; - default: { + case XML_ENTITY_NODE: + case XML_NOTATION_NODE: { unknode *new_node; FIXME("only creating basic node for type %d\n", node->type); @@ -2012,7 +2036,11 @@ new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; - } + break; + } + default: + ERR("Called for unsupported node type %d\n", node->type); + return NULL; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -646,7 +646,7 @@ { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, - NULL, hr, 0, msg, sizeof(msg), NULL)) + NULL, hr, 0, msg, sizeof(msg)/sizeof(msg[0]), NULL)) { FIXME("MSXML errors not yet supported.\n"); msg[0] = '\0'; Modified: trunk/reactos/dll/win32/msxml3/xslpattern.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -152,6 +152,7 @@ %% +xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; Modified: trunk/reactos/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2211,6 +2211,7 @@ +xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; 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] Sun Jul 19 23:07:13 2015 @@ -134,7 +134,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68464: [MSTASK_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:06:14 2015 New Revision: 68464 URL: http://svn.reactos.org/svn/reactos?rev=68464&view=rev Log: [MSTASK_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/mstask/task_scheduler.c Modified: trunk/rostests/winetests/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_sch… ============================================================================== --- trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] Sun Jul 19 23:06:14 2015 @@ -203,6 +203,27 @@ return; } +static void test_Enum(void) +{ + ITaskScheduler *scheduler; + IEnumWorkItems *tasks; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) { /* crashes on win2k */ + hr = ITaskScheduler_Enum(scheduler, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = ITaskScheduler_Enum(scheduler, &tasks); + ok(hr == S_OK, "got 0x%08x\n", hr); + IEnumWorkItems_Release(tasks); + + ITaskScheduler_Release(scheduler); +} START_TEST(task_scheduler) { @@ -211,5 +232,6 @@ test_Activate(); test_GetTargetComputer(); test_SetTargetComputer(); + test_Enum(); CoUninitialize(); }

1 0

[akhaldi] 68463: [MSTASK] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:05:56 2015 New Revision: 68463 URL: http://svn.reactos.org/svn/reactos?rev=68463&view=rev Log: [MSTASK] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_sche… ============================================================================== --- trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] Sun Jul 19 23:05:56 2015 @@ -26,9 +26,20 @@ LONG ref; } TaskSchedulerImpl; +typedef struct +{ + IEnumWorkItems IEnumWorkItems_iface; + LONG ref; +} EnumWorkItemsImpl; + static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) { return CONTAINING_RECORD(iface, TaskSchedulerImpl, ITaskScheduler_iface); +} + +static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) +{ + return CONTAINING_RECORD(iface, EnumWorkItemsImpl, IEnumWorkItems_iface); } static void TaskSchedulerDestructor(TaskSchedulerImpl *This) @@ -36,6 +47,103 @@ TRACE("%p\n", This); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); +} + +static HRESULT WINAPI EnumWorkItems_QueryInterface(IEnumWorkItems *iface, REFIID riid, void **obj) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumWorkItems) || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = &This->IEnumWorkItems_iface; + IEnumWorkItems_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumWorkItems_AddRef(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + InterlockedDecrement(&dll_ref); + } + + return ref; +} + +static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u %p %p): stub\n", This, count, names, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Clone(IEnumWorkItems *iface, IEnumWorkItems **cloned) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%p): stub\n", This, cloned); + return E_NOTIMPL; +} + +static const IEnumWorkItemsVtbl EnumWorkItemsVtbl = { + EnumWorkItems_QueryInterface, + EnumWorkItems_AddRef, + EnumWorkItems_Release, + EnumWorkItems_Next, + EnumWorkItems_Skip, + EnumWorkItems_Reset, + EnumWorkItems_Clone +}; + +static HRESULT create_task_enum(IEnumWorkItems **ret) +{ + EnumWorkItemsImpl *tasks; + + *ret = NULL; + + tasks = HeapAlloc(GetProcessHeap(), 0, sizeof(*tasks)); + if (!tasks) + return E_OUTOFMEMORY; + + tasks->IEnumWorkItems_iface.lpVtbl = &EnumWorkItemsVtbl; + tasks->ref = 1; + + *ret = &tasks->IEnumWorkItems_iface; + InterlockedIncrement(&dll_ref); + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( @@ -138,10 +246,16 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( ITaskScheduler* iface, - IEnumWorkItems **ppEnumTasks) -{ - FIXME("%p, %p: stub\n", iface, ppEnumTasks); - return E_NOTIMPL; + IEnumWorkItems **tasks) +{ + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + + TRACE("(%p)->(%p)\n", This, tasks); + + if (!tasks) + return E_INVALIDARG; + + return create_task_enum(tasks); } static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( 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] Sun Jul 19 23:05:56 2015 @@ -127,7 +127,7 @@ reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mstask # Synced to WineStaging-1.7.37 +reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68462: [MSI_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 23:04:56 2015 New Revision: 68462 URL: http://svn.reactos.org/svn/reactos?rev=68462&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/source.c Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=68… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2771,7 +2771,7 @@ DeleteFileA(msifile); } -#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */ +#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */ static void test_handle_limit(void) { int i; @@ -3190,7 +3190,8 @@ r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); /* check new values */ hrec = 0; Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2930,6 +2930,7 @@ if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); + goto error; } else { @@ -3012,6 +3013,7 @@ ok(delete_pf("msitest", FALSE), "Directory not created\n"); } +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3155,7 +3157,7 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); @@ -3177,7 +3179,7 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); @@ -4510,6 +4512,11 @@ skip("Not enough rights to perform tests\n"); goto error; } + else if (r == ERROR_INSTALL_FAILURE) + { + win_skip("broken result\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); ok(pf_exists("msitest\\helium"), "File not installed\n"); @@ -5078,7 +5085,7 @@ else { fileret = DeleteFileA(src); - ok(fileret, "Failed to delete file %s (%u)\n", src, GetLastError()); + ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%u)\n", src, GetLastError()); } } @@ -5888,7 +5895,8 @@ lstrcatA(log_file, "\\msitest.log"); MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); - test_MsiInstallProduct(); + if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */ + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); test_continuouscabs(); Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… ============================================================================== --- trunk/rostests/winetests/msi/patch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/patch.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -968,6 +968,29 @@ return r; } +static UINT find_entryW( MSIHANDLE hdb, const WCHAR *table, const WCHAR *entry ) +{ + static const WCHAR fmt[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','%','s','`',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + WCHAR query[0x100]; + MSIHANDLE hview, hrec; + UINT r; + + wsprintfW( query, fmt, table, entry ); + r = MsiDatabaseOpenViewW( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) { UINT r; @@ -1031,11 +1054,13 @@ static void test_system_tables( void ) { + static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; + static const WCHAR streamsW[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR CAB_msitest_encodedW[] = {0x3a8c,0x47cb,0x45b0,0x45ec,0x45a8,0x4837,0}; UINT r; char *cr; const char *query; MSIHANDLE hproduct, hdb, hview, hrec; - static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; if (!pMsiApplyPatchA) { @@ -1136,6 +1161,9 @@ r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entryW( hdb, streamsW, CAB_msitest_encodedW ); + ok( r == ERROR_NO_MORE_ITEMS, "failed to find entry %u\n", r ); query = "SELECT * FROM `_Storages`"; r = MsiDatabaseOpenViewA( hdb, query, &hview ); Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2887,6 +2887,24 @@ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz); ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt); + /* pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + lstrcpyA(label, "aaa"); + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, label, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label); + ok(id == 1, "Expected 1, got %d\n", id); + + /* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, NULL, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(id == 1, "Expected 1, got %d\n", id); + /* pcchVolumeLabel is exactly 5 */ lstrcpyA(label, "aaa"); labelsz = 5;

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