Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[cwittich] 68297: [KERNEL32] replace Utf7ToWideChar with wine version

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 28 09:00:03 2015 New Revision: 68297 URL: http://svn.reactos.org/svn/reactos?rev=68297&view=rev Log: [KERNEL32] replace Utf7ToWideChar with wine version Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 09:00:03 2015 @@ -1269,168 +1269,121 @@ return GetCPFileNameFromRegistry(CodePage, NULL, 0); } -static const signed char -base64inv[] = -{ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 -}; - -static VOID Utf7Base64Decode(BYTE *pbDest, LPCSTR pszSrc, INT cchSrc) -{ - INT i, j, n; - BYTE b; - - for(i = 0; i < cchSrc / 4 * 4; i += 4) - { - for(j = n = 0; j < 4; ) - { - b = (BYTE) base64inv[(BYTE) *pszSrc++]; - n |= (((INT) b) << ((3 - j) * 6)); - j++; - } - for(j = 0; j < 3; j++) - *pbDest++ = (BYTE) ((n >> (8 * (2 - j))) & 0xFF); - } - for(j = n = 0; j < cchSrc % 4; ) - { - b = (BYTE) base64inv[(BYTE) *pszSrc++]; - n |= (((INT) b) << ((3 - j) * 6)); - j++; - } - for(j = 0; j < ((cchSrc % 4) * 6 / 8); j++) - *pbDest++ = (BYTE) ((n >> (8 * (2 - j))) & 0xFF); -} - -static VOID myswab(LPVOID pv, INT cw) -{ - LPBYTE pb = (LPBYTE) pv; - BYTE b; - while(cw > 0) - { - b = *pb; - *pb = pb[1]; - pb[1] = b; - pb += 2; - cw--; - } -} - -static INT Utf7ToWideCharSize(LPCSTR pszUtf7, INT cchUtf7) -{ - INT n, c, cch; - CHAR ch; - LPCSTR pch; - - c = 0; - while(cchUtf7 > 0) - { - ch = *pszUtf7++; - if (ch == '+') - { - ch = *pszUtf7; - if (ch == '-') - { - c++; - pszUtf7++; - cchUtf7 -= 2; +static inline BOOL utf7_write_w(WCHAR *dst, int dstlen, int *index, WCHAR character) +{ + if (dstlen > 0) + { + if (*index >= dstlen) + return FALSE; + + dst[*index] = character; + } + + (*index)++; + + return TRUE; +} + +static INT Utf7ToWideChar(const char *src, int srclen, WCHAR *dst, int dstlen) +{ + static const signed char base64_decoding_table[] = + { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20-0x2F */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40-0x4F */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60-0x6F */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70-0x7F */ + }; + + const char *source_end = src + srclen; + int dest_index = 0; + + DWORD byte_pair = 0; + short offset = 0; + + while (src < source_end) + { + if (*src == '+') + { + src++; + if (src >= source_end) + break; + + if (*src == '-') + { + /* just a plus sign escaped as +- */ + if (!utf7_write_w(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; continue; } - cchUtf7--; - pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && - base64inv[*pszUtf7] >= 0) - { - cchUtf7--; - pszUtf7++; - } - cch = pszUtf7 - pch; - n = (cch * 3) / 8; - c += n; - if (cchUtf7 > 0 && *pszUtf7 == '-') - { - pszUtf7++; - cchUtf7--; - } + + do + { + signed char sextet = *src; + if (sextet == '-') + { + /* skip over the dash and end base64 decoding + * the current, unfinished byte pair is discarded */ + src++; + offset = 0; + break; + } + if (sextet < 0) + { + /* the next character of src is < 0 and therefore not part of a base64 sequence + * the current, unfinished byte pair is NOT discarded in this case + * this is probably a bug in Windows */ + break; + } + + sextet = base64_decoding_table[sextet]; + if (sextet == -1) + { + /* -1 means that the next character of src is not part of a base64 sequence + * in other words, all sextets in this base64 sequence have been processed + * the current, unfinished byte pair is discarded */ + offset = 0; + break; + } + + byte_pair = (byte_pair << 6) | sextet; + offset += 6; + + if (offset >= 16) + { + /* this byte pair is done */ + if (!utf7_write_w(dst, dstlen, &dest_index, (byte_pair >> (offset - 16)) & 0xFFFF)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + offset -= 16; + } + + src++; + } + while (src < source_end); } else { - c++; - cchUtf7--; - } - } - - return c; -} - -static INT Utf7ToWideChar(LPCSTR pszUtf7, INT cchUtf7, LPWSTR pszWide, INT cchWide) -{ - INT n, c, cch; - CHAR ch; - LPCSTR pch; - WORD *pwsz; - - c = Utf7ToWideCharSize(pszUtf7, cchUtf7); - if (cchWide == 0) - return c; - - if (cchWide < c) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - - while(cchUtf7 > 0) - { - ch = *pszUtf7++; - if (ch == '+') - { - if (*pszUtf7 == '-') - { - *pszWide++ = L'+'; - pszUtf7++; - cchUtf7 -= 2; - continue; - } - cchUtf7--; - pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && - base64inv[*pszUtf7] >= 0) - { - cchUtf7--; - pszUtf7++; - } - cch = pszUtf7 - pch; - n = (cch * 3) / 8; - pwsz = (WORD *) HeapAlloc(GetProcessHeap(), 0, (n + 1) * sizeof(WORD)); - if (pwsz == NULL) + /* we have to convert to unsigned char in case *src < 0 */ + if (!utf7_write_w(dst, dstlen, &dest_index, (unsigned char)*src)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; - ZeroMemory(pwsz, n * sizeof(WORD)); - Utf7Base64Decode((BYTE *) pwsz, pch, cch); - myswab(pwsz, n); - CopyMemory(pszWide, pwsz, n * sizeof(WORD)); - HeapFree(GetProcessHeap(), 0, pwsz); - pszWide += n; - if (cchUtf7 > 0 && *pszUtf7 == '-') - { - pszUtf7++; - cchUtf7--; - } - } - else - { - *pszWide++ = (WCHAR) ch; - cchUtf7--; - } - } - - return c; + } + src++; + } + } + + return dest_index; } /**

9 years, 5 months

[cwittich] 68296: fix a typo

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jun 27 19:30:17 2015 New Revision: 68296 URL: http://svn.reactos.org/svn/reactos?rev=68296&view=rev Log: fix a typo Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Jun 27 19:30:17 2015 @@ -2188,7 +2188,7 @@ Cell = Kcb->KeyCell; CmHive = (PCMHIVE)Hive; - /* Fail if the key is no a hive root key */ + /* Fail if the key is not a hive root key */ if (Cell != Hive->BaseBlock->RootCell) { DPRINT1("Key is not a hive root key!\n");

9 years, 5 months

[ekohl] 68295: [NTOSKRNL] Implement NtUnloadKey2. TODO: Destroy the unlinked hive. CORE-3094

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 27 19:26:12 2015 New Revision: 68295 URL: http://svn.reactos.org/svn/reactos?rev=68295&view=rev Log: [NTOSKRNL] Implement NtUnloadKey2. TODO: Destroy the unlinked hive. CORE-3094 Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -2127,13 +2127,123 @@ return Status; } +static +BOOLEAN +NTAPI +CmpUnlinkHiveFromMaster(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCELL_DATA CellData; + HCELL_INDEX LinkCell; + NTSTATUS Status; + + DPRINT("CmpUnlinkHiveFromMaster()\n"); + + /* Get the cell data */ + CellData = HvGetCell(Hive, Cell); + if (CellData == NULL) + return FALSE; + + /* Get the link cell and release the current cell */ + LinkCell = CellData->u.KeyNode.Parent; + HvReleaseCell(Hive, Cell); + + /* Remove the link cell from the master hive */ + CmpLockHiveFlusherExclusive(CmiVolatileHive); + Status = CmpFreeKeyByCell((PHHIVE)CmiVolatileHive, + LinkCell, + TRUE); + CmpUnlockHiveFlusher(CmiVolatileHive); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CmpFreeKeyByCell() failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + /* Remove this hive */ + RemoveEntryList(&((PCMHIVE)Hive)->HiveList); + + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); + + return TRUE; +} + NTSTATUS NTAPI CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Flags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PHHIVE Hive; + PCMHIVE CmHive; + HCELL_INDEX Cell; + + DPRINT("CmUnloadKey(%p, %lx)\n", Kcb, Flags); + + /* Get the hive */ + Hive = Kcb->KeyHive; + Cell = Kcb->KeyCell; + CmHive = (PCMHIVE)Hive; + + /* Fail if the key is no a hive root key */ + if (Cell != Hive->BaseBlock->RootCell) + { + DPRINT1("Key is not a hive root key!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Fail if we try to unload the master hive */ + if (CmHive == CmiVolatileHive) + { + DPRINT1("Do not try to unload the master hive!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Flush the hive */ + CmFlushKey(Kcb, TRUE); + + /* Unlink the hive from the master hive */ + if (!CmpUnlinkHiveFromMaster(Hive, Cell)) + { + DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); + + /* Remove the unloading flag */ + Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Clean up information we have on the subkey */ + CmpCleanUpSubKeyInfo(Kcb->ParentKcb); + + /* Set the KCB in delete mode and remove it */ + Kcb->Delete = TRUE; + CmpRemoveKeyControlBlock(Kcb); + + if (Flags != REG_FORCE_UNLOAD) + { + /* Release the KCB locks */ + CmpReleaseTwoKcbLockByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); + + /* Release the hive loading lock */ + ExReleasePushLockExclusive(&CmpLoadHiveLock); + } + + /* Release hive lock */ + CmpUnlockRegistry(); + + /* Close file handles */ + CmpCloseHiveFiles(CmHive); + + /* Remove the hive from the hive file list */ + CmpRemoveFromHiveFileList(CmHive); + + /* FIXME: Destroy the hive */ + + return STATUS_SUCCESS; } ULONG Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -626,3 +626,19 @@ ZwClose(EventHandle); return STATUS_SUCCESS; } + +VOID +NTAPI +CmpCloseHiveFiles(IN PCMHIVE Hive) +{ + ULONG i; + + for (i = 0; i < HFILE_TYPE_MAX; i++) + { + if (Hive->FileHandles[i] != NULL) + { + ZwClose(Hive->FileHandles[i]); + Hive->FileHandles[i] = NULL; + } + } +} Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -2138,7 +2138,6 @@ { PLIST_ENTRY ListEntry; PCMHIVE Hive; - ULONG i; /* Kill the workers */ if (!CmFirstTime) CmpShutdownWorkers(); @@ -2153,14 +2152,7 @@ { Hive = CONTAINING_RECORD(ListEntry, CMHIVE, HiveList); - for (i = 0; i < HFILE_TYPE_MAX; i++) - { - if (Hive->FileHandles[i] != NULL) - { - ZwClose(Hive->FileHandles[i]); - Hive->FileHandles[i] = NULL; - } - } + CmpCloseHiveFiles(Hive); ListEntry = ListEntry->Flink; } Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -1372,7 +1372,6 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, IN ULONG Flags) { -#if 0 NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING ObjectName; @@ -1381,6 +1380,7 @@ PCM_KEY_BODY KeyBody = NULL; ULONG ParentConv = 0, ChildConv = 0; HANDLE Handle; + PAGED_CODE(); /* Validate privilege */ @@ -1515,11 +1515,11 @@ { if (Flags != REG_FORCE_UNLOAD) { + /* Release two KCBs lock */ + CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); + /* Release the hive loading lock */ ExReleasePushLockExclusive(&CmpLoadHiveLock); - - /* Release two KCBs lock */ - CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); } /* Unlock the registry */ @@ -1532,19 +1532,15 @@ /* Return status */ return Status; -#else +} + +NTSTATUS +NTAPI +NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN HANDLE Event) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; -#endif -} - -NTSTATUS -NTAPI -NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN HANDLE Event) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -828,6 +828,12 @@ OUT PULONG ClusterSize OPTIONAL ); +VOID +NTAPI +CmpCloseHiveFiles( + IN PCMHIVE Hive +); + NTSTATUS NTAPI CmpInitHiveFromFile(

9 years, 5 months

[akhaldi] 68294: [KBSWITCH] Improve mouse events handling. By Joachim Henze. CORE-9883

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 27 17:15:38 2015 New Revision: 68294 URL: http://svn.reactos.org/svn/reactos?rev=68294&view=rev Log: [KBSWITCH] Improve mouse events handling. By Joachim Henze. CORE-9883 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Jun 27 17:15:38 2015 @@ -434,18 +434,17 @@ case WM_NOTIFYICONMSG: switch (lParam) { - case WM_RBUTTONDOWN: - case WM_LBUTTONDOWN: + case WM_RBUTTONUP: + case WM_LBUTTONUP: { POINT pt; GetCursorPos(&pt); SetForegroundWindow(hwnd); - if (lParam == WM_LBUTTONDOWN) + if (lParam == WM_LBUTTONUP) { HMENU hLeftPopupMenu; - /* Rebuild the left popup menu on every click to take care of keyboard layout changes */ hLeftPopupMenu = BuildLeftPopupMenu(); TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);

9 years, 6 months

[akhaldi] 68293: [DESK] Use pixels instead of Pixel. By Jared Smudde. CORE-9738

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 27 17:09:04 2015 New Revision: 68293 URL: http://svn.reactos.org/svn/reactos?rev=68293&view=rev Log: [DESK] Use pixels instead of Pixel. By Jared Smudde. CORE-9738 Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "High Color (16 Bit)" IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -207,7 +207,7 @@ IDS_COLOR_16BIT "Moyenne (16 Bits)" IDS_COLOR_24BIT "Vraies couleurs (24 Bits)" IDS_COLOR_32BIT "Optimale (32 Bits)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "Warna Tinggi (16 Bit)" IDS_COLOR_24BIT "Warna Asli (24 Bit)" IDS_COLOR_32BIT "Warna Asli (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "High Color (16 Bit)" IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "Hoge kleuren (16 Bit)" IDS_COLOR_24BIT "Ware kleuren (24 Bit)" IDS_COLOR_32BIT "Ware kleuren (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -209,7 +209,7 @@ IDS_COLOR_16BIT "Ngjyra Larta (16 Bit)" IDS_COLOR_24BIT "Ngjyra Verteta (24 Bit)" IDS_COLOR_32BIT "Ngjyra Verteta (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE

9 years, 6 months

[cfinck] 68292: [LOCALSPL] - Write the shadow file after changing job details. - dwUnknown2 in the shadow file header is actually the offset of the Print Processor Parameters. - Process all known f...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jun 27 15:37:14 2015 New Revision: 68292 URL: http://svn.reactos.org/svn/reactos?rev=68292&view=rev Log: [LOCALSPL] - Write the shadow file after changing job details. - dwUnknown2 in the shadow file header is actually the offset of the Print Processor Parameters. - Process all known fields of the shadow file in ReadJobShadowFile and WriteJobShadowFile. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h 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] Sat Jun 27 15:37:14 2015 @@ -831,10 +831,14 @@ BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { + const WCHAR wszFolder[] = L"\\PRINTERS\\"; + const DWORD cchFolder = _countof(wszFolder) - 1; + DWORD dwErrorCode; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; + WCHAR wszFullPath[MAX_PATH]; // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; @@ -867,6 +871,14 @@ if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; + + // Construct the full path to the shadow file. + CopyMemory(wszFullPath, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); + CopyMemory(&wszFullPath[cchSpoolDirectory], wszFolder, cchFolder * sizeof(WCHAR)); + swprintf(&wszFullPath[cchSpoolDirectory + cchFolder], L"%05lu.SHD", JobId); + + // Write the job data into the shadow file. + WriteJobShadowFile(wszFullPath, pJob); // Perform an additional command if desired. if (Command) @@ -983,8 +995,10 @@ PLOCAL_JOB pJob; PLOCAL_JOB pReturnValue = NULL; PLOCAL_PRINTER pPrinter; + PLOCAL_PRINT_PROCESSOR pPrintProcessor; PSHD_HEADER pShadowFile = NULL; PWSTR pwszPrinterName; + PWSTR pwszPrintProcessor; // Try to open the file. hFile = CreateFileW(pwszFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -1022,7 +1036,16 @@ pPrinter = LookupElementSkiplist(&PrinterList, &pwszPrinterName, NULL); if (!pPrinter) { - ERR("Shadow file \"%S\" references a non-existing printer!\n", pwszFilePath); + ERR("Shadow file \"%S\" references a non-existing printer \"%S\"!\n", pwszFilePath, pwszPrinterName); + goto Cleanup; + } + + // Retrieve the associated Print Processor from the list. + pwszPrintProcessor = (PWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessor); + pPrintProcessor = FindPrintProcessor(pwszPrintProcessor); + if (!pPrintProcessor) + { + ERR("Shadow file \"%S\" references a non-existing Print Processor \"%S\"!\n", pwszFilePath, pwszPrintProcessor); goto Cleanup; } @@ -1035,12 +1058,22 @@ } pJob->dwJobID = pShadowFile->dwJobID; + pJob->dwPriority = pShadowFile->dwPriority; + pJob->dwStartTime = pShadowFile->dwStartTime; pJob->dwTotalPages = pShadowFile->dwTotalPages; - pJob->dwPriority = pShadowFile->dwPriority; + pJob->dwUntilTime = pShadowFile->dwUntilTime; pJob->pPrinter = pPrinter; + pJob->pPrintProcessor = pPrintProcessor; pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); - pJob->pwszOutputFile = NULL; + pJob->pwszMachineName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offMachineName)); + 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)); CopyMemory(&pJob->DevMode, (PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode), sizeof(DEVMODEW)); @@ -1057,31 +1090,48 @@ } BOOL -WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob) +WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob) { BOOL bReturnValue = FALSE; DWORD cbDatatype; DWORD cbDocumentName; DWORD cbFileSize; + DWORD cbMachineName; + DWORD cbNotifyName; + DWORD cbPrinterDriver; DWORD cbPrinterName; + DWORD cbPrintProcessor; + DWORD cbPrintProcessorParameters = 0; + DWORD cbUserName; DWORD cbWritten; DWORD dwCurrentOffset; - HANDLE hFile = INVALID_HANDLE_VALUE; + HANDLE hSHDFile = INVALID_HANDLE_VALUE; + HANDLE hSPLFile = INVALID_HANDLE_VALUE; PSHD_HEADER pShadowFile = NULL; - // Try to open the file. - hFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) + // Try to open the SHD file. + hSHDFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); + if (hSHDFile == INVALID_HANDLE_VALUE) { ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Compute the total size of the shadow file. - cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - cbFileSize = sizeof(SHD_HEADER) + cbPrinterName + cbDatatype + cbDocumentName + sizeof(DEVMODEW); + 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. + if (pJob->pwszPrintProcessorParameters) + cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + sizeof(DEVMODEW) + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; // Allocate memory for it. pShadowFile = DllAllocSplMem(cbFileSize); @@ -1097,32 +1147,68 @@ // Copy the values. pShadowFile->dwJobID = pJob->dwJobID; + pShadowFile->dwPriority = pJob->dwPriority; + pShadowFile->dwStartTime = pJob->dwStartTime; pShadowFile->dwTotalPages = pJob->dwTotalPages; - pShadowFile->dwPriority = pJob->dwPriority; + pShadowFile->dwUntilTime = pJob->dwUntilTime; CopyMemory(&pShadowFile->stSubmitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); + + // Determine the file size of the .SPL file + wcscpy(wcsrchr(pwszFilePath, L'.'), L".SPL"); + hSPLFile = CreateFileW(pwszFilePath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if (hSPLFile != INVALID_HANDLE_VALUE) + pShadowFile->dwSPLSize = GetFileSize(hSPLFile, NULL); // Add the extra values that are stored as offsets in the shadow file. // The first value begins right after the shadow file header. dwCurrentOffset = sizeof(SHD_HEADER); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDatatype, cbDatatype); + pShadowFile->offDatatype = dwCurrentOffset; + dwCurrentOffset += cbDatatype; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); + pShadowFile->offDocumentName = dwCurrentOffset; + dwCurrentOffset += cbDocumentName; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); + pShadowFile->offDevMode = dwCurrentOffset; + dwCurrentOffset += sizeof(DEVMODEW); + + // offDriverName is only written, but automatically determined through offPrinterName when reading. + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterDriver, cbPrinterDriver); + pShadowFile->offDriverName = dwCurrentOffset; + dwCurrentOffset += cbPrinterDriver; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszMachineName, cbMachineName); + 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; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDatatype, cbDatatype); - pShadowFile->offDatatype = dwCurrentOffset; - dwCurrentOffset += cbDatatype; - - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); - pShadowFile->offDocumentName = dwCurrentOffset; - dwCurrentOffset += cbDocumentName; - - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); - pShadowFile->offDevMode = dwCurrentOffset; - dwCurrentOffset += sizeof(DEVMODEW); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrintProcessor->pwszName, cbPrintProcessor); + pShadowFile->offPrintProcessor = dwCurrentOffset; + dwCurrentOffset += cbPrintProcessor; + + if (cbPrintProcessorParameters) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); + pShadowFile->offPrintProcessorParameters = dwCurrentOffset; + dwCurrentOffset += cbPrintProcessorParameters; + } + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); + pShadowFile->offUserName = dwCurrentOffset; + dwCurrentOffset += cbUserName; // Write the file. - if (!WriteFile(hFile, pShadowFile, cbFileSize, &cbWritten, NULL)) + if (!WriteFile(hSHDFile, pShadowFile, cbFileSize, &cbWritten, NULL)) { ERR("WriteFile failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; @@ -1134,8 +1220,11 @@ if (pShadowFile) DllFreeSplMem(pShadowFile); - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle(hFile); + if (hSHDFile != INVALID_HANDLE_VALUE) + CloseHandle(hSHDFile); + + if (hSPLFile != INVALID_HANDLE_VALUE) + CloseHandle(hSPLFile); return bReturnValue; } 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] Sat Jun 27 15:37:14 2015 @@ -164,7 +164,7 @@ DWORD offDevMode; DWORD offPrintProcessor; DWORD offDatatype; - DWORD dwUnknown2; + DWORD offPrintProcessorParameters; SYSTEMTIME stSubmitted; DWORD dwStartTime; DWORD dwUntilTime; @@ -191,7 +191,7 @@ BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); -BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob); +BOOL WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob); // main.c extern const WCHAR wszCurrentEnvironment[];

9 years, 6 months

[pschweitzer] 68291: [NTFS] When dumping attributes, also dump attributes from the $ATTRIBUTE_LIST if present

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 27 15:06:25 2015 New Revision: 68291 URL: http://svn.reactos.org/svn/reactos?rev=68291&view=rev Log: [NTFS] When dumping attributes, also dump attributes from the $ATTRIBUTE_LIST if present Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sat Jun 27 15:06:25 2015 @@ -184,7 +184,53 @@ static VOID -NtfsDumpAttribute(PNTFS_ATTR_RECORD Attribute) +NtfsDumpAttribute(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_RECORD Attribute); + + +static +VOID +NtfsDumpAttributeListAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_RECORD Attribute) +{ + PNTFS_ATTR_CONTEXT ListContext; + PVOID ListBuffer; + ULONGLONG ListSize; + + ListContext = PrepareAttributeContext(Attribute); + + ListSize = AttributeDataLength(&ListContext->Record); + if (ListSize <= 0xFFFFFFFF) + ListBuffer = ExAllocatePoolWithTag(NonPagedPool, (ULONG)ListSize, TAG_NTFS); + else + ListBuffer = NULL; + + if (!ListBuffer) + { + DPRINT("Failed to allocate memory: %x\n", (ULONG)ListSize); + return; + } + + if (ReadAttribute(Vcb, ListContext, 0, ListBuffer, (ULONG)ListSize) == ListSize) + { + Attribute = (PNTFS_ATTR_RECORD)ListBuffer; + while (Attribute < (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize) && + Attribute->Type != AttributeEnd) + { + NtfsDumpAttribute(Vcb, Attribute); + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + ReleaseAttributeContext(ListContext); + ExFreePoolWithTag(ListBuffer, TAG_NTFS); + } +} + + +static +VOID +NtfsDumpAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_RECORD Attribute) { UNICODE_STRING Name; @@ -202,7 +248,7 @@ break; case AttributeAttributeList: - DbgPrint(" $ATTRIBUTE_LIST "); + NtfsDumpAttributeListAttribute(Vcb, Attribute); break; case AttributeObjectId: @@ -264,32 +310,36 @@ break; } - if (Attribute->NameLength != 0) - { - Name.Length = Attribute->NameLength * sizeof(WCHAR); - Name.MaximumLength = Name.Length; - Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset); - - DbgPrint("'%wZ' ", &Name); - } - - DbgPrint("(%s)\n", - Attribute->IsNonResident ? "non-resident" : "resident"); - - if (Attribute->IsNonResident) - { - FindRun(Attribute,0,&lcn, &runcount); - - DbgPrint(" AllocatedSize %I64u DataSize %I64u\n", - Attribute->NonResident.AllocatedSize, Attribute->NonResident.DataSize); - DbgPrint(" logical clusters: %I64u - %I64u\n", - lcn, lcn + runcount - 1); - } -} - - -VOID -NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord) + if (Attribute->Type != AttributeAttributeList) + { + if (Attribute->NameLength != 0) + { + Name.Length = Attribute->NameLength * sizeof(WCHAR); + Name.MaximumLength = Name.Length; + Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset); + + DbgPrint("'%wZ' ", &Name); + } + + DbgPrint("(%s)\n", + Attribute->IsNonResident ? "non-resident" : "resident"); + + if (Attribute->IsNonResident) + { + FindRun(Attribute,0,&lcn, &runcount); + + DbgPrint(" AllocatedSize %I64u DataSize %I64u\n", + Attribute->NonResident.AllocatedSize, Attribute->NonResident.DataSize); + DbgPrint(" logical clusters: %I64u - %I64u\n", + lcn, lcn + runcount - 1); + } + } +} + + +VOID +NtfsDumpFileAttributes(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord) { PNTFS_ATTR_RECORD Attribute; @@ -297,7 +347,7 @@ while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && Attribute->Type != AttributeEnd) { - NtfsDumpAttribute(Attribute); + NtfsDumpAttribute(Vcb, Attribute); Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sat Jun 27 15:06:25 2015 @@ -51,7 +51,7 @@ if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); - NtfsDumpFileAttributes(FileRecord); + NtfsDumpFileAttributes(DeviceExt, FileRecord); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -85,7 +85,7 @@ if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); - NtfsDumpFileAttributes(FileRecord); + NtfsDumpFileAttributes(DeviceExt, FileRecord); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -135,7 +135,7 @@ if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); - NtfsDumpFileAttributes(FileRecord); + NtfsDumpFileAttributes(DeviceExt, FileRecord); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -186,7 +186,7 @@ if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); - NtfsDumpFileAttributes(FileRecord); + NtfsDumpFileAttributes(DeviceExt, FileRecord); return STATUS_OBJECT_NAME_NOT_FOUND; } ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Jun 27 15:06:25 2015 @@ -327,10 +327,10 @@ } /* Enumerate attributes */ - NtfsDumpFileAttributes(DeviceExt->MasterFileTable); + NtfsDumpFileAttributes(DeviceExt, DeviceExt->MasterFileTable); /* Enumerate attributes */ - NtfsDumpFileAttributes(VolumeRecord); + NtfsDumpFileAttributes(DeviceExt, VolumeRecord); /* Get volume name */ Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, L"", 0, &AttrCtxt); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jun 27 15:06:25 2015 @@ -486,7 +486,7 @@ ULONGLONG *DataRunLength); VOID -NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); +NtfsDumpFileAttributes(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER FileRecord); PSTANDARD_INFORMATION GetStandardInformationFromRecord(PFILE_RECORD_HEADER FileRecord); @@ -667,6 +667,9 @@ /* mft.c */ +PNTFS_ATTR_CONTEXT +PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord); + VOID ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context);

9 years, 6 months

[pschweitzer] 68290: [NTFS] While handling IRP_MN_QUERY_DIRECTORY, in case there is no $FILE_NAME attribute, dump file attributes & MFT ID. This fixes ASSERT failure when browsing some Win7 volumes

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 27 13:40:05 2015 New Revision: 68290 URL: http://svn.reactos.org/svn/reactos?rev=68290&view=rev Log: [NTFS] While handling IRP_MN_QUERY_DIRECTORY, in case there is no $FILE_NAME attribute, dump file attributes & MFT ID. This fixes ASSERT failure when browsing some Win7 volumes Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sat Jun 27 13:40:05 2015 @@ -38,6 +38,7 @@ static NTSTATUS NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, + ULONGLONG MFTIndex, PFILE_NAMES_INFORMATION Info, ULONG BufferLength) { @@ -47,7 +48,12 @@ DPRINT("NtfsGetNameInformation() called\n"); FileName = GetBestFileNameFromRecord(FileRecord); - ASSERT(FileName != NULL); + if (FileName == NULL) + { + DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); + NtfsDumpFileAttributes(FileRecord); + return STATUS_OBJECT_NAME_NOT_FOUND; + } Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) @@ -76,7 +82,12 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); FileName = GetBestFileNameFromRecord(FileRecord); - ASSERT(FileName != NULL); + if (FileName == NULL) + { + DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); + NtfsDumpFileAttributes(FileRecord); + return STATUS_OBJECT_NAME_NOT_FOUND; + } StdInfo = GetStandardInformationFromRecord(FileRecord); ASSERT(StdInfo != NULL); @@ -121,7 +132,12 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); FileName = GetBestFileNameFromRecord(FileRecord); - ASSERT(FileName != NULL); + if (FileName == NULL) + { + DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); + NtfsDumpFileAttributes(FileRecord); + return STATUS_OBJECT_NAME_NOT_FOUND; + } StdInfo = GetStandardInformationFromRecord(FileRecord); ASSERT(StdInfo != NULL); @@ -167,7 +183,12 @@ DPRINT("NtfsGetBothDirectoryInformation() called\n"); FileName = GetBestFileNameFromRecord(FileRecord); - ASSERT(FileName != NULL); + if (FileName == NULL) + { + DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); + NtfsDumpFileAttributes(FileRecord); + return STATUS_OBJECT_NAME_NOT_FOUND; + } ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); StdInfo = GetStandardInformationFromRecord(FileRecord); @@ -332,6 +353,7 @@ case FileNameInformation: Status = NtfsGetNameInformation(DeviceExtension, FileRecord, + MFTRecord, (PFILE_NAMES_INFORMATION)Buffer, BufferLength); break;

9 years, 6 months

[akhaldi] 68289: [DEVMGMT] Free this module from the devil. Addendum to r68185. Spotted by fox_anthony.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 27 13:05:01 2015 New Revision: 68289 URL: http://svn.reactos.org/svn/reactos?rev=68289&view=rev Log: [DEVMGMT] Free this module from the devil. Addendum to r68185. Spotted by fox_anthony. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc trunk/reactos/dll/win32/devmgr/devmgmt/lang/tr-TR.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jun 27 13:05:01 2015 @@ -508,7 +508,7 @@ lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ENABLE); break; case IDC_DISABLE_DRV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_DIABLE); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_DISABLE); break; case IDC_UPDATE_DRV: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UPDATE); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Sat Jun 27 13:05:01 2015 @@ -36,7 +36,7 @@ #define IDS_TOOLTIP_PROPERTIES 300 #define IDS_TOOLTIP_SCAN 301 #define IDS_TOOLTIP_ENABLE 302 -#define IDS_TOOLTIP_DIABLE 303 +#define IDS_TOOLTIP_DISABLE 303 #define IDS_TOOLTIP_UPDATE 304 #define IDS_TOOLTIP_UNINSTALL 305 Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Sat Jun 27 13:05:01 2015 @@ -61,7 +61,7 @@ IDS_TOOLTIP_PROPERTIES "Properties" IDS_TOOLTIP_SCAN "Scan for hardware changes" IDS_TOOLTIP_ENABLE "Enable" - IDS_TOOLTIP_DIABLE "Disable" + IDS_TOOLTIP_DISABLE "Disable" IDS_TOOLTIP_UPDATE "Update Driver Software" IDS_TOOLTIP_UNINSTALL "Uninstall" END Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/tr-TR.rc [iso-8859-1] Sat Jun 27 13:05:01 2015 @@ -63,7 +63,7 @@ IDS_TOOLTIP_PROPERTIES "HusÃ»siyetler" IDS_TOOLTIP_SCAN "DonanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDS_TOOLTIP_ENABLE "EtkinleÅtir" - IDS_TOOLTIP_DIABLE "EdilginleÅtir" + IDS_TOOLTIP_DISABLE "EdilginleÅtir" IDS_TOOLTIP_UPDATE "SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir" IDS_TOOLTIP_UNINSTALL "KaldÄ±r" END

9 years, 6 months

[cfinck] 68288: [SPOOLSS, SPOOLSV, WINSPOOL] Connect AddJobW, EnumJobsW, GetJobW and SetJobW from winspool.drv over spoolsv.exe and spoolss.dll to the implemented functions in localspl.dll (includi...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jun 27 12:36:45 2015 New Revision: 68288 URL: http://svn.reactos.org/svn/reactos?rev=68288&view=rev Log: [SPOOLSS, SPOOLSV, WINSPOOL] Connect AddJobW, EnumJobsW, GetJobW and SetJobW from winspool.drv over spoolsv.exe and spoolss.dll to the implemented functions in localspl.dll (including marshalling the involved structures down and up). I decided to not use my recently implemented MarshallDownStructure API here and rather do the pointer math in place as this is simpler and faster. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -8,13 +8,25 @@ #include "precomp.h" BOOL WINAPI -AddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) { return LocalSplFuncs.fpAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); } BOOL WINAPI -GetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) +EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return LocalSplFuncs.fpEnumJobs(hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); +} + +BOOL WINAPI +GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) { return LocalSplFuncs.fpGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); } + +BOOL WINAPI +SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) +{ + return LocalSplFuncs.fpSetJob(hPrinter, JobId, Level, pJobInfo, Command); +} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -59,7 +59,7 @@ @ stdcall EndDocPrinter(long) @ stdcall EndPagePrinter(long) @ stub EnumFormsW -@ stub EnumJobsW +@ stdcall EnumJobsW(long long long long ptr long ptr ptr) @ stub EnumMonitorsW @ stub EnumPerMachineConnectionsW @ stub EnumPortsW @@ -137,7 +137,7 @@ @ stub SendRecvBidiData @ stub SetAllocFailCount @ stub SetFormW -@ stub SetJobW +@ stdcall SetJobW(long long long ptr long) @ stub SetPortW @ stub SetPrinterDataExW @ stub SetPrinterDataW Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -7,10 +7,53 @@ #include "precomp.h" +static void +_MarshallDownJobInfo(PBYTE pJobInfo, DWORD Level) +{ + PJOB_INFO_1W pJobInfo1; + PJOB_INFO_2W pJobInfo2; + + // Replace absolute pointer addresses in the output by relative offsets. + if (Level == 1) + { + pJobInfo1 = (PJOB_INFO_1W)pJobInfo; + pJobInfo1->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo1->pDatatype - (ULONG_PTR)pJobInfo1); + pJobInfo1->pDocument = (PWSTR)((ULONG_PTR)pJobInfo1->pDocument - (ULONG_PTR)pJobInfo1); + pJobInfo1->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo1->pMachineName - (ULONG_PTR)pJobInfo1); + pJobInfo1->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo1->pPrinterName - (ULONG_PTR)pJobInfo1); + + if (pJobInfo1->pStatus) + pJobInfo1->pStatus = (PWSTR)((ULONG_PTR)pJobInfo1->pStatus - (ULONG_PTR)pJobInfo1); + + pJobInfo1->pUserName = (PWSTR)((ULONG_PTR)pJobInfo1->pUserName - (ULONG_PTR)pJobInfo1); + } + else if (Level == 2) + { + pJobInfo2 = (PJOB_INFO_2W)pJobInfo; + pJobInfo2->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo2->pDatatype - (ULONG_PTR)pJobInfo2); + pJobInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pJobInfo2->pDevMode - (ULONG_PTR)pJobInfo2); + pJobInfo2->pDocument = (PWSTR)((ULONG_PTR)pJobInfo2->pDocument - (ULONG_PTR)pJobInfo2); + pJobInfo2->pDriverName = (PWSTR)((ULONG_PTR)pJobInfo2->pDriverName - (ULONG_PTR)pJobInfo2); + pJobInfo2->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo2->pMachineName - (ULONG_PTR)pJobInfo2); + pJobInfo2->pNotifyName = (PWSTR)((ULONG_PTR)pJobInfo2->pNotifyName - (ULONG_PTR)pJobInfo2); + pJobInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo2->pPrinterName - (ULONG_PTR)pJobInfo2); + pJobInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pJobInfo2->pPrintProcessor - (ULONG_PTR)pJobInfo2); + + if (pJobInfo2->pParameters) + pJobInfo2->pParameters = (PWSTR)((ULONG_PTR)pJobInfo2->pParameters - (ULONG_PTR)pJobInfo2); + + if (pJobInfo2->pStatus) + pJobInfo2->pStatus = (PWSTR)((ULONG_PTR)pJobInfo2->pStatus - (ULONG_PTR)pJobInfo2); + + pJobInfo2->pUserName = (PWSTR)((ULONG_PTR)pJobInfo2->pUserName - (ULONG_PTR)pJobInfo2); + } +} + DWORD _RpcAddJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE* pAddJob, DWORD cbBuf, DWORD* pcbNeeded) { DWORD dwErrorCode; + PADDJOB_INFO_1W pAddJobInfo1; dwErrorCode = RpcImpersonateClient(NULL); if (dwErrorCode != ERROR_SUCCESS) @@ -21,6 +64,48 @@ AddJobW(hPrinter, Level, pAddJob, cbBuf, pcbNeeded); dwErrorCode = GetLastError(); + + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace absolute pointer addresses in the output by relative offsets. + pAddJobInfo1 = (PADDJOB_INFO_1W)pAddJob; + pAddJobInfo1->Path = (PWSTR)((ULONG_PTR)pAddJobInfo1->Path - (ULONG_PTR)pAddJobInfo1); + } + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcEnumJobs(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, BYTE* pJob, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) +{ + DWORD dwErrorCode; + DWORD i; + PBYTE p = pJob; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + EnumJobsW(hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); + + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace absolute pointer addresses in the output by relative offsets. + for (i = 0; i < *pcReturned; i++) + { + _MarshallDownJobInfo(p, Level); + + if (Level == 1) + p += sizeof(JOB_INFO_1W); + else if (Level == 2) + p += sizeof(JOB_INFO_2W); + } + } RpcRevertToSelf(); return dwErrorCode; @@ -41,6 +126,12 @@ GetJobW(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); dwErrorCode = GetLastError(); + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace absolute pointer addresses in the output by relative offsets. + _MarshallDownJobInfo(pJob, Level); + } + RpcRevertToSelf(); return dwErrorCode; } @@ -55,6 +146,19 @@ DWORD _RpcSetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, WINSPOOL_JOB_CONTAINER* pJobContainer, DWORD Command) { - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + // pJobContainer->JobInfo is a union of pointers, so we can just convert any element to our BYTE pointer. + SetJobW(hPrinter, JobId, pJobContainer->Level, (PBYTE)pJobContainer->JobInfo.Level1, Command); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -8,13 +8,6 @@ #include "precomp.h" DWORD -_RpcEnumJobs(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, BYTE *pJob, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcAddPrinter(WINSPOOL_HANDLE pName, WINSPOOL_PRINTER_CONTAINER *pPrinterContainer, WINSPOOL_DEVMODE_CONTAINER *pDevModeContainer, WINSPOOL_SECURITY_CONTAINER *pSecurityContainer, WINSPOOL_PRINTER_HANDLE *pHandle) { UNIMPLEMENTED; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -7,46 +7,191 @@ #include "precomp.h" +static void +_MarshallUpJobInfo(PBYTE pJobInfo, DWORD Level) +{ + PJOB_INFO_1W pJobInfo1; + PJOB_INFO_2W pJobInfo2; + + // Replace absolute pointer addresses in the output by relative offsets. + if (Level == 1) + { + pJobInfo1 = (PJOB_INFO_1W)pJobInfo; + pJobInfo1->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo1->pDatatype + (ULONG_PTR)pJobInfo1); + pJobInfo1->pDocument = (PWSTR)((ULONG_PTR)pJobInfo1->pDocument + (ULONG_PTR)pJobInfo1); + pJobInfo1->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo1->pMachineName + (ULONG_PTR)pJobInfo1); + pJobInfo1->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo1->pPrinterName + (ULONG_PTR)pJobInfo1); + + if (pJobInfo1->pStatus) + pJobInfo1->pStatus = (PWSTR)((ULONG_PTR)pJobInfo1->pStatus + (ULONG_PTR)pJobInfo1); + + pJobInfo1->pUserName = (PWSTR)((ULONG_PTR)pJobInfo1->pUserName + (ULONG_PTR)pJobInfo1); + } + else if (Level == 2) + { + pJobInfo2 = (PJOB_INFO_2W)pJobInfo; + pJobInfo2->pDatatype = (PWSTR)((ULONG_PTR)pJobInfo2->pDatatype + (ULONG_PTR)pJobInfo2); + pJobInfo2->pDevMode = (PDEVMODEW)((ULONG_PTR)pJobInfo2->pDevMode + (ULONG_PTR)pJobInfo2); + pJobInfo2->pDocument = (PWSTR)((ULONG_PTR)pJobInfo2->pDocument + (ULONG_PTR)pJobInfo2); + pJobInfo2->pDriverName = (PWSTR)((ULONG_PTR)pJobInfo2->pDriverName + (ULONG_PTR)pJobInfo2); + pJobInfo2->pMachineName = (PWSTR)((ULONG_PTR)pJobInfo2->pMachineName + (ULONG_PTR)pJobInfo2); + pJobInfo2->pNotifyName = (PWSTR)((ULONG_PTR)pJobInfo2->pNotifyName + (ULONG_PTR)pJobInfo2); + pJobInfo2->pPrinterName = (PWSTR)((ULONG_PTR)pJobInfo2->pPrinterName + (ULONG_PTR)pJobInfo2); + pJobInfo2->pPrintProcessor = (PWSTR)((ULONG_PTR)pJobInfo2->pPrintProcessor + (ULONG_PTR)pJobInfo2); + + if (pJobInfo2->pParameters) + pJobInfo2->pParameters = (PWSTR)((ULONG_PTR)pJobInfo2->pParameters + (ULONG_PTR)pJobInfo2); + + if (pJobInfo2->pStatus) + pJobInfo2->pStatus = (PWSTR)((ULONG_PTR)pJobInfo2->pStatus + (ULONG_PTR)pJobInfo2); + + pJobInfo2->pUserName = (PWSTR)((ULONG_PTR)pJobInfo2->pUserName + (ULONG_PTR)pJobInfo2); + } +} + BOOL WINAPI -AddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +AddJobA(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded) { - BOOL bReturnValue = FALSE; + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddJobW(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded) +{ DWORD dwErrorCode; + PADDJOB_INFO_1W pAddJobInfo1; // Do the RPC call RpcTryExcept { dwErrorCode = _RpcAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); - SetLastError(dwErrorCode); - bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - ERR("_RpcAddJob failed with exception code %lu!\n", RpcExceptionCode()); + dwErrorCode = RpcExceptionCode(); + ERR("_RpcAddJob failed with exception code %lu!\n", dwErrorCode); } RpcEndExcept; - return bReturnValue; + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace relative offset addresses in the output by absolute pointers. + pAddJobInfo1 = (PADDJOB_INFO_1W)pData; + pAddJobInfo1->Path = (PWSTR)((ULONG_PTR)pAddJobInfo1->Path + (ULONG_PTR)pAddJobInfo1); + } + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI -GetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) +EnumJobsA(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - BOOL bReturnValue = FALSE; + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + DWORD dwErrorCode; + DWORD i; + PBYTE p = pJob; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcEnumJobs(hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwErrorCode = RpcExceptionCode(); + ERR("_RpcEnumJobs failed with exception code %lu!\n", dwErrorCode); + } + RpcEndExcept; + + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace relative offset addresses in the output by absolute pointers. + for (i = 0; i < *pcReturned; i++) + { + _MarshallUpJobInfo(p, Level); + + if (Level == 1) + p += sizeof(JOB_INFO_1W); + else if (Level == 2) + p += sizeof(JOB_INFO_2W); + } + } + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +GetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded) +{ DWORD dwErrorCode; // Do the RPC call RpcTryExcept { dwErrorCode = _RpcGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); - SetLastError(dwErrorCode); - bReturnValue = (dwErrorCode == ERROR_SUCCESS); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - ERR("_RpcGetJob failed with exception code %lu!\n", RpcExceptionCode()); + dwErrorCode = RpcExceptionCode(); + ERR("_RpcGetJob failed with exception code %lu!\n", dwErrorCode); } RpcEndExcept; - return bReturnValue; + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace relative offset addresses in the output by absolute pointers. + _MarshallUpJobInfo(pJob, Level); + } + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } + +BOOL WINAPI +SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) +{ + DWORD dwErrorCode; + WINSPOOL_JOB_CONTAINER JobContainer; + + // pJobContainer->JobInfo is a union of pointers, so we can just set any element to our BYTE pointer. + JobContainer.Level = Level; + JobContainer.JobInfo.Level1 = (WINSPOOL_JOB_INFO_1*)pJobInfo; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcSetJob(hPrinter, JobId, &JobContainer, Command); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwErrorCode = RpcExceptionCode(); + ERR("_RpcSetJob failed with exception code %lu!\n", dwErrorCode); + } + RpcEndExcept; + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Sat Jun 27 12:36:45 2015 @@ -9,7 +9,7 @@ 108 stub AbortPrinter 109 stub AddFormA 110 stub AddFormW -111 stub AddJobA +111 stdcall AddJobA(long long ptr long ptr) 112 stdcall AddJobW(long long ptr long ptr) 113 stub AddMonitorA 114 stub AddMonitorW @@ -83,8 +83,8 @@ 182 stdcall EndPagePrinter(long) 183 stub EnumFormsA 184 stub EnumFormsW -185 stub EnumJobsA -186 stub EnumJobsW +185 stdcall EnumJobsA(long long long long ptr long ptr ptr) +186 stdcall EnumJobsW(long long long long ptr long ptr ptr) 187 stub EnumMonitorsA 188 stub EnumMonitorsW 189 stub EnumPortsA @@ -142,7 +142,7 @@ 241 stub FreePrinterNotifyInfo 242 stub GetFormA 243 stub GetFormW -244 stub GetJobA +244 stdcall GetJobA(long long long ptr long ptr) 245 stdcall GetJobW(long long long ptr long ptr) 246 stub GetPrintProcessorDirectoryA 247 stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) @@ -176,8 +176,8 @@ 275 stub SetAllocFailCount 276 stub SetFormA 277 stub SetFormW -278 stub SetJobA -279 stub SetJobW +278 stdcall SetJobA(long long long ptr long) +279 stdcall SetJobW(long long long ptr long) 280 stub SetPortA 281 stub SetPortW 282 stub SetPrinterA

9 years, 6 months

← Newer
1
2
3
4
5
6
7
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015