Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [BROWSEUI/SHELLBARS] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3544fd00b9caf47b0e7d… commit b3544fd00b9caf47b0e7d9d5a8c5aaa1097c63d3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 20:46:40 2017 +0100 [BROWSEUI/SHELLBARS] Add a PCH. --- dll/win32/browseui/shellbars/CBandSiteMenu.cpp | 3 ++- dll/win32/browseui/shellbars/CISFBand.cpp | 6 ++---- dll/win32/browseui/shellbars/CISFBand.h | 1 + dll/win32/browseui/shellbars/CMakeLists.txt | 11 +++++++---- dll/win32/browseui/shellbars/shellbars.h | 12 ++++-------- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp index d94038987f..4f7af9b28f 100644 --- a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp +++ b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp @@ -20,7 +20,8 @@ */ #include "shellbars.h" -#include <strsafe.h> + +#include <browseui_undoc.h> /* The menu consists of 3 parts. The first is loaded from the resources, the second is populated with the classes of the CATID_DeskBand comcat diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 24426f6ebd..670e647a23 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -7,11 +7,9 @@ */ #include "shellbars.h" -#include <commoncontrols.h> -#include <strsafe.h> -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) +#include <commoncontrols.h> +#include <shellapi.h> /* TODO: diff --git a/dll/win32/browseui/shellbars/CISFBand.h b/dll/win32/browseui/shellbars/CISFBand.h index 04e6811aeb..73882c3d85 100644 --- a/dll/win32/browseui/shellbars/CISFBand.h +++ b/dll/win32/browseui/shellbars/CISFBand.h @@ -5,6 +5,7 @@ * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ + #pragma once class CISFBand : diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index f42c74f722..ec87d6ce24 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -1,3 +1,4 @@ + PROJECT(SHELL) set_cpp(WITH_RUNTIME) @@ -12,13 +13,15 @@ list(APPEND SOURCE CBandSiteMenu.cpp CBaseBar.cpp CISFBand.cpp - CSHEnumClassesOfCategories.cpp) + CSHEnumClassesOfCategories.cpp + shellbars.h) add_library(shellbars ${SOURCE}) -add_dependencies(shellbars xdk) - -target_link_libraries(shellbars atlnew) if(NOT MSVC) add_target_compile_flags(shellbars "-Wno-unused-but-set-variable") endif() + +add_pch(shellbars shellbars.h SOURCE) +target_link_libraries(shellbars atlnew) +add_dependencies(shellbars xdk) diff --git a/dll/win32/browseui/shellbars/shellbars.h b/dll/win32/browseui/shellbars/shellbars.h index b6ebf70d6c..59221c4e28 100644 --- a/dll/win32/browseui/shellbars/shellbars.h +++ b/dll/win32/browseui/shellbars/shellbars.h @@ -7,10 +7,7 @@ #include <windef.h> #include <winbase.h> -#include <wincon.h> -#include <wingdi.h> #include <shlobj.h> -#include <shellapi.h> #include <shlobj_undoc.h> #include <shlguid_undoc.h> #include <shdeprecated.h> @@ -19,13 +16,14 @@ #include <atlcom.h> #include <atlwin.h> #include <atlsimpcoll.h> -#include <undocuser.h> #include <shlwapi.h> #include <shlwapi_undoc.h> #include <undocshell.h> #include <shellutils.h> -#include <browseui_undoc.h> +#include <strsafe.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(browseui); #include "../resource.h" @@ -33,8 +31,6 @@ #include "CBandSiteMenu.h" #include "CISFBand.h" -WINE_DEFAULT_DEBUG_CHANNEL(browseui); - #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -46,4 +42,4 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); #define CISFBand_CreateInstance RSHELL_CISFBand_CreateInstance #endif -#endif /* _BROWSEUI_PCH_ */ +#endif /* _SHELLBARS_PCH_ */

7 years

[reactos] 01/01: [GDI32_APITEST] Properly add CreateDIBPatternBrush.c to the source files list instead of relying on CMake to do so.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eafa77f30a6fa25a6fcfe… commit eafa77f30a6fa25a6fcfe26634645fa9b89e7d70 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 20:03:08 2017 +0100 [GDI32_APITEST] Properly add CreateDIBPatternBrush.c to the source files list instead of relying on CMake to do so. --- modules/rostests/apitests/gdi32/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index 3dfe1c3474..75255b3d27 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND SOURCE CreateBitmapIndirect.c CreateCompatibleDC.c CreateDIBitmap.c - CreateDIBPatternBrush + CreateDIBPatternBrush.c CreateFont.c CreateFontIndirect.c CreateIconIndirect.c

7 years

[reactos] 01/01: [ACLEDIT][ATL][ATL80][FLTMGR] Get the def files out of the source files lists. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6cb9f60d18626bc35522… commit d6cb9f60d18626bc355223fed18d4f90940078c7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 19:58:43 2017 +0100 [ACLEDIT][ATL][ATL80][FLTMGR] Get the def files out of the source files lists. #179 --- dll/win32/acledit/CMakeLists.txt | 7 +++++-- dll/win32/atl/CMakeLists.txt | 10 +++++++--- dll/win32/atl80/CMakeLists.txt | 6 ++++-- drivers/filters/fltmgr/CMakeLists.txt | 17 +++++++++-------- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt index 99382a542b..fb2222b02f 100644 --- a/dll/win32/acledit/CMakeLists.txt +++ b/dll/win32/acledit/CMakeLists.txt @@ -4,10 +4,13 @@ spec2def(acledit.dll acledit.spec) list(APPEND SOURCE acledit.c stubs.c - acleditint.h + acleditint.h) + +add_library(acledit SHARED + ${SOURCE} + acledit.rc ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) -add_library(acledit SHARED ${SOURCE} acledit.rc) set_module_type(acledit win32dll UNICODE) add_importlibs(acledit msvcrt kernel32 ntdll) add_pch(acledit acleditint.h SOURCE) diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index 77904a2317..9697e5c0a5 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -14,9 +14,8 @@ list(APPEND SOURCE atl30.c atl_ax.c registrar.c - precomp.h ${CMAKE_CURRENT_BINARY_DIR}/atl_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/atl.def) + precomp.h) list(APPEND atl_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/atl.rgs @@ -25,7 +24,12 @@ list(APPEND atl_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/atl_lib.tlb) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${atl_rc_deps}") -add_library(atl SHARED ${SOURCE} rsrc.rc) + +add_library(atl SHARED + ${SOURCE} + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/atl.def) + add_typelib(atl_lib.idl) add_dependencies(atl stdole2) set_module_type(atl win32dll) diff --git a/dll/win32/atl80/CMakeLists.txt b/dll/win32/atl80/CMakeLists.txt index 38d395b56a..6283b496ae 100644 --- a/dll/win32/atl80/CMakeLists.txt +++ b/dll/win32/atl80/CMakeLists.txt @@ -13,11 +13,13 @@ list(APPEND SOURCE atl80.c ${REACTOS_SOURCE_DIR}/dll/win32/atl/atl_ax.c ${REACTOS_SOURCE_DIR}/dll/win32/atl/registrar.c - precomp.h ${CMAKE_CURRENT_BINARY_DIR}/atl80_stubs.c + precomp.h) + +add_library(atl80 SHARED + ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/atl80.def) -add_library(atl80 SHARED ${SOURCE}) set_module_type(atl80 win32dll) target_link_libraries(atl80 uuid wine) add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 advapi32_vista shlwapi msvcrt kernel32 ntdll) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index cb6ebbdd18..85199741d2 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -1,3 +1,10 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr + includes) + +spec2def(fltmgr.sys fltmgr.spec ADD_IMPORTLIB) + list(APPEND SOURCE Context.c Dispatch.c @@ -9,18 +16,12 @@ list(APPEND SOURCE Object.c Registry.c Volume.c - ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) -include_directories( - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr - includes) - -spec2def(fltmgr.sys fltmgr.spec ADD_IMPORTLIB) - add_library(fltmgr SHARED ${SOURCE} - fltmgr.rc) + fltmgr.rc + ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def) set_module_type(fltmgr kernelmodedriver) target_link_libraries(fltmgr ${PSEH_LIB})

7 years

[reactos] 01/01: [FASTFAT] Finally drop the FileNameInformation class for directories. It makes no sense for them and shouldn't be implemented. It's an addendum to 9f3c801.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bddb0db469e66b2067a87… commit bddb0db469e66b2067a87ce2d5b6492a963b6387 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 14:35:22 2017 +0100 [FASTFAT] Finally drop the FileNameInformation class for directories. It makes no sense for them and shouldn't be implemented. It's an addendum to 9f3c801. --- drivers/filesystems/fastfat/dir.c | 49 --------------------------------------- 1 file changed, 49 deletions(-) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index 1e657f19fd..51359c4966 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -86,47 +86,6 @@ FsdSystemTimeToDosDateTime( #define ULONG_ROUND_UP(x) ROUND_UP((x), (sizeof(ULONG))) -static -NTSTATUS -VfatGetFileNameInformation( - PVFAT_DIRENTRY_CONTEXT DirContext, - PFILE_NAME_INFORMATION pInfo, - ULONG BufferLength, - PULONG Written, - BOOLEAN First) -{ - NTSTATUS Status; - ULONG BytesToCopy = 0; - - *Written = 0; - Status = STATUS_BUFFER_OVERFLOW; - - if (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) > BufferLength) - return Status; - - if (First || (BufferLength >= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + DirContext->LongNameU.Length)) - { - pInfo->FileNameLength = DirContext->LongNameU.Length; - - *Written = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); - if (BufferLength > FIELD_OFFSET(FILE_NAME_INFORMATION, FileName)) - { - BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName)); - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - BytesToCopy); - *Written += BytesToCopy; - - if (BytesToCopy == DirContext->LongNameU.Length) - { - Status = STATUS_SUCCESS; - } - } - } - - return Status; -} - static NTSTATUS VfatGetFileNamesInformation( @@ -661,14 +620,6 @@ DoQuery( { switch (FileInformationClass) { - case FileNameInformation: - Status = VfatGetFileNameInformation(&DirContext, - (PFILE_NAME_INFORMATION)Buffer, - BufferLength, - &Written, - Buffer0 == NULL); - break; - case FileDirectoryInformation: Status = VfatGetFileDirectoryInformation(&DirContext, IrpContext->DeviceExt,

7 years

[reactos] 01/01: [FREELDR] The work done in r70692 overlooked the need to update the PCH lists of source files as well.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9397f280c312dee0cbc92… commit 9397f280c312dee0cbc92f6856b950dfa0aac1bb Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 14:18:25 2017 +0100 [FREELDR] The work done in r70692 overlooked the need to update the PCH lists of source files as well. - We use this as a chance to also update the CMake file in terms of consistency. - The clang-cl build applies the /Os flag on all the source files that are now using the PCH too. --- boot/freeldr/freeldr/CMakeLists.txt | 57 +++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index df7cc0a53b..af754c5bf3 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -32,11 +32,9 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf) add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) - list(APPEND FREELDR_BOOTLIB_COMMON_SOURCE lib/debug.c lib/peloader.c - lib/comm/rs232.c ## add KD support lib/fs/ext2.c @@ -49,16 +47,14 @@ list(APPEND FREELDR_BOOTLIB_COMMON_SOURCE lib/inifile/parse.c lib/mm/meminit.c lib/mm/mm.c - lib/mm/heap.c - ) + lib/mm/heap.c) list(APPEND FREELDR_NTLDR_COMMON_SOURCE ntldr/conversion.c ntldr/registry.c ntldr/winldr.c ntldr/wlmemory.c - ntldr/wlregistry.c - ) + ntldr/wlregistry.c) list(APPEND FREELDR_ARC_COMMON_SOURCE arcname.c @@ -68,9 +64,8 @@ list(APPEND FREELDR_ARC_COMMON_SOURCE cache/cache.c disk/disk.c disk/partition.c - disk/ramdisk.c + disk/ramdisk.c) #disk/scsiport.c - ) list(APPEND FREELDR_COMMON_SOURCE include/freeldr.h @@ -90,8 +85,7 @@ list(APPEND FREELDR_COMMON_SOURCE ui/ui.c video/fade.c video/palette.c - video/video.c - ) + video/video.c) if(ARCH STREQUAL "i386") list(APPEND FREELDR_COMMON_ASM_SOURCE @@ -100,21 +94,16 @@ if(ARCH STREQUAL "i386") arch/i386/pnpbios.S arch/i386/i386trap.S arch/i386/linux.S - arch/i386/mb.S - ) + arch/i386/mb.S) list(APPEND FREELDR_NTLDR_COMMON_SOURCE ntldr/arch/i386/winldr.c - ntldr/headless.c - ) + ntldr/headless.c) - ## list(APPEND FREELDR_COMMON_SOURCE list(APPEND FREELDR_ARC_COMMON_SOURCE lib/fs/pxe.c - arch/i386/halstub.c arch/i386/ntoskrnl.c - arch/i386/archmach.c arch/i386/drivemap.c arch/i386/hardware.c @@ -151,15 +140,11 @@ elseif(ARCH STREQUAL "amd64") arch/amd64/pnpbios.S) list(APPEND FREELDR_NTLDR_COMMON_SOURCE - ntldr/arch/amd64/winldr.c - ) + ntldr/arch/amd64/winldr.c) - ## list(APPEND FREELDR_COMMON_SOURCE list(APPEND FREELDR_ARC_COMMON_SOURCE lib/fs/pxe.c - arch/i386/ntoskrnl.c - arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c @@ -180,10 +165,8 @@ elseif(ARCH STREQUAL "arm") arch/arm/boot.S) list(APPEND FREELDR_NTLDR_COMMON_SOURCE - ntldr/arch/arm/winldr.c - ) + ntldr/arch/arm/winldr.c) - ## list(APPEND FREELDR_COMMON_SOURCE list(APPEND FREELDR_ARC_COMMON_SOURCE arch/arm/entry.c arch/arm/macharm.c) @@ -192,17 +175,29 @@ else() endif() add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) -add_library(freeldr_common ${FREELDR_BOOTLIB_COMMON_SOURCE} ${FREELDR_ARC_COMMON_SOURCE} - ${FREELDR_NTLDR_COMMON_SOURCE} - ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) -add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE) -add_dependencies(freeldr_common bugcodes asm xdk) + +add_library(freeldr_common + ${FREELDR_BOOTLIB_COMMON_SOURCE} + ${FREELDR_ARC_COMMON_SOURCE} + ${FREELDR_NTLDR_COMMON_SOURCE} + ${FREELDR_COMMON_SOURCE} + ${freeldr_common_asm} + linuxboot.c) if(USE_CLANG_CL) # We need to reduce the binary size - set_property(SOURCE ${FREELDR_BOOTLIB_COMMON_SOURCE} ${FREELDR_ARC_COMMON_SOURCE} APPEND_STRING PROPERTY COMPILE_FLAGS " /Os") + add_target_compile_flags(freeldr_common "/Os") endif() +set(PCH_SOURCE + ${FREELDR_BOOTLIB_COMMON_SOURCE} + ${FREELDR_ARC_COMMON_SOURCE} + ${FREELDR_NTLDR_COMMON_SOURCE} + ${FREELDR_COMMON_SOURCE}) + +add_pch(freeldr_common include/freeldr.h PCH_SOURCE) +add_dependencies(freeldr_common bugcodes asm xdk) + if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) target_link_libraries(freeldr_common mini_hal)

7 years

[reactos] 03/03: [WINSPOOL] Provide stubs with tracing and reasonable failure codes for even more popular Spooler APIs.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46b9165909e145bc8668c… commit 46b9165909e145bc8668c564d5ad764fa6553138 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Dec 9 13:35:42 2017 +0100 [WINSPOOL] Provide stubs with tracing and reasonable failure codes for even more popular Spooler APIs. This may get more applications to work which previously called into the WINE-generated stubs (that throw an exception). It also improves debug logs when the "winspool" debug channel is enabled. With such detailed debug logs, we may get an idea which winspool APIs need to be implemented sooner than others. --- win32ss/printing/base/winspool/CMakeLists.txt | 1 + win32ss/printing/base/winspool/forms.c | 88 +++++++++++ win32ss/printing/base/winspool/monitors.c | 24 +++ win32ss/printing/base/winspool/ports.c | 64 ++++++++ win32ss/printing/base/winspool/printerdata.c | 106 ++++++++++++- win32ss/printing/base/winspool/printerdrivers.c | 56 +++++++ win32ss/printing/base/winspool/printers.c | 56 ++++++- win32ss/printing/base/winspool/printprocessors.c | 40 ++++- win32ss/printing/base/winspool/printproviders.c | 16 ++ win32ss/printing/base/winspool/winspool.spec | 182 +++++++++++------------ 10 files changed, 531 insertions(+), 102 deletions(-) diff --git a/win32ss/printing/base/winspool/CMakeLists.txt b/win32ss/printing/base/winspool/CMakeLists.txt index 71d18ba9a4..b4dcf8a163 100644 --- a/win32ss/printing/base/winspool/CMakeLists.txt +++ b/win32ss/printing/base/winspool/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE devmode.c + forms.c jobs.c main.c monitors.c diff --git a/win32ss/printing/base/winspool/forms.c b/win32ss/printing/base/winspool/forms.c new file mode 100644 index 0000000000..50ce561338 --- /dev/null +++ b/win32ss/printing/base/winspool/forms.c @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Functions related to Forms + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) + */ + +#include "precomp.h" + +BOOL WINAPI +AddFormA(HANDLE hPrinter, DWORD Level, PBYTE pForm) +{ + TRACE("AddFormA(%p, %lu, %p)\n", hPrinter, Level, pForm); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddFormW(HANDLE hPrinter, DWORD Level, PBYTE pForm) +{ + TRACE("AddFormW(%p, %lu, %p)\n", hPrinter, Level, pForm); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeleteFormA(HANDLE hPrinter, PSTR pFormName) +{ + TRACE("DeleteFormA(%p, %s)\n", hPrinter, pFormName); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeleteFormW(HANDLE hPrinter, PWSTR pFormName) +{ + TRACE("DeleteFormW(%p, %S)\n", hPrinter, pFormName); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +EnumFormsA(HANDLE hPrinter, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumFormsA(%p, %lu, %p, %lu, %p, %p)\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +EnumFormsW(HANDLE hPrinter, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumFormsW(%p, %lu, %p, %lu, %p, %p)\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +GetFormA(HANDLE hPrinter, PSTR pFormName, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded) +{ + TRACE("GetFormA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pFormName, Level, pForm, cbBuf, pcbNeeded); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +GetFormW(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded) +{ + TRACE("GetFormW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pFormName, Level, pForm, cbBuf, pcbNeeded); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SetFormA(HANDLE hPrinter, PSTR pFormName, DWORD Level, PBYTE pForm) +{ + TRACE("SetFormA(%p, %s, %lu, %p)\n", hPrinter, pFormName, Level, pForm); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SetFormW(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm) +{ + TRACE("SetFormW(%p, %S, %lu, %p)\n", hPrinter, pFormName, Level, pForm); + UNIMPLEMENTED; + return FALSE; +} diff --git a/win32ss/printing/base/winspool/monitors.c b/win32ss/printing/base/winspool/monitors.c index a5b30fe7f5..4a36895126 100644 --- a/win32ss/printing/base/winspool/monitors.c +++ b/win32ss/printing/base/winspool/monitors.c @@ -22,6 +22,14 @@ _MarshallUpMonitorInfo(PBYTE pMonitorInfo, DWORD Level) } } +BOOL WINAPI +AddMonitorA(PSTR pName, DWORD Level, PBYTE pMonitors) +{ + TRACE("AddMonitorA(%s, %lu, %p)\n", pName, Level, pMonitors); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI AddMonitorW(PWSTR pName, DWORD Level, PBYTE pMonitors) { @@ -30,6 +38,14 @@ AddMonitorW(PWSTR pName, DWORD Level, PBYTE pMonitors) return FALSE; } +BOOL WINAPI +DeleteMonitorA(PSTR pName, PSTR pEnvironment, PSTR pMonitorName) +{ + TRACE("DeleteMonitorA(%s, %s, %s)\n", pName, pEnvironment, pMonitorName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI DeleteMonitorW(PWSTR pName, PWSTR pEnvironment, PWSTR pMonitorName) { @@ -38,6 +54,14 @@ DeleteMonitorW(PWSTR pName, PWSTR pEnvironment, PWSTR pMonitorName) return FALSE; } +BOOL WINAPI +EnumMonitorsA(PSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumMonitorsA(%s, %lu, %p, %lu, %p, %p)\n", pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI EnumMonitorsW(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { diff --git a/win32ss/printing/base/winspool/ports.c b/win32ss/printing/base/winspool/ports.c index 4e8d020e84..28977bdaeb 100644 --- a/win32ss/printing/base/winspool/ports.c +++ b/win32ss/printing/base/winspool/ports.c @@ -22,6 +22,30 @@ _MarshallUpPortInfo(PBYTE pPortInfo, DWORD Level) } } +BOOL WINAPI +AddPortA(PSTR pName, HWND hWnd, PSTR pMonitorName) +{ + TRACE("AddPortA(%s, %p, %s)\n", pName, hWnd, pMonitorName); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddPortExA(PSTR pName, DWORD Level, PBYTE lpBuffer, PSTR lpMonitorName) +{ + TRACE("AddPortExA(%s, %lu, %p, %s)\n", pName, Level, lpBuffer, lpMonitorName); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddPortExW(PWSTR pName, DWORD Level, PBYTE lpBuffer, PWSTR lpMonitorName) +{ + TRACE("AddPortExA(%S, %lu, %p, %S)\n", pName, Level, lpBuffer, lpMonitorName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI AddPortW(PWSTR pName, HWND hWnd, PWSTR pMonitorName) { @@ -30,6 +54,14 @@ AddPortW(PWSTR pName, HWND hWnd, PWSTR pMonitorName) return FALSE; } +BOOL WINAPI +ConfigurePortA(PSTR pName, HWND hWnd, PSTR pPortName) +{ + TRACE("ConfigurePortA(%s, %p, %s)\n", pName, hWnd, pPortName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI ConfigurePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) { @@ -38,6 +70,14 @@ ConfigurePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) return FALSE; } +BOOL WINAPI +DeletePortA(PSTR pName, HWND hWnd, PSTR pPortName) +{ + TRACE("DeletePortA(%s, %p, %s)\n", pName, hWnd, pPortName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI DeletePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) { @@ -46,6 +86,14 @@ DeletePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) return FALSE; } +BOOL WINAPI +EnumPortsA(PSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumPortsA(%s, %lu, %p, %lu, %p, %p)\n", pName, Level, pPorts, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { @@ -84,3 +132,19 @@ EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } + +BOOL WINAPI +SetPortA(PSTR pName, PSTR pPortName, DWORD dwLevel, PBYTE pPortInfo) +{ + TRACE("SetPortA(%s, %s, %lu, %p)\n", pName, pPortName, dwLevel, pPortInfo); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SetPortW(PWSTR pName, PWSTR pPortName, DWORD dwLevel, PBYTE pPortInfo) +{ + TRACE("SetPortW(%S, %S, %lu, %p)\n", pName, pPortName, dwLevel, pPortInfo); + UNIMPLEMENTED; + return FALSE; +} diff --git a/win32ss/printing/base/winspool/printerdata.c b/win32ss/printing/base/winspool/printerdata.c index 8904bb74d3..aefa944872 100644 --- a/win32ss/printing/base/winspool/printerdata.c +++ b/win32ss/printing/base/winspool/printerdata.c @@ -7,12 +7,116 @@ #include "precomp.h" +LONG WINAPI +AdvancedDocumentPropertiesA(HWND hWnd, HANDLE hPrinter, PSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput) +{ + TRACE("AdvancedDocumentPropertiesA(%p, %p, %s, %p, %p)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput); + UNIMPLEMENTED; + return 0; +} + LONG WINAPI AdvancedDocumentPropertiesW(HWND hWnd, HANDLE hPrinter, PWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput) { TRACE("AdvancedDocumentPropertiesW(%p, %p, %S, %p, %p)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput); UNIMPLEMENTED; - return FALSE; + return 0; +} + +DWORD WINAPI +DeletePrinterDataA(HANDLE hPrinter, PSTR pValueName) +{ + TRACE("DeletePrinterDataA(%p, %s)\n", hPrinter, pValueName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +DeletePrinterDataExA(HANDLE hPrinter, PCSTR pKeyName, PCSTR pValueName) +{ + TRACE("DeletePrinterDataExA(%p, %s, %s)\n", hPrinter, pKeyName, pValueName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +DeletePrinterDataExW(HANDLE hPrinter, PCWSTR pKeyName, PCWSTR pValueName) +{ + TRACE("DeletePrinterDataExW(%p, %S, %S)\n", hPrinter, pKeyName, pValueName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +DeletePrinterDataW(HANDLE hPrinter, PWSTR pValueName) +{ + TRACE("DeletePrinterDataW(%p, %S)\n", hPrinter, pValueName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +DeletePrinterKeyA(HANDLE hPrinter, PCSTR pKeyName) +{ + TRACE("DeletePrinterKeyA(%p, %s)\n", hPrinter, pKeyName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +DeletePrinterKeyW(HANDLE hPrinter, PCWSTR pKeyName) +{ + TRACE("DeletePrinterKeyW(%p, %S)\n", hPrinter, pKeyName); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterDataA(HANDLE hPrinter, DWORD dwIndex, PSTR pValueName, DWORD cbValueName, PDWORD pcbValueName, PDWORD pType, PBYTE pData, DWORD cbData, PDWORD pcbData) +{ + TRACE("EnumPrinterDataA(%p, %lu, %s, %lu, %p, %p, %p, %lu, %p)\n", hPrinter, dwIndex, pValueName, cbValueName, pcbValueName, pType, pData, cbData, pcbData); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterDataExA(HANDLE hPrinter, PCSTR pKeyName, PBYTE pEnumValues, DWORD cbEnumValues, PDWORD pcbEnumValues, PDWORD pnEnumValues) +{ + TRACE("EnumPrinterDataExA(%p, %s, %p, %lu, %p, %p)\n", hPrinter, pKeyName, pEnumValues, cbEnumValues, pcbEnumValues, pnEnumValues); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterDataExW(HANDLE hPrinter, PCWSTR pKeyName, PBYTE pEnumValues, DWORD cbEnumValues, PDWORD pcbEnumValues, PDWORD pnEnumValues) +{ + TRACE("EnumPrinterDataExW(%p, %S, %p, %lu, %p, %p)\n", hPrinter, pKeyName, pEnumValues, cbEnumValues, pcbEnumValues, pnEnumValues); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterDataW(HANDLE hPrinter, DWORD dwIndex, PWSTR pValueName, DWORD cbValueName, PDWORD pcbValueName, PDWORD pType, PBYTE pData, DWORD cbData, PDWORD pcbData) +{ + TRACE("EnumPrinterDataW(%p, %lu, %S, %lu, %p, %p, %p, %lu, %p)\n", hPrinter, dwIndex, pValueName, cbValueName, pcbValueName, pType, pData, cbData, pcbData); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterKeyA(HANDLE hPrinter, PCSTR pKeyName, PSTR pSubkey, DWORD cbSubkey, PDWORD pcbSubkey) +{ + TRACE("EnumPrinterKeyA(%p, %s, %s, %lu, %p)\n", hPrinter, pKeyName, pSubkey, cbSubkey, pcbSubkey); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +DWORD WINAPI +EnumPrinterKeyW(HANDLE hPrinter, PCWSTR pKeyName, PWSTR pSubkey, DWORD cbSubkey, PDWORD pcbSubkey) +{ + TRACE("EnumPrinterKeyW(%p, %S, %S, %lu, %p)\n", hPrinter, pKeyName, pSubkey, cbSubkey, pcbSubkey); + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; } DWORD WINAPI diff --git a/win32ss/printing/base/winspool/printerdrivers.c b/win32ss/printing/base/winspool/printerdrivers.c index d35e804571..de87781085 100644 --- a/win32ss/printing/base/winspool/printerdrivers.c +++ b/win32ss/printing/base/winspool/printerdrivers.c @@ -7,6 +7,30 @@ #include "precomp.h" +BOOL WINAPI +AddPrinterDriverA(PSTR pName, DWORD Level, PBYTE pDriverInfo) +{ + TRACE("AddPrinterDriverA(%s, %lu, %p)\n", pName, Level, pDriverInfo); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddPrinterDriverExA(PSTR pName, DWORD Level, PBYTE pDriverInfo, DWORD dwFileCopyFlags) +{ + TRACE("AddPrinterDriverExA(%s, %lu, %p, %lu)\n", pName, Level, pDriverInfo, dwFileCopyFlags); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +AddPrinterDriverExW(PWSTR pName, DWORD Level, PBYTE pDriverInfo, DWORD dwFileCopyFlags) +{ + TRACE("AddPrinterDriverExW(%S, %lu, %p, %lu)\n", pName, Level, pDriverInfo, dwFileCopyFlags); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI AddPrinterDriverW(PWSTR pName, DWORD Level, PBYTE pDriverInfo) { @@ -15,6 +39,30 @@ AddPrinterDriverW(PWSTR pName, DWORD Level, PBYTE pDriverInfo) return FALSE; } +BOOL WINAPI +DeletePrinterDriverA(PSTR pName, PSTR pEnvironment, PSTR pDriverName) +{ + TRACE("DeletePrinterDriverA(%s, %s, %s)\n", pName, pEnvironment, pDriverName); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePrinterDriverExA(PSTR pName, PSTR pEnvironment, PSTR pDriverName, DWORD dwDeleteFlag, DWORD dwVersionFlag) +{ + TRACE("DeletePrinterDriverExA(%s, %s, %s, %lu, %lu)\n", pName, pEnvironment, pDriverName, dwDeleteFlag, dwVersionFlag); + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePrinterDriverExW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName, DWORD dwDeleteFlag, DWORD dwVersionFlag) +{ + TRACE("DeletePrinterDriverExW(%S, %S, %S, %lu, %lu)\n", pName, pEnvironment, pDriverName, dwDeleteFlag, dwVersionFlag); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI DeletePrinterDriverW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName) { @@ -23,6 +71,14 @@ DeletePrinterDriverW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName) return FALSE; } +BOOL WINAPI +EnumPrinterDriversA(PSTR pName, PSTR pEnvironment, DWORD Level, PBYTE pDriverInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumPrinterDriversA(%s, %s, %lu, %p, %lu, %p, %p)\n", pName, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI EnumPrinterDriversW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 7283757098..ffe1823089 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -212,6 +212,22 @@ _StartDocPrinterWithRPC(PSPOOLER_HANDLE pHandle, PDOC_INFO_1W pDocInfo1) return dwErrorCode; } +BOOL WINAPI +AbortPrinter(HANDLE hPrinter) +{ + TRACE("AbortPrinter(%p)\n", hPrinter); + UNIMPLEMENTED; + return FALSE; +} + +HANDLE WINAPI +AddPrinterA(PSTR pName, DWORD Level, PBYTE pPrinter) +{ + TRACE("AddPrinterA(%s, %lu, %p)\n", pName, Level, pPrinter); + UNIMPLEMENTED; + return NULL; +} + HANDLE WINAPI AddPrinterW(PWSTR pName, DWORD Level, PBYTE pPrinter) { @@ -259,10 +275,19 @@ Cleanup: return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +DeletePrinter(HANDLE hPrinter) +{ + TRACE("DeletePrinter(%p)\n", hPrinter); + UNIMPLEMENTED; + return FALSE; +} + DWORD WINAPI DeviceCapabilitiesA(LPCSTR pDevice, LPCSTR pPort, WORD fwCapability, LPSTR pOutput, const DEVMODEA* pDevMode) { TRACE("DeviceCapabilitiesA(%s, %s, %hu, %p, %p)\n", pDevice, pPort, fwCapability, pOutput, pDevMode); + UNIMPLEMENTED; return 0; } @@ -270,6 +295,7 @@ DWORD WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW* pDevMode) { TRACE("DeviceCapabilitiesW(%S, %S, %hu, %p, %p)\n", pDevice, pPort, fwCapability, pOutput, pDevMode); + UNIMPLEMENTED; return 0; } @@ -277,14 +303,16 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput, DWORD fMode) { TRACE("DocumentPropertiesA(%p, %p, %s, %p, %p, %lu)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput, fMode); - return 0; + UNIMPLEMENTED; + return -1; } LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput, DWORD fMode) { TRACE("DocumentPropertiesW(%p, %p, %S, %p, %p, %lu)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput, fMode); - return 0; + UNIMPLEMENTED; + return -1; } BOOL WINAPI @@ -432,6 +460,14 @@ Cleanup: return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +FlushPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pcWritten, DWORD cSleep) +{ + TRACE("FlushPrinter(%p, %p, %lu, %p, %lu)\n", hPrinter, pBuf, cbBuf, pcWritten, cSleep); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) { @@ -790,6 +826,14 @@ Cleanup: return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +ResetPrinterA(HANDLE hPrinter, PPRINTER_DEFAULTSA pDefault) +{ + TRACE("ResetPrinterA(%p, %p)\n", hPrinter, pDefault); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI ResetPrinterW(HANDLE hPrinter, PPRINTER_DEFAULTSW pDefault) { @@ -944,6 +988,14 @@ Cleanup: return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +SetPrinterA(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) +{ + TRACE("SetPrinterA(%p, %lu, %p, %lu)\n", hPrinter, Level, pPrinter, Command); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) { diff --git a/win32ss/printing/base/winspool/printprocessors.c b/win32ss/printing/base/winspool/printprocessors.c index 0e5acc7ef6..406297de6f 100644 --- a/win32ss/printing/base/winspool/printprocessors.c +++ b/win32ss/printing/base/winspool/printprocessors.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Spooler API - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Functions related to Print Processors - * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) - */ +* PROJECT: ReactOS Spooler API +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* PURPOSE: Functions related to Print Processors +* COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) +*/ #include "precomp.h" #include <prtprocenv.h> @@ -26,6 +26,14 @@ _MarshallUpPrintProcessorInfo(PPRINTPROCESSOR_INFO_1W* ppPrintProcessorInfo1) *ppPrintProcessorInfo1 += sizeof(PRINTPROCESSOR_INFO_1W); } +BOOL WINAPI +AddPrintProcessorA(PSTR pName, PSTR pEnvironment, PSTR pPathName, PSTR pPrintProcessorName) +{ + TRACE("AddPrintProcessorA(%s, %s, %s, %s)\n", pName, pEnvironment, pPathName, pPrintProcessorName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI AddPrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPathName, PWSTR pPrintProcessorName) { @@ -34,6 +42,14 @@ AddPrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPathName, PWSTR pPrin return FALSE; } +BOOL WINAPI +DeletePrintProcessorA(PSTR pName, PSTR pEnvironment, PSTR pPrintProcessorName) +{ + TRACE("DeletePrintProcessorA(%s, %s, %s)\n", pName, pEnvironment, pPrintProcessorName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI DeletePrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProcessorName) { @@ -69,7 +85,7 @@ EnumPrintProcessorDatatypesW(PWSTR pName, LPWSTR pPrintProcessorName, DWORD Leve { dwErrorCode = _RpcEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); ERR("_RpcEnumPrintProcessorDatatypes failed with exception code %lu!\n", dwErrorCode); @@ -90,6 +106,14 @@ Cleanup: return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +EnumPrintProcessorsA(PSTR pName, PSTR pEnvironment, DWORD Level, PBYTE pPrintProcessorInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + TRACE("EnumPrintProcessorsA(%s, %s, %lu, %p, %lu, %p, %p)\n", pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintProcessorInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { @@ -106,7 +130,7 @@ EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintP { dwErrorCode = _RpcEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); } @@ -226,7 +250,7 @@ GetPrintProcessorDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE { dwErrorCode = _RpcGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); } diff --git a/win32ss/printing/base/winspool/printproviders.c b/win32ss/printing/base/winspool/printproviders.c index 3ad4894bb2..58efb89f20 100644 --- a/win32ss/printing/base/winspool/printproviders.c +++ b/win32ss/printing/base/winspool/printproviders.c @@ -7,6 +7,14 @@ #include "precomp.h" +BOOL WINAPI +AddPrintProvidorA(PSTR pName, DWORD Level, PBYTE pProviderInfo) +{ + TRACE("AddPrintProvidorA(%s, %lu, %p)\n", pName, Level, pProviderInfo); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI AddPrintProvidorW(PWSTR pName, DWORD Level, PBYTE pProviderInfo) { @@ -15,6 +23,14 @@ AddPrintProvidorW(PWSTR pName, DWORD Level, PBYTE pProviderInfo) return FALSE; } +BOOL WINAPI +DeletePrintProvidorA(PSTR pName, PSTR pEnvironment, PSTR pPrintProviderName) +{ + TRACE("DeletePrintProvidorW(%s, %s, %s)\n", pName, pEnvironment, pPrintProviderName); + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI DeletePrintProvidorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProviderName) { diff --git a/win32ss/printing/base/winspool/winspool.spec b/win32ss/printing/base/winspool/winspool.spec index 1083ebcf0e..5d8fed463e 100644 --- a/win32ss/printing/base/winspool/winspool.spec +++ b/win32ss/printing/base/winspool/winspool.spec @@ -6,67 +6,67 @@ 105 stub PerfCollect 106 stub PerfOpen 107 stub ADVANCEDSETUPDIALOG -108 stub AbortPrinter -109 stub AddFormA -110 stub AddFormW -111 stdcall AddJobA(long long ptr long ptr) -112 stdcall AddJobW(long long ptr long ptr) -113 stub AddMonitorA +108 stdcall AbortPrinter(ptr) +109 stdcall AddFormA(ptr long ptr) +110 stdcall AddFormW(ptr long ptr) +111 stdcall AddJobA(ptr long ptr long ptr) +112 stdcall AddJobW(ptr long ptr long ptr) +113 stdcall AddMonitorA(str long ptr) 114 stdcall AddMonitorW(wstr long ptr) -115 stub AddPortA -116 stub AddPortExA -117 stub AddPortExW -118 stdcall AddPortW(wstr long wstr) -119 stub AddPrintProcessorA +115 stdcall AddPortA(str ptr str) +116 stdcall AddPortExA(str long ptr str) +117 stdcall AddPortExW(wstr long ptr wstr) +118 stdcall AddPortW(wstr ptr wstr) +119 stdcall AddPrintProcessorA(str str str str) 120 stdcall AddPrintProcessorW(wstr wstr wstr wstr) -121 stub AddPrintProvidorA +121 stdcall AddPrintProvidorA(str long ptr) 122 stdcall AddPrintProvidorW(wstr long ptr) -123 stub AddPrinterA +123 stdcall AddPrinterA(str long ptr) 124 stub AddPrinterConnectionA 125 stub AddPrinterConnectionW -126 stub AddPrinterDriverA -127 stub AddPrinterDriverExA -128 stub AddPrinterDriverExW +126 stdcall AddPrinterDriverA(str long ptr) +127 stdcall AddPrinterDriverExA(str long ptr long) +128 stdcall AddPrinterDriverExW(wstr long ptr long) 129 stdcall AddPrinterDriverW(wstr long ptr) 130 stdcall AddPrinterW(wstr long ptr) -131 stub AdvancedDocumentPropertiesA -132 stdcall AdvancedDocumentPropertiesW(long long wstr ptr ptr) +131 stdcall AdvancedDocumentPropertiesA(ptr ptr str ptr ptr) +132 stdcall AdvancedDocumentPropertiesW(ptr ptr wstr ptr ptr) 133 stub AdvancedSetupDialog -134 stdcall ClosePrinter(long) +134 stdcall ClosePrinter(ptr) 135 stub CloseSpoolFileHandle 136 stub CommitSpoolData -137 stub ConfigurePortA -138 stdcall ConfigurePortW(wstr long wstr) +137 stdcall ConfigurePortA(str ptr str) +138 stdcall ConfigurePortW(wstr ptr wstr) 139 stub ConnectToPrinterDlg 140 stub ConvertAnsiDevModeToUnicodeDevmode 141 stub ConvertUnicodeDevModeToAnsiDevmode 142 stub CreatePrinterIC 143 stub DEVICECAPABILITIES 144 stub DEVICEMODE -145 stub DeleteFormA -146 stub DeleteFormW -147 stub DeleteMonitorA +145 stdcall DeleteFormA(ptr str) +146 stdcall DeleteFormW(ptr wstr) +147 stdcall DeleteMonitorA(str str str) 148 stdcall DeleteMonitorW(wstr wstr wstr) -149 stub DeletePortA -150 stdcall DeletePortW(wstr long wstr) -151 stub DeletePrintProcessorA +149 stdcall DeletePortA(str ptr str) +150 stdcall DeletePortW(wstr ptr wstr) +151 stdcall DeletePrintProcessorA(str str str) 152 stdcall DeletePrintProcessorW(wstr wstr wstr) -153 stub DeletePrintProvidorA +153 stdcall DeletePrintProvidorA(str str str) 154 stdcall DeletePrintProvidorW(wstr wstr wstr) -155 stub DeletePrinter +155 stdcall DeletePrinter(ptr) 156 stub DeletePrinterConnectionA 157 stub DeletePrinterConnectionW -158 stub DeletePrinterDataA -159 stub DeletePrinterDataExA -160 stub DeletePrinterDataExW -161 stub DeletePrinterDataW -162 stub DeletePrinterDriverA -163 stub DeletePrinterDriverExA -164 stub DeletePrinterDriverExW +158 stdcall DeletePrinterDataA(ptr str) +159 stdcall DeletePrinterDataExA(ptr str str) +160 stdcall DeletePrinterDataExW(ptr wstr wstr) +161 stdcall DeletePrinterDataW(ptr wstr) +162 stdcall DeletePrinterDriverA(str str str) +163 stdcall DeletePrinterDriverExA(str str str long long) +164 stdcall DeletePrinterDriverExW(wstr wstr wstr long long) 165 stdcall DeletePrinterDriverW(wstr wstr wstr) 166 stub DeletePrinterIC -167 stub DeletePrinterKeyA -168 stub DeletePrinterKeyW +167 stdcall DeletePrinterKeyA(ptr str) +168 stdcall DeletePrinterKeyW(ptr wstr) 169 stub DevQueryPrint 170 stub DevQueryPrintEx 171 stub DeviceCapabilities @@ -75,29 +75,29 @@ 174 stub DeviceMode 175 stub DevicePropertySheets 176 stub DocumentEvent -177 stdcall DocumentPropertiesA(long long ptr ptr ptr long) -178 stdcall DocumentPropertiesW(long long ptr ptr ptr long) +177 stdcall DocumentPropertiesA(ptr ptr ptr ptr ptr long) +178 stdcall DocumentPropertiesW(ptr ptr ptr ptr ptr long) 179 stub DocumentPropertySheets 180 stub EXTDEVICEMODE -181 stdcall EndDocPrinter(long) -182 stdcall EndPagePrinter(long) -183 stub EnumFormsA -184 stub EnumFormsW -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 +181 stdcall EndDocPrinter(ptr) +182 stdcall EndPagePrinter(ptr) +183 stdcall EnumFormsA(ptr long ptr long ptr ptr) +184 stdcall EnumFormsW(ptr long ptr long ptr ptr) +185 stdcall EnumJobsA(ptr long long long ptr long ptr ptr) +186 stdcall EnumJobsW(ptr long long long ptr long ptr ptr) +187 stdcall EnumMonitorsA(str long ptr long ptr ptr) 188 stdcall EnumMonitorsW(wstr long ptr long ptr ptr) -189 stub EnumPortsA +189 stdcall EnumPortsA(str long ptr long ptr ptr) 190 stdcall EnumPortsW(wstr long ptr long ptr ptr) 191 stdcall EnumPrintProcessorDatatypesA(ptr ptr long ptr long ptr ptr) 192 stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) -193 stub EnumPrintProcessorsA -194 stdcall EnumPrintProcessorsW(ptr ptr long ptr long ptr ptr) -195 stub EnumPrinterDataA -196 stub EnumPrinterDataExA -197 stub EnumPrinterDataExW -198 stub EnumPrinterDataW -199 stub EnumPrinterDriversA +193 stdcall EnumPrintProcessorsA(str str long ptr long ptr ptr) +194 stdcall EnumPrintProcessorsW(wstr wstr long ptr long ptr ptr) +195 stdcall EnumPrinterDataA(ptr long str long ptr ptr ptr long ptr) +196 stdcall EnumPrinterDataExA(ptr str ptr long ptr ptr) +197 stdcall EnumPrinterDataExW(ptr wstr ptr long ptr ptr) +198 stdcall EnumPrinterDataW(ptr long wstr long ptr ptr ptr long ptr) +199 stdcall EnumPrinterDriversA(str str long ptr long ptr ptr) 200 stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stdcall SetDefaultPrinterA(str) @@ -123,7 +123,7 @@ 222 stub -noname SendRecvBidiData 223 stub -noname RouterFreeBidiResponseContainer 224 stub -noname ExternalConnectToLd64In32Server -225 stub EnumPrinterKeyA +225 stdcall EnumPrinterKeyA(ptr str str long ptr) 226 stub -noname PrintUIWebPnpEntry 227 stub -noname PrintUIWebPnpPostEntry 228 stub -noname PrintUICreateInstance @@ -131,31 +131,31 @@ 230 stub -noname PrintUIPrinterSetup 231 stub -noname PrintUIServerPropPages 232 stub -noname AddDriverCatalog -233 stub EnumPrinterKeyW +233 stdcall EnumPrinterKeyW(ptr wstr wstr long ptr) 234 stdcall EnumPrintersA(long ptr long ptr long ptr ptr) 235 stdcall EnumPrintersW(long ptr long ptr long ptr ptr) 236 stub ExtDeviceMode 237 stub FindClosePrinterChangeNotification 238 stub FindFirstPrinterChangeNotification 239 stub FindNextPrinterChangeNotification -240 stub FlushPrinter +240 stdcall FlushPrinter(ptr ptr long ptr long) 241 stub FreePrinterNotifyInfo -242 stub GetFormA -243 stub GetFormW -244 stdcall GetJobA(long long long ptr long ptr) -245 stdcall GetJobW(long long long ptr long ptr) +242 stdcall GetFormA(ptr str long ptr long ptr) +243 stdcall GetFormW(ptr str long ptr long ptr) +244 stdcall GetJobA(ptr long long ptr long ptr) +245 stdcall GetJobW(ptr long long ptr long ptr) 246 stdcall GetPrintProcessorDirectoryA(str str long ptr long ptr) 247 stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) -248 stdcall GetPrinterA(long long ptr long ptr) -249 stdcall GetPrinterDataA(long str ptr ptr long ptr) -250 stdcall GetPrinterDataExA(long str str ptr ptr long ptr) -251 stdcall GetPrinterDataExW(long wstr wstr ptr ptr long ptr) -252 stdcall GetPrinterDataW(long wstr ptr ptr long ptr) -253 stdcall GetPrinterDriverA(long str long ptr long ptr) +248 stdcall GetPrinterA(ptr long ptr long ptr) +249 stdcall GetPrinterDataA(ptr str ptr ptr long ptr) +250 stdcall GetPrinterDataExA(ptr str str ptr ptr long ptr) +251 stdcall GetPrinterDataExW(ptr wstr wstr ptr ptr long ptr) +252 stdcall GetPrinterDataW(ptr wstr ptr ptr long ptr) +253 stdcall GetPrinterDriverA(ptr str long ptr long ptr) 254 stdcall -stub GetPrinterDriverDirectoryA(str str long ptr long ptr) 255 stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) -256 stdcall GetPrinterDriverW(long wstr long ptr long ptr) -257 stdcall GetPrinterW(long long ptr long ptr) +256 stdcall GetPrinterDriverW(ptr wstr long ptr long ptr) +257 stdcall GetPrinterW(ptr long ptr long ptr) 258 stub GetSpoolFileHandle 259 stdcall IsValidDevmodeA(ptr long) 260 stdcall IsValidDevmodeW(ptr long) @@ -168,33 +168,33 @@ 267 stub QueryColorProfile 268 stub QueryRemoteFonts 269 stub QuerySpoolMode -270 stdcall ReadPrinter(long ptr long ptr) -271 stub ResetPrinterA -272 stdcall ResetPrinterW(long ptr) -273 stdcall ScheduleJob(long long) +270 stdcall ReadPrinter(ptr ptr long ptr) +271 stdcall ResetPrinterA(ptr ptr) +272 stdcall ResetPrinterW(ptr ptr) +273 stdcall ScheduleJob(ptr long) 274 stub SeekPrinter 275 stub SetAllocFailCount -276 stub SetFormA -277 stub SetFormW -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 -283 stdcall SetPrinterDataA(long str long ptr long) -284 stdcall SetPrinterDataExA(long str str long ptr long) -285 stdcall SetPrinterDataExW(long wstr wstr long ptr long) -286 stdcall SetPrinterDataW(long wstr long ptr long) -287 stdcall SetPrinterW(long long ptr long) +276 stdcall SetFormA(ptr str long str) +277 stdcall SetFormW(ptr str long str) +278 stdcall SetJobA(ptr long long ptr long) +279 stdcall SetJobW(ptr long long ptr long) +280 stdcall SetPortA(str str long ptr) +281 stdcall SetPortW(wstr wstr long ptr) +282 stdcall SetPrinterA(ptr long ptr long) +283 stdcall SetPrinterDataA(ptr str long ptr long) +284 stdcall SetPrinterDataExA(ptr str str long ptr long) +285 stdcall SetPrinterDataExW(ptr wstr wstr long ptr long) +286 stdcall SetPrinterDataW(ptr wstr long ptr long) +287 stdcall SetPrinterW(ptr long ptr long) 288 stub SplDriverUnloadComplete 289 stub SpoolerDevQueryPrintW 290 stdcall SpoolerInit() 291 stub SpoolerPrinterEvent 292 stub StartDocDlgA 293 stub StartDocDlgW -294 stdcall StartDocPrinterA(long long ptr) -295 stdcall StartDocPrinterW(long long ptr) -296 stdcall StartPagePrinter(long) +294 stdcall StartDocPrinterA(ptr long ptr) +295 stdcall StartDocPrinterW(ptr long ptr) +296 stdcall StartPagePrinter(ptr) 297 stub WaitForPrinterChange -298 stdcall WritePrinter(long ptr long ptr) -299 stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) +298 stdcall WritePrinter(ptr ptr long ptr) +299 stdcall XcvDataW(ptr wstr ptr long ptr long ptr ptr)

7 years

[reactos] 02/03: [WINSPOOL] Add tracing to all exported APIs.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f6f08eca09a5071efe08… commit 1f6f08eca09a5071efe08a7046fd4412737143e0 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Dec 9 12:00:09 2017 +0100 [WINSPOOL] Add tracing to all exported APIs. --- win32ss/printing/base/winspool/devmode.c | 6 +++- win32ss/printing/base/winspool/jobs.c | 16 ++++++++- win32ss/printing/base/winspool/main.c | 6 +++- win32ss/printing/base/winspool/monitors.c | 6 +++- win32ss/printing/base/winspool/ports.c | 7 +++- win32ss/printing/base/winspool/printerdata.c | 13 +++++++ win32ss/printing/base/winspool/printerdrivers.c | 6 +++- win32ss/printing/base/winspool/printers.c | 44 ++++++++++++++++++++++++ win32ss/printing/base/winspool/printprocessors.c | 11 ++++++ win32ss/printing/base/winspool/printproviders.c | 4 ++- 10 files changed, 112 insertions(+), 7 deletions(-) diff --git a/win32ss/printing/base/winspool/devmode.c b/win32ss/printing/base/winspool/devmode.c index 231badc28c..b75932a313 100644 --- a/win32ss/printing/base/winspool/devmode.c +++ b/win32ss/printing/base/winspool/devmode.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions giving information about DEVMODE structures - * COPYRIGHT: Copyright 2016 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2016-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -136,6 +136,8 @@ IsValidDevmodeA(PDEVMODEA pDevmode, size_t DevmodeSize) PMINIMUM_SIZE_TABLE pTable = MinimumSizeA; WORD wRequiredSize; + TRACE("IsValidDevmodeA(%p, %lu)\n", pDevmode, DevmodeSize); + // Check if a Devmode was given at all. if (!pDevmode) goto Failure; @@ -186,6 +188,8 @@ IsValidDevmodeW(PDEVMODEW pDevmode, size_t DevmodeSize) PMINIMUM_SIZE_TABLE pTable = MinimumSizeW; WORD wRequiredSize; + TRACE("IsValidDevmodeW(%p, %lu)\n", pDevmode, DevmodeSize); + // Check if a Devmode was given at all. if (!pDevmode) goto Failure; diff --git a/win32ss/printing/base/winspool/jobs.c b/win32ss/printing/base/winspool/jobs.c index f8cb65a64f..7551a30b33 100644 --- a/win32ss/printing/base/winspool/jobs.c +++ b/win32ss/printing/base/winspool/jobs.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions for managing print jobs - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -59,6 +59,7 @@ _MarshallUpJobInfo(PBYTE pJobInfo, DWORD Level) BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded) { + TRACE("AddJobA(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded); UNIMPLEMENTED; return FALSE; } @@ -69,6 +70,8 @@ AddJobW(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("AddJobW(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded); + if (!pHandle) { dwErrorCode = ERROR_INVALID_HANDLE; @@ -98,6 +101,7 @@ Cleanup: BOOL WINAPI EnumJobsA(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + TRACE("EnumJobsA(%p, %lu, %lu, %lu, %p, %lu, %p, %p)\n", hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); UNIMPLEMENTED; return FALSE; } @@ -110,6 +114,8 @@ EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob PBYTE p = pJob; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("EnumJobsW(%p, %lu, %lu, %lu, %p, %lu, %p, %p)\n", hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); + if (!pHandle) { dwErrorCode = ERROR_INVALID_HANDLE; @@ -150,6 +156,7 @@ Cleanup: BOOL WINAPI GetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded) { + TRACE("GetJobA(%p, %lu, %lu, %p, %lu, %p)\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); UNIMPLEMENTED; return FALSE; } @@ -160,6 +167,8 @@ GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWO DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("GetJobW(%p, %lu, %lu, %p, %lu, %p)\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); + if (!pHandle) { dwErrorCode = ERROR_INVALID_HANDLE; @@ -195,6 +204,8 @@ ScheduleJob(HANDLE hPrinter, DWORD dwJobID) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("ScheduleJob(%p, %lu)\n", hPrinter, dwJobID); + if (!pHandle) { dwErrorCode = ERROR_INVALID_HANDLE; @@ -221,6 +232,7 @@ Cleanup: BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { + TRACE("SetJobA(%p, %lu, %lu, %p, %lu)\n", hPrinter, JobId, Level, pJobInfo, Command); UNIMPLEMENTED; return FALSE; } @@ -232,6 +244,8 @@ SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; WINSPOOL_JOB_CONTAINER JobContainer; + TRACE("SetJobW(%p, %lu, %lu, %p, %lu)\n", hPrinter, JobId, Level, pJobInfo, Command); + if (!pHandle) { dwErrorCode = ERROR_INVALID_HANDLE; diff --git a/win32ss/printing/base/winspool/main.c b/win32ss/printing/base/winspool/main.c index 97e09d7009..c4f6f77ad1 100644 --- a/win32ss/printing/base/winspool/main.c +++ b/win32ss/printing/base/winspool/main.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main functions - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -72,6 +72,8 @@ midl_user_free(void __RPC_FAR* ptr) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { + TRACE("DllMain(%p, %lu, %p)\n", hinstDLL, fdwReason, lpvReserved); + switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -89,6 +91,8 @@ SpoolerInit(VOID) BOOL bReturnValue = FALSE; DWORD dwErrorCode; + TRACE("SpoolerInit()\n"); + // Nothing to initialize here yet, but pass this call to the Spool Service as well. RpcTryExcept { diff --git a/win32ss/printing/base/winspool/monitors.c b/win32ss/printing/base/winspool/monitors.c index 9d5f4af74f..a5b30fe7f5 100644 --- a/win32ss/printing/base/winspool/monitors.c +++ b/win32ss/printing/base/winspool/monitors.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Monitors - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -25,6 +25,7 @@ _MarshallUpMonitorInfo(PBYTE pMonitorInfo, DWORD Level) BOOL WINAPI AddMonitorW(PWSTR pName, DWORD Level, PBYTE pMonitors) { + TRACE("AddMonitorW(%S, %lu, %p)\n", pName, Level, pMonitors); UNIMPLEMENTED; return FALSE; } @@ -32,6 +33,7 @@ AddMonitorW(PWSTR pName, DWORD Level, PBYTE pMonitors) BOOL WINAPI DeleteMonitorW(PWSTR pName, PWSTR pEnvironment, PWSTR pMonitorName) { + TRACE("DeleteMonitorW(%S, %S, %S)\n", pName, pEnvironment, pMonitorName); UNIMPLEMENTED; return FALSE; } @@ -43,6 +45,8 @@ EnumMonitorsW(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcb DWORD i; PBYTE p = pMonitors; + TRACE("EnumMonitorsW(%S, %lu, %p, %lu, %p, %p)\n", pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); + // Do the RPC call RpcTryExcept { diff --git a/win32ss/printing/base/winspool/ports.c b/win32ss/printing/base/winspool/ports.c index 6fc9d01680..4e8d020e84 100644 --- a/win32ss/printing/base/winspool/ports.c +++ b/win32ss/printing/base/winspool/ports.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Ports - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -25,6 +25,7 @@ _MarshallUpPortInfo(PBYTE pPortInfo, DWORD Level) BOOL WINAPI AddPortW(PWSTR pName, HWND hWnd, PWSTR pMonitorName) { + TRACE("AddPortW(%S, %p, %S)\n", pName, hWnd, pMonitorName); UNIMPLEMENTED; return FALSE; } @@ -32,6 +33,7 @@ AddPortW(PWSTR pName, HWND hWnd, PWSTR pMonitorName) BOOL WINAPI ConfigurePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) { + TRACE("ConfigurePortW(%S, %p, %S)\n", pName, hWnd, pPortName); UNIMPLEMENTED; return FALSE; } @@ -39,6 +41,7 @@ ConfigurePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) BOOL WINAPI DeletePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) { + TRACE("DeletePortW(%S, %p, %S)\n", pName, hWnd, pPortName); UNIMPLEMENTED; return FALSE; } @@ -50,6 +53,8 @@ EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded DWORD i; PBYTE p = pPorts; + TRACE("EnumPortsW(%S, %lu, %p, %lu, %p, %p)\n", pName, Level, pPorts, cbBuf, pcbNeeded, pcReturned); + // Do the RPC call RpcTryExcept { diff --git a/win32ss/printing/base/winspool/printerdata.c b/win32ss/printing/base/winspool/printerdata.c index e368678736..8904bb74d3 100644 --- a/win32ss/printing/base/winspool/printerdata.c +++ b/win32ss/printing/base/winspool/printerdata.c @@ -10,6 +10,7 @@ LONG WINAPI AdvancedDocumentPropertiesW(HWND hWnd, HANDLE hPrinter, PWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput) { + TRACE("AdvancedDocumentPropertiesW(%p, %p, %S, %p, %p)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput); UNIMPLEMENTED; return FALSE; } @@ -17,6 +18,7 @@ AdvancedDocumentPropertiesW(HWND hWnd, HANDLE hPrinter, PWSTR pDeviceName, PDEVM DWORD WINAPI GetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { + TRACE("GetPrinterDataA(%p, %s, %p, %p, %lu, %p)\n", hPrinter, pValueName, pType, pData, nSize, pcbNeeded); return GetPrinterDataExA(hPrinter, "PrinterDriverData", pValueName, pType, pData, nSize, pcbNeeded); } @@ -33,6 +35,8 @@ GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPCSTR pValueName, LPDWORD p PWSTR pwszKeyName = NULL; PWSTR pwszValueName = NULL; + TRACE("GetPrinterDataExA(%p, %s, %s, %p, %p, %lu, %p)\n", hPrinter, pKeyName, pValueName, pType, pData, nSize, pcbNeeded); + if (pKeyName) { // Convert pKeyName to a Unicode string pwszKeyName @@ -191,6 +195,8 @@ GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, LPDWORD DWORD dwType = REG_NONE; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("GetPrinterDataExW(%p, %S, %S, %p, %p, %lu, %p)\n", hPrinter, pKeyName, pValueName, pType, pData, nSize, pcbNeeded); + // Sanity checks if (!pHandle) return ERROR_INVALID_HANDLE; @@ -223,12 +229,14 @@ GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, LPDWORD DWORD WINAPI GetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { + TRACE("GetPrinterDataW(%p, %S, %p, %p, %lu, %p)\n", hPrinter, pValueName, pType, pData, nSize, pcbNeeded); return GetPrinterDataExW(hPrinter, L"PrinterDriverData", pValueName, pType, pData, nSize, pcbNeeded); } DWORD WINAPI SetPrinterDataA(HANDLE hPrinter, PSTR pValueName, DWORD Type, PBYTE pData, DWORD cbData) { + TRACE("SetPrinterDataA(%p, %s, %lu, %p, %lu)\n", hPrinter, pValueName, Type, pData, cbData); return SetPrinterDataExA(hPrinter, "PrinterDriverData", pValueName, Type, pData, cbData); } @@ -241,6 +249,8 @@ SetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPCSTR pValueName, DWORD Typ PWSTR pwszValueName = NULL; PWSTR pUnicodeData = NULL; + TRACE("SetPrinterDataExA(%p, %s, %s, %lu, %p, %lu)\n", hPrinter, pKeyName, pValueName, Type, pData, cbData); + if (pKeyName) { // Convert pKeyName to a Unicode string pwszKeyName @@ -313,6 +323,8 @@ SetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, DWORD T DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("SetPrinterDataExW(%p, %S, %S, %lu, %p, %lu)\n", hPrinter, pKeyName, pValueName, Type, pData, cbData); + // Sanity checks if (!pHandle) return ERROR_INVALID_HANDLE; @@ -337,5 +349,6 @@ SetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, DWORD T DWORD WINAPI SetPrinterDataW(HANDLE hPrinter, PWSTR pValueName, DWORD Type, PBYTE pData, DWORD cbData) { + TRACE("SetPrinterDataW(%p, %S, %lu, %p, %lu)\n", hPrinter, pValueName, Type, pData, cbData); return SetPrinterDataExW(hPrinter, L"PrinterDriverData", pValueName, Type, pData, cbData); } diff --git a/win32ss/printing/base/winspool/printerdrivers.c b/win32ss/printing/base/winspool/printerdrivers.c index e68a5186b4..d35e804571 100644 --- a/win32ss/printing/base/winspool/printerdrivers.c +++ b/win32ss/printing/base/winspool/printerdrivers.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Printer Drivers - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -10,6 +10,7 @@ BOOL WINAPI AddPrinterDriverW(PWSTR pName, DWORD Level, PBYTE pDriverInfo) { + TRACE("AddPrinterDriverW(%S, %lu, %p)\n", pName, Level, pDriverInfo); UNIMPLEMENTED; return FALSE; } @@ -17,6 +18,7 @@ AddPrinterDriverW(PWSTR pName, DWORD Level, PBYTE pDriverInfo) BOOL WINAPI DeletePrinterDriverW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName) { + TRACE("DeletePrinterDriverW(%S, %S, %S)\n", pName, pEnvironment, pDriverName); UNIMPLEMENTED; return FALSE; } @@ -24,6 +26,7 @@ DeletePrinterDriverW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName) BOOL WINAPI EnumPrinterDriversW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + TRACE("EnumPrinterDriversW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded, pcReturned); UNIMPLEMENTED; return FALSE; } @@ -31,6 +34,7 @@ EnumPrinterDriversW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverI BOOL WINAPI GetPrinterDriverDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverDirectory, DWORD cbBuf, PDWORD pcbNeeded) { + TRACE("GetPrinterDriverDirectoryW(%S, %S, %lu, %p, %lu, %p)\n", pName, pEnvironment, Level, pDriverDirectory, cbBuf, pcbNeeded); UNIMPLEMENTED; return FALSE; } diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 2abd5c3d0c..7283757098 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -215,6 +215,7 @@ _StartDocPrinterWithRPC(PSPOOLER_HANDLE pHandle, PDOC_INFO_1W pDocInfo1) HANDLE WINAPI AddPrinterW(PWSTR pName, DWORD Level, PBYTE pPrinter) { + TRACE("AddPrinterW(%S, %lu, %p)\n", pName, Level, pPrinter); UNIMPLEMENTED; return NULL; } @@ -225,6 +226,8 @@ ClosePrinter(HANDLE hPrinter) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("ClosePrinter(%p)\n", hPrinter); + // Sanity checks. if (!pHandle) { @@ -259,24 +262,28 @@ Cleanup: DWORD WINAPI DeviceCapabilitiesA(LPCSTR pDevice, LPCSTR pPort, WORD fwCapability, LPSTR pOutput, const DEVMODEA* pDevMode) { + TRACE("DeviceCapabilitiesA(%s, %s, %hu, %p, %p)\n", pDevice, pPort, fwCapability, pOutput, pDevMode); return 0; } DWORD WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW* pDevMode) { + TRACE("DeviceCapabilitiesW(%S, %S, %hu, %p, %p)\n", pDevice, pPort, fwCapability, pOutput, pDevMode); return 0; } LONG WINAPI DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput, DWORD fMode) { + TRACE("DocumentPropertiesA(%p, %p, %s, %p, %p, %lu)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput, fMode); return 0; } LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput, DWORD fMode) { + TRACE("DocumentPropertiesW(%p, %p, %S, %p, %p, %lu)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput, fMode); return 0; } @@ -286,6 +293,8 @@ EndDocPrinter(HANDLE hPrinter) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("EndDocPrinter(%p)\n", hPrinter); + // Sanity checks. if (!pHandle) { @@ -339,6 +348,8 @@ EndPagePrinter(HANDLE hPrinter) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("EndPagePrinter(%p)\n", hPrinter); + // Sanity checks. if (!pHandle) { @@ -374,6 +385,7 @@ Cleanup: BOOL WINAPI EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + TRACE("EnumPrintersA(%lu, %s, %lu, %p, %lu, %p, %p)\n", Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); return FALSE; } @@ -382,6 +394,8 @@ EnumPrintersW(DWORD Flags, PWSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cb { DWORD dwErrorCode; + TRACE("EnumPrintersW(%lu, %S, %lu, %p, %lu, %p, %p)\n", Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + // Dismiss invalid levels already at this point. if (Level == 3 || Level > 5) { @@ -424,6 +438,8 @@ GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) DWORD dwErrorCode; PWSTR pwszBuffer = NULL; + TRACE("GetDefaultPrinterA(%p, %p)\n", pszBuffer, pcchBuffer); + // Sanity check. if (!pcchBuffer) { @@ -472,6 +488,8 @@ GetDefaultPrinterW(LPWSTR pszBuffer, LPDWORD pcchBuffer) PWSTR pwszDevice = NULL; PWSTR pwszComma; + TRACE("GetDefaultPrinterW(%p, %p)\n", pszBuffer, pcchBuffer); + // Sanity check. if (!pcchBuffer) { @@ -554,18 +572,21 @@ Cleanup: BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { + TRACE("GetPrinterA(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pPrinter, cbBuf, pcbNeeded); return FALSE; } BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { + TRACE("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); return FALSE; } BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { + TRACE("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); return FALSE; } @@ -574,6 +595,8 @@ GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD { DWORD dwErrorCode; + TRACE("GetPrinterW(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pPrinter, cbBuf, pcbNeeded); + // Dismiss invalid levels already at this point. if (Level > 9) { @@ -615,6 +638,8 @@ OpenPrinterA(LPSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSA pDefaul PWSTR pwszPrinterName = NULL; PRINTER_DEFAULTSW wDefault = { 0 }; + TRACE("OpenPrinterA(%s, %p, %p)\n", pPrinterName, phPrinter, pDefault); + if (pPrinterName) { // Convert pPrinterName to a Unicode string pwszPrinterName @@ -680,6 +705,8 @@ OpenPrinterW(LPWSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefau WINSPOOL_DEVMODE_CONTAINER DevModeContainer = { 0 }; ACCESS_MASK AccessRequired = 0; + TRACE("OpenPrinterW(%S, %p, %p)\n", pPrinterName, phPrinter, pDefault); + // Sanity check if (!phPrinter) { @@ -737,6 +764,8 @@ ReadPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pNoBytesRead) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("ReadPrinter(%p, %p, %lu, %p)\n", hPrinter, pBuf, cbBuf, pNoBytesRead); + // Sanity checks. if (!pHandle) { @@ -764,6 +793,7 @@ Cleanup: BOOL WINAPI ResetPrinterW(HANDLE hPrinter, PPRINTER_DEFAULTSW pDefault) { + TRACE("ResetPrinterW(%p, %p)\n", hPrinter, pDefault); UNIMPLEMENTED; return FALSE; } @@ -775,6 +805,8 @@ SetDefaultPrinterA(LPCSTR pszPrinter) DWORD cch; PWSTR pwszPrinter = NULL; + TRACE("SetDefaultPrinterA(%s)\n", pszPrinter); + if (pszPrinter) { // Convert pszPrinter to a Unicode string pwszPrinter @@ -814,6 +846,8 @@ SetDefaultPrinterW(LPCWSTR pszPrinter) PWSTR pwszDeviceValueData = NULL; WCHAR wszPrinter[MAX_PRINTER_NAME + 1]; + TRACE("SetDefaultPrinterW(%S)\n", pszPrinter); + // Open the Devices registry key. dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_CURRENT_USER, wszDevicesKey, 0, KEY_READ, &hDevicesKey); if (dwErrorCode != ERROR_SUCCESS) @@ -913,6 +947,7 @@ Cleanup: BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) { + TRACE("SetPrinterW(%p, %lu, %p, %lu)\n", hPrinter, Level, pPrinter, Command); UNIMPLEMENTED; return FALSE; } @@ -926,6 +961,8 @@ StartDocPrinterA(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) DWORD dwReturnValue = 0; PDOC_INFO_1A pDocInfo1 = (PDOC_INFO_1A)pDocInfo; + TRACE("StartDocPrinterA(%p, %lu, %p)\n", hPrinter, Level, pDocInfo); + // Only check the minimum required for accessing pDocInfo. // Additional sanity checks are done in StartDocPrinterW. if (!pDocInfo1) @@ -1016,6 +1053,8 @@ StartDocPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) PDOC_INFO_1W pDocInfo1 = (PDOC_INFO_1W)pDocInfo; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("StartDocPrinterW(%p, %lu, %p)\n", hPrinter, Level, pDocInfo); + // Sanity checks. if (!pHandle) { @@ -1100,6 +1139,8 @@ StartPagePrinter(HANDLE hPrinter) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("StartPagePrinter(%p)\n", hPrinter); + // Sanity checks. if (!pHandle) { @@ -1130,6 +1171,8 @@ WritePrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pcWritten) DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("WritePrinter(%p, %p, %lu, %p)\n", hPrinter, pBuf, cbBuf, pcWritten); + // Sanity checks. if (!pHandle) { @@ -1181,5 +1224,6 @@ Cleanup: BOOL WINAPI XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) { + TRACE("XcvDataW(%p, %S, %p, %lu, %p, %lu, %p, %p)\n", hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); return FALSE; } diff --git a/win32ss/printing/base/winspool/printprocessors.c b/win32ss/printing/base/winspool/printprocessors.c index 122cd74d0f..0e5acc7ef6 100644 --- a/win32ss/printing/base/winspool/printprocessors.c +++ b/win32ss/printing/base/winspool/printprocessors.c @@ -29,6 +29,7 @@ _MarshallUpPrintProcessorInfo(PPRINTPROCESSOR_INFO_1W* ppPrintProcessorInfo1) BOOL WINAPI AddPrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPathName, PWSTR pPrintProcessorName) { + TRACE("AddPrintProcessorW(%S, %S, %S, %S)\n", pName, pEnvironment, pPathName, pPrintProcessorName); UNIMPLEMENTED; return FALSE; } @@ -36,6 +37,7 @@ AddPrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPathName, PWSTR pPrin BOOL WINAPI DeletePrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProcessorName) { + TRACE("DeletePrintProcessorW(%S, %S, %S)\n", pName, pEnvironment, pPrintProcessorName); UNIMPLEMENTED; return FALSE; } @@ -43,6 +45,7 @@ DeletePrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProcessorName BOOL WINAPI EnumPrintProcessorDatatypesA(PSTR pName, LPSTR pPrintProcessorName, DWORD Level, PBYTE pDatatypes, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + TRACE("EnumPrintProcessorDatatypesA(%s, %s, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); UNIMPLEMENTED; return FALSE; } @@ -52,6 +55,8 @@ EnumPrintProcessorDatatypesW(PWSTR pName, LPWSTR pPrintProcessorName, DWORD Leve { DWORD dwErrorCode; + TRACE("EnumPrintProcessorDatatypesW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + // Sanity checks if (Level != 1) { @@ -90,6 +95,8 @@ EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintP { DWORD dwErrorCode; + TRACE("EnumPrintProcessorsW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + // Choose our current environment if the caller didn't give any. if (!pEnvironment) pEnvironment = (PWSTR)wszCurrentEnvironment; @@ -127,6 +134,8 @@ GetPrintProcessorDirectoryA(PSTR pName, PSTR pEnvironment, DWORD Level, PBYTE pP PWSTR pwszEnvironment = NULL; PWSTR pwszPrintProcessorInfo = NULL; + TRACE("GetPrintProcessorDirectoryA(%s, %s, %lu, %p, %lu, %p)\n", pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); + if (pName) { // Convert pName to a Unicode string pwszName. @@ -199,6 +208,8 @@ GetPrintProcessorDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE { DWORD dwErrorCode; + TRACE("GetPrintProcessorDirectoryW(%S, %S, %lu, %p, %lu, %p)\n", pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); + // Sanity checks if (Level != 1) { diff --git a/win32ss/printing/base/winspool/printproviders.c b/win32ss/printing/base/winspool/printproviders.c index 5ba1929f44..3ad4894bb2 100644 --- a/win32ss/printing/base/winspool/printproviders.c +++ b/win32ss/printing/base/winspool/printproviders.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions related to Print Providers - * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -10,6 +10,7 @@ BOOL WINAPI AddPrintProvidorW(PWSTR pName, DWORD Level, PBYTE pProviderInfo) { + TRACE("AddPrintProvidorW(%S, %lu, %p)\n", pName, Level, pProviderInfo); UNIMPLEMENTED; return FALSE; } @@ -17,6 +18,7 @@ AddPrintProvidorW(PWSTR pName, DWORD Level, PBYTE pProviderInfo) BOOL WINAPI DeletePrintProvidorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProviderName) { + TRACE("DeletePrintProvidorW(%S, %S, %S)\n", pName, pEnvironment, pPrintProviderName); UNIMPLEMENTED; return FALSE; }

7 years

[reactos] 01/03: [WINSPOOL] Convert the returned Unicode string back to ANSI in GetDefaultPrinterA.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b9b5c1ef203b6de89d8… commit 45b9b5c1ef203b6de89d8561008ab52843f3086c Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Dec 9 10:59:40 2017 +0100 [WINSPOOL] Convert the returned Unicode string back to ANSI in GetDefaultPrinterA. Thanks to Mark for the hint in CORE-14072! --- win32ss/printing/base/winspool/printers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 0441ff36ad..2abd5c3d0c 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -449,6 +449,9 @@ GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) goto Cleanup; } + // We successfully got a string in pwszBuffer, so convert the Unicode string to ANSI. + WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszBuffer, *pcchBuffer, NULL, NULL); + dwErrorCode = ERROR_SUCCESS; Cleanup:

7 years

[reactos] 01/01: [USER32_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de793ea5d66cde95583e5… commit de793ea5d66cde95583e5c666a6d6ef1036bda38 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:58:55 2017 +0100 [USER32_WINETEST] Add a PCH. --- modules/rostests/winetests/user32/CMakeLists.txt | 12 ++++++++++-- modules/rostests/winetests/user32/broadcast.c | 13 +------------ modules/rostests/winetests/user32/class.c | 18 +++--------------- modules/rostests/winetests/user32/clipboard.c | 8 +------- modules/rostests/winetests/user32/combo.c | 9 +-------- modules/rostests/winetests/user32/cursoricon.c | 11 +---------- modules/rostests/winetests/user32/dce.c | 11 +---------- modules/rostests/winetests/user32/dde.c | 16 ++++------------ modules/rostests/winetests/user32/dialog.c | 14 ++------------ modules/rostests/winetests/user32/edit.c | 6 +----- modules/rostests/winetests/user32/generated.c | 11 +---------- modules/rostests/winetests/user32/input.c | 14 +------------- modules/rostests/winetests/user32/listbox.c | 12 +----------- modules/rostests/winetests/user32/menu.c | 16 +--------------- modules/rostests/winetests/user32/monitor.c | 5 +---- modules/rostests/winetests/user32/msg.c | 16 ++-------------- modules/rostests/winetests/user32/precomp.h | 16 ++++++++++++++++ modules/rostests/winetests/user32/resource.c | 5 +---- modules/rostests/winetests/user32/scroll.c | 7 +------ modules/rostests/winetests/user32/static.c | 9 +-------- modules/rostests/winetests/user32/sysparams.c | 20 ++------------------ modules/rostests/winetests/user32/text.c | 9 +-------- modules/rostests/winetests/user32/uitools.c | 6 +----- modules/rostests/winetests/user32/win.c | 15 +-------------- modules/rostests/winetests/user32/winstation.c | 9 +++------ modules/rostests/winetests/user32/wsprintf.c | 8 +------- 26 files changed, 60 insertions(+), 236 deletions(-) diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 041e696023..fc73d16b5f 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -1,4 +1,7 @@ +remove_definitions(-DWINVER=0x502 -D_WIN32_WINNT=0x502) +add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x600) + list(APPEND SOURCE broadcast.c class.c @@ -24,9 +27,14 @@ list(APPEND SOURCE win.c winstation.c wsprintf.c - testlist.c) + precomp.h) + +add_executable(user32_winetest + ${SOURCE} + testlist.c + resource.rc) -add_executable(user32_winetest ${SOURCE} resource.rc) +add_pch(user32_winetest precomp.h SOURCE) # some tests need to be run from an app compiled as GUI set_module_type(user32_winetest win32gui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) diff --git a/modules/rostests/winetests/user32/broadcast.c b/modules/rostests/winetests/user32/broadcast.c index a18f11a920..d4041500fa 100644 --- a/modules/rostests/winetests/user32/broadcast.c +++ b/modules/rostests/winetests/user32/broadcast.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define _WIN32_WINNT 0x0501 - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" - -#include "wine/test.h" +#include "precomp.h" typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); diff --git a/modules/rostests/winetests/user32/class.c b/modules/rostests/winetests/user32/class.c index 8f316aadab..0d358c2ad9 100755 --- a/modules/rostests/winetests/user32/class.c +++ b/modules/rostests/winetests/user32/class.c @@ -18,21 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get CS_DROPSHADOW with the MSVC headers */ -//#define _WIN32_WINNT 0x0501 - -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "commctrl.h" +#include "precomp.h" + +#include <commctrl.h> #define NUMCLASSWORDS 4 diff --git a/modules/rostests/winetests/user32/clipboard.c b/modules/rostests/winetests/user32/clipboard.c index 591a47c859..f4aa4a60a3 100755 --- a/modules/rostests/winetests/user32/clipboard.c +++ b/modules/rostests/winetests/user32/clipboard.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include "wine/test.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" +#include "precomp.h" #define WM_CLIPBOARDUPDATE 0x031D diff --git a/modules/rostests/winetests/user32/combo.c b/modules/rostests/winetests/user32/combo.c index 7c91f7f5c0..6f42108bb9 100644 --- a/modules/rostests/winetests/user32/combo.c +++ b/modules/rostests/winetests/user32/combo.c @@ -17,14 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" +#include "precomp.h" #define COMBO_ID 1995 diff --git a/modules/rostests/winetests/user32/cursoricon.c b/modules/rostests/winetests/user32/cursoricon.c index 61b32e01b6..11c89c35fe 100644 --- a/modules/rostests/winetests/user32/cursoricon.c +++ b/modules/rostests/winetests/user32/cursoricon.c @@ -20,16 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" +#include "precomp.h" #include "pshpack1.h" diff --git a/modules/rostests/winetests/user32/dce.c b/modules/rostests/winetests/user32/dce.c index 382d10a43a..92f320cfd0 100755 --- a/modules/rostests/winetests/user32/dce.c +++ b/modules/rostests/winetests/user32/dce.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "wine/test.h" +#include "precomp.h" #ifndef DCX_USESTYLE #define DCX_USESTYLE 0x00010000 diff --git a/modules/rostests/winetests/user32/dde.c b/modules/rostests/winetests/user32/dde.c index d63a0f65aa..ab76117654 100755 --- a/modules/rostests/winetests/user32/dde.c +++ b/modules/rostests/winetests/user32/dde.c @@ -19,18 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "dde.h" -#include "ddeml.h" -#include "winerror.h" - -#include "wine/test.h" +#include "precomp.h" + +#include <dde.h> +#include <ddeml.h> static const WCHAR TEST_DDE_SERVICE[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; diff --git a/modules/rostests/winetests/user32/dialog.c b/modules/rostests/winetests/user32/dialog.c index 882e5a3ed9..f18e626d55 100755 --- a/modules/rostests/winetests/user32/dialog.c +++ b/modules/rostests/winetests/user32/dialog.c @@ -28,18 +28,8 @@ * strangeness, especially since most are in situations that would not * normally be met. */ -#undef WINVER -#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ - -#include <assert.h> -#include <stdio.h> -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" + +#include "precomp.h" #define MAXHWNDS 1024 static HWND hwnd [MAXHWNDS]; diff --git a/modules/rostests/winetests/user32/edit.c b/modules/rostests/winetests/user32/edit.c index b9aa1c9b95..012051cc67 100755 --- a/modules/rostests/winetests/user32/edit.c +++ b/modules/rostests/winetests/user32/edit.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <windows.h> -#include <commctrl.h> - -#include "wine/test.h" +#include "precomp.h" #ifndef ES_COMBO #define ES_COMBO 0x200 diff --git a/modules/rostests/winetests/user32/generated.c b/modules/rostests/winetests/user32/generated.c index 174d4dc654..e80277ce1a 100644 --- a/modules/rostests/winetests/user32/generated.c +++ b/modules/rostests/winetests/user32/generated.c @@ -5,16 +5,7 @@ * Unit tests for data structure packing */ -#undef WINVER -#define WINVER 0x0600 -//#define _WIN32_IE 0x0501 -//#define _WIN32_WINNT 0x0501 - -#define WINE_NOWINSOCK - -#include "windows.h" - -#include "wine/test.h" +#include "precomp.h" /*********************************************************************** * Compatibility macros diff --git a/modules/rostests/winetests/user32/input.c b/modules/rostests/winetests/user32/input.c index 807a29adf2..239cc09e9e 100755 --- a/modules/rostests/winetests/user32/input.c +++ b/modules/rostests/winetests/user32/input.c @@ -44,19 +44,7 @@ * */ -//#define _WIN32_WINNT 0x401 -//#define _WIN32_IE 0x0500 - -#include <stdarg.h> -#include <assert.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winnls.h" - -#include "wine/test.h" +#include "precomp.h" /* globals */ static HWND hWndTest; diff --git a/modules/rostests/winetests/user32/listbox.c b/modules/rostests/winetests/user32/listbox.c index 91d4675f83..7033aa65cd 100644 --- a/modules/rostests/winetests/user32/listbox.c +++ b/modules/rostests/winetests/user32/listbox.c @@ -17,17 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" - -#include "wine/test.h" +#include "precomp.h" #ifdef VISIBLE #define WAIT Sleep (1000) diff --git a/modules/rostests/winetests/user32/menu.c b/modules/rostests/winetests/user32/menu.c index 4323ae701b..f3aac55609 100755 --- a/modules/rostests/winetests/user32/menu.c +++ b/modules/rostests/winetests/user32/menu.c @@ -19,21 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define _WIN32_WINNT 0x0501 - -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <assert.h> - -#define OEMRESOURCE /* For OBM_MNARROW */ - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "wine/test.h" +#include "precomp.h" static ATOM atomMenuCheckClass; diff --git a/modules/rostests/winetests/user32/monitor.c b/modules/rostests/winetests/user32/monitor.c index 886d63ccfe..313e78ce45 100644 --- a/modules/rostests/winetests/user32/monitor.c +++ b/modules/rostests/winetests/user32/monitor.c @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "precomp.h" static HMODULE hdll; static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); diff --git a/modules/rostests/winetests/user32/msg.c b/modules/rostests/winetests/user32/msg.c index e0512ffa08..722f8d4efe 100755 --- a/modules/rostests/winetests/user32/msg.c +++ b/modules/rostests/winetests/user32/msg.c @@ -20,21 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define _WIN32_WINNT 0x0600 /* For WM_CHANGEUISTATE,QS_RAWINPUT,WM_DWMxxxx */ -//#define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */ +#include "precomp.h" -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "dbt.h" - -#include "wine/test.h" +#include <dbt.h> #define MDI_FIRST_CHILD_ID 2004 diff --git a/modules/rostests/winetests/user32/precomp.h b/modules/rostests/winetests/user32/precomp.h new file mode 100644 index 0000000000..79309febc7 --- /dev/null +++ b/modules/rostests/winetests/user32/precomp.h @@ -0,0 +1,16 @@ +#ifndef _USER32_APITEST_PRECOMP_H_ +#define _USER32_APITEST_PRECOMP_H_ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#define WINE_NOWINSOCK +#include <windows.h> + +#define WINE_NO_INLINE_RECT +#include <wine/test.h> + +#endif /* _USER32_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/user32/resource.c b/modules/rostests/winetests/user32/resource.c index 2388adb64f..049f6653b8 100755 --- a/modules/rostests/winetests/user32/resource.c +++ b/modules/rostests/winetests/user32/resource.c @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <windows.h> - -#include "wine/test.h" +#include "precomp.h" static UINT (WINAPI *pPrivateExtractIconsA)(LPCSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL; diff --git a/modules/rostests/winetests/user32/scroll.c b/modules/rostests/winetests/user32/scroll.c index 0bda5dd0f4..f95cbb700e 100644 --- a/modules/rostests/winetests/user32/scroll.c +++ b/modules/rostests/winetests/user32/scroll.c @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <windows.h> - -#include "wine/test.h" +#include "precomp.h" static HWND hScroll; static BOOL bThemeActive = FALSE; diff --git a/modules/rostests/winetests/user32/static.c b/modules/rostests/winetests/user32/static.c index 929b50d694..0a58b38fe7 100644 --- a/modules/rostests/winetests/user32/static.c +++ b/modules/rostests/winetests/user32/static.c @@ -17,14 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" +#include "precomp.h" #define TODO_COUNT 1 diff --git a/modules/rostests/winetests/user32/sysparams.c b/modules/rostests/winetests/user32/sysparams.c index 350497bd45..e9a69e6703 100755 --- a/modules/rostests/winetests/user32/sysparams.c +++ b/modules/rostests/winetests/user32/sysparams.c @@ -16,24 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ -//#define _WIN32_IE 0x0700 -#undef WINVER -#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ - -#include <assert.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winuser.h" -#include "winnls.h" + +#include "precomp.h" #ifndef SPI_GETDESKWALLPAPER # define SPI_GETDESKWALLPAPER 0x0073 diff --git a/modules/rostests/winetests/user32/text.c b/modules/rostests/winetests/user32/text.c index 3cc9571521..ce60c64b56 100755 --- a/modules/rostests/winetests/user32/text.c +++ b/modules/rostests/winetests/user32/text.c @@ -19,14 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - -#include "wine/test.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "winnls.h" +#include "precomp.h" #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) diff --git a/modules/rostests/winetests/user32/uitools.c b/modules/rostests/winetests/user32/uitools.c index b52fe3a03a..05bc45c78a 100644 --- a/modules/rostests/winetests/user32/uitools.c +++ b/modules/rostests/winetests/user32/uitools.c @@ -17,11 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_INLINE_RECT -#include "wine/test.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "precomp.h" static void test_FillRect(void) { diff --git a/modules/rostests/winetests/user32/win.c b/modules/rostests/winetests/user32/win.c index 7b34dc17c8..74fb11251d 100644 --- a/modules/rostests/winetests/user32/win.c +++ b/modules/rostests/winetests/user32/win.c @@ -20,20 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get ICON_SMALL2 with the MSVC headers */ -//#define _WIN32_WINNT 0x0501 - -#include <assert.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "wine/test.h" +#include "precomp.h" #ifndef SPI_GETDESKWALLPAPER #define SPI_GETDESKWALLPAPER 0x0073 diff --git a/modules/rostests/winetests/user32/winstation.c b/modules/rostests/winetests/user32/winstation.c index 8522825a21..3e0fe936b5 100755 --- a/modules/rostests/winetests/user32/winstation.c +++ b/modules/rostests/winetests/user32/winstation.c @@ -18,12 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "wine/winternl.h" +#include "precomp.h" + +#include <wine/winternl.h> static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); diff --git a/modules/rostests/winetests/user32/wsprintf.c b/modules/rostests/winetests/user32/wsprintf.c index f0e80b2ad6..694814db5f 100755 --- a/modules/rostests/winetests/user32/wsprintf.c +++ b/modules/rostests/winetests/user32/wsprintf.c @@ -17,13 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +#include "precomp.h" static const struct {

7 years

[reactos] 01/01: [ACPPAGE] Make use of the PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4a412a2b9fd77807ad75… commit c4a412a2b9fd77807ad75ab4ad9337c008a850f4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:40:23 2017 +0100 [ACPPAGE] Make use of the PCH. --- dll/shellext/acppage/CLayerStringList.hpp | 1 + dll/shellext/acppage/CLayerUIPropPage.hpp | 2 ++ dll/shellext/acppage/CMakeLists.txt | 12 ++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dll/shellext/acppage/CLayerStringList.hpp b/dll/shellext/acppage/CLayerStringList.hpp index e1b253d707..204ec40f52 100644 --- a/dll/shellext/acppage/CLayerStringList.hpp +++ b/dll/shellext/acppage/CLayerStringList.hpp @@ -5,6 +5,7 @@ * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ +#pragma once /* TODO: Use HSDB instead of PDB */ class CLayerStringList : diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp b/dll/shellext/acppage/CLayerUIPropPage.hpp index ac4886d33a..c65a914d86 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.hpp +++ b/dll/shellext/acppage/CLayerUIPropPage.hpp @@ -5,6 +5,8 @@ * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) */ +#pragma once + class CLayerUIPropPage : public CPropertyPageImpl<CLayerUIPropPage>, public CComCoClass<CLayerUIPropPage, &CLSID_CLayerUIPropPage>, diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt index cfab164551..1c4c729691 100644 --- a/dll/shellext/acppage/CMakeLists.txt +++ b/dll/shellext/acppage/CMakeLists.txt @@ -1,3 +1,4 @@ + project(appcompat) set_cpp(WITH_RUNTIME) @@ -18,15 +19,15 @@ spec2def(acppage.dll acppage.spec ADD_IMPORTLIB) list(APPEND SOURCE ACPPage.cpp CLayerUIPropPage.cpp - CLayerUIPropPage.hpp - CLayerStringList.hpp - acppage.spec - precomp.h - resource.h) + precomp.h) add_library(acppage SHARED ${SOURCE} + acppage.spec ACPPage.rc + CLayerUIPropPage.hpp + CLayerStringList.hpp + resource.h ${CMAKE_CURRENT_BINARY_DIR}/acppage.def) set_module_type(acppage win32dll UNICODE) @@ -35,4 +36,3 @@ add_delay_importlibs(acppage apphelp ole32 oleaut32 shlwapi comctl32 sfc_os) add_importlibs(acppage shell32 user32 advapi32 msvcrt kernel32) add_pch(acppage precomp.h SOURCE) add_cd_file(TARGET acppage DESTINATION reactos/system32 FOR all) -

7 years

← Newer
1
...
26
27
28
29
30
31
32
...
36
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 December 2017