October 2021 - Wine-devel - list.winehq.org

[PATCH 2/6] winspool: Remove support for parsing /etc/printcap.
by Huw Davies 26 Oct '21

26 Oct '21

This is extremely obsolete and doesn't provide the location of the ppd file anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 310 ++------------------------------------- 1 file changed, 11 insertions(+), 299 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fd02d2b2b3e..badde6ea5ae 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -750,20 +750,6 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static void set_default_printer(const char *devname, const char *name) -{ - char *buf = HeapAlloc(GetProcessHeap(), 0, strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); - HKEY hkey; - - sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) - { - RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); - RegCloseKey(hkey); - } - HeapFree(GetProcessHeap(), 0, buf); -} - static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) { DRIVER_INFO_3W di3; @@ -801,52 +787,6 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) return TRUE; } -static inline char *expand_env_string( char *str, DWORD type ) -{ - if (type == REG_EXPAND_SZ) - { - char *tmp; - DWORD needed = ExpandEnvironmentStringsA( str, NULL, 0 ); - tmp = HeapAlloc( GetProcessHeap(), 0, needed ); - if (tmp) - { - ExpandEnvironmentStringsA( str, tmp, needed ); - HeapFree( GetProcessHeap(), 0, str ); - return tmp; - } - } - return str; -} - -static char *get_fallback_ppd_name( const char *printer_name ) -{ - static const WCHAR ppds_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'P','r','i','n','t','i','n','g','\\','P','P','D',' ','F','i','l','e','s',0}; - HKEY hkey; - DWORD needed, type; - char *ret = NULL; - - if (RegOpenKeyW( HKEY_CURRENT_USER, ppds_key, &hkey ) == ERROR_SUCCESS ) - { - const char *value_name = NULL; - - if (RegQueryValueExA( hkey, printer_name, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) - value_name = printer_name; - else if (RegQueryValueExA( hkey, "generic", 0, NULL, NULL, &needed ) == ERROR_SUCCESS) - value_name = "generic"; - - if (value_name) - { - ret = HeapAlloc( GetProcessHeap(), 0, needed ); - if (!ret) return NULL; - RegQueryValueExA( hkey, value_name, 0, &type, (BYTE *)ret, &needed ); - } - RegCloseKey( hkey ); - if (ret) return expand_env_string( ret, type ); - } - return NULL; -} - static BOOL copy_file( const char *src, const char *dst ) { int fds[2] = {-1, -1}, num; @@ -893,28 +833,6 @@ static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) return ret; } -static BOOL get_fallback_ppd( const char *printer_name, const WCHAR *ppd ) -{ - char *dst, *src = get_fallback_ppd_name( printer_name ); - BOOL ret = FALSE; - - if (!src) return get_internal_fallback_ppd( ppd ); - - TRACE( "(%s %s) found %s\n", debugstr_a(printer_name), debugstr_w(ppd), debugstr_a(src) ); - - if (!(dst = wine_get_unix_file_name( ppd ))) goto fail; - - if (symlink( src, dst ) == -1) - if (errno != ENOSYS || !copy_file( src, dst )) - goto fail; - - ret = TRUE; -fail: - HeapFree( GetProcessHeap(), 0, dst ); - HeapFree( GetProcessHeap(), 0, src ); - return ret; -} - static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; @@ -1039,7 +957,7 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", debugstr_a(printer_name), http_status ); - return get_fallback_ppd( printer_name, ppd ); + return get_internal_fallback_ppd( ppd ); } static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t *options ) @@ -1106,17 +1024,11 @@ static BOOL CUPS_LoadPrinters(void) continue; } - port = HeapAlloc(GetProcessHeap(), 0, sizeof(CUPS_Port) + lstrlenW(nameW) * sizeof(WCHAR)); - lstrcpyW(port, CUPS_Port); - lstrcatW(port, nameW); - if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); - /* overwrite old LPR:* port */ - RegSetValueExW(hkeyPrinter, PortW, 0, REG_SZ, (LPBYTE)port, (lstrlenW(port) + 1) * sizeof(WCHAR)); RegDeleteValueW(hkeyPrinter, May_Delete_Value); /* flag that the PPD file should be checked for an update */ set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); @@ -1124,11 +1036,8 @@ static BOOL CUPS_LoadPrinters(void) } else { BOOL added_driver = FALSE; - if (!ppd_dir && !(ppd_dir = get_ppd_dir())) - { - HeapFree( GetProcessHeap(), 0, port ); - break; - } + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) break; + ppd = get_ppd_filename( ppd_dir, nameW ); if (get_cups_ppd( dests[i].name, ppd )) { @@ -1136,11 +1045,11 @@ static BOOL CUPS_LoadPrinters(void) unlink_ppd( ppd ); } HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) - { - HeapFree( GetProcessHeap(), 0, port ); - continue; - } + if (!added_driver) continue; + + port = heap_alloc( sizeof(CUPS_Port) + lstrlenW( nameW ) * sizeof(WCHAR) ); + lstrcpyW( port, CUPS_Port ); + lstrcatW( port, nameW ); memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); pi2.pPrinterName = nameW; @@ -1159,10 +1068,10 @@ static BOOL CUPS_LoadPrinters(void) else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); + heap_free( port ); HeapFree( GetProcessHeap(), 0, pi2.pComment ); HeapFree( GetProcessHeap(), 0, pi2.pLocation ); } - HeapFree( GetProcessHeap(), 0, port ); hadprinter = TRUE; if (dests[i].is_default) { @@ -1292,7 +1201,7 @@ static BOOL update_driver( HANDLE printer ) ret = get_cups_ppd( queue_name, ppd ); else #endif - ret = get_fallback_ppd( queue_name, ppd ); + ret = get_internal_fallback_ppd( ppd ); if (ret) { @@ -1312,199 +1221,6 @@ static BOOL update_driver( HANDLE printer ) return ret; } -static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) -{ - PRINTER_INFO_2A pinfo2a; - const char *r; - size_t name_len; - char *e,*s,*name,*prettyname,*devname; - BOOL ret = FALSE, set_default = FALSE; - char *port = NULL, *env_default; - HKEY hkeyPrinter, hkeyPrinters = NULL; - WCHAR devnameW[MAX_PATH], *ppd_dir = NULL, *ppd; - HANDLE added_printer; - - while (isspace(*pent)) pent++; - r = strchr(pent,':'); - if (r) - name_len = r - pent; - else - name_len = strlen(pent); - name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); - memcpy(name, pent, name_len); - name[name_len] = '\0'; - if (r) - pent = r; - else - pent = ""; - - TRACE("name=%s entry=%s\n",name, pent); - - if(ispunct(*name)) { /* a tc entry, not a real printer */ - TRACE("skipping tc entry\n"); - goto end; - } - - if(strstr(pent,":server")) { /* server only version so skip */ - TRACE("skipping server entry\n"); - goto end; - } - - /* Determine whether this is a postscript printer. */ - - ret = TRUE; - env_default = getenv("PRINTER"); - prettyname = name; - /* Get longest name, usually the one at the right for later display. */ - while((s=strchr(prettyname,'|'))) { - *s = '\0'; - e = s; - while(isspace(*--e)) *e = '\0'; - TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; - for(prettyname = s+1; isspace(*prettyname); prettyname++) - ; - } - e = prettyname + strlen(prettyname); - while(isspace(*--e)) *e = '\0'; - TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; - - /* prettyname must fit into the dmDeviceName member of DEVMODE struct, - * if it is too long, we use it as comment below. */ - devname = prettyname; - if (strlen(devname)>=CCHDEVICENAME-1) - devname = name; - if (strlen(devname)>=CCHDEVICENAME-1) { - ret = FALSE; - goto end; - } - - port = HeapAlloc(GetProcessHeap(),0,strlen("LPR:")+strlen(name)+1); - sprintf(port,"LPR:%s",name); - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - ret = FALSE; - goto end; - } - - MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, ARRAY_SIZE(devnameW)); - - if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { - DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); - /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters - and continue */ - TRACE("Printer already exists\n"); - RegDeleteValueW(hkeyPrinter, May_Delete_Value); - /* flag that the PPD file should be checked for an update */ - set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); - RegCloseKey(hkeyPrinter); - } else { - static CHAR data_type[] = "RAW", - print_proc[] = "WinPrint", - comment[] = "WINEPS Printer using LPR", - params[] = "<parameters?>", - share_name[] = "<share name?>", - sep_file[] = "<sep file?>"; - BOOL added_driver = FALSE; - - if (!ppd_dir && !(ppd_dir = get_ppd_dir())) goto end; - ppd = get_ppd_filename( ppd_dir, devnameW ); - if (get_fallback_ppd( devname, ppd )) - { - added_driver = add_printer_driver( devnameW, ppd ); - unlink_ppd( ppd ); - } - HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) goto end; - - memset(&pinfo2a,0,sizeof(pinfo2a)); - pinfo2a.pPrinterName = devname; - pinfo2a.pDatatype = data_type; - pinfo2a.pPrintProcessor = print_proc; - pinfo2a.pDriverName = devname; - pinfo2a.pComment = comment; - pinfo2a.pLocation = prettyname; - pinfo2a.pPortName = port; - pinfo2a.pParameters = params; - pinfo2a.pShareName = share_name; - pinfo2a.pSepFile = sep_file; - - added_printer = AddPrinterA( NULL, 2, (LPBYTE)&pinfo2a ); - if (added_printer) ClosePrinter( added_printer ); - else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_a(name), GetLastError() ); - } - - if (isfirst || set_default) - set_default_printer(devname, name); - - end: - if (hkeyPrinters) RegCloseKey( hkeyPrinters ); - if (ppd_dir) - { - RemoveDirectoryW( ppd_dir ); - HeapFree( GetProcessHeap(), 0, ppd_dir ); - } - HeapFree(GetProcessHeap(), 0, port); - HeapFree(GetProcessHeap(), 0, name); - return ret; -} - -static BOOL -PRINTCAP_LoadPrinters(void) { - BOOL hadprinter = FALSE; - char buf[200]; - FILE *f; - char *pent = NULL; - BOOL had_bash = FALSE; - - f = fopen("/etc/printcap","r"); - if (!f) - return FALSE; - - while(fgets(buf,sizeof(buf),f)) { - char *start, *end; - - end=strchr(buf,'\n'); - if (end) *end='\0'; - - start = buf; - while(isspace(*start)) start++; - if(*start == '#' || *start == '\0') - continue; - - if(pent && !had_bash && *start != ':' && *start != '|') { /* start of new entry, parse the previous one */ - hadprinter |= PRINTCAP_ParseEntry(pent,!hadprinter); - HeapFree(GetProcessHeap(),0,pent); - pent = NULL; - } - - if (end && *--end == '\\') { - *end = '\0'; - had_bash = TRUE; - } else - had_bash = FALSE; - - if (pent) { - pent=HeapReAlloc(GetProcessHeap(),0,pent,strlen(pent)+strlen(start)+1); - strcat(pent,start); - } else { - pent=HeapAlloc(GetProcessHeap(),0,strlen(start)+1); - strcpy(pent,start); - } - - } - if(pent) { - hadprinter |= PRINTCAP_ParseEntry(pent,!hadprinter); - HeapFree(GetProcessHeap(),0,pent); - } - fclose(f); - return hadprinter; -} - static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) { if (value) @@ -1783,7 +1499,6 @@ void WINSPOOL_LoadSystemPrinters(void) HKEY hkey, hkeyPrinters; DWORD needed, num, i; WCHAR PrinterName[256]; - BOOL done = FALSE; /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); @@ -1823,12 +1538,9 @@ void WINSPOOL_LoadSystemPrinters(void) old_printer_check( FALSE ); #ifdef SONAME_LIBCUPS - done = CUPS_LoadPrinters(); + CUPS_LoadPrinters(); #endif - if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ - PRINTCAP_LoadPrinters(); - old_printer_check( TRUE ); ReleaseMutex( init_mutex ); -- 2.23.0

1 0

[PATCH 1/6] winspool: Move loading of libcups to cups.c.
by Huw Davies 26 Oct '21

26 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/cups.c | 101 ++++++++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 40 +++----------- dlls/winspool.drv/wspool.c | 31 ++++++----- dlls/winspool.drv/wspool.h | 5 ++ 5 files changed, 130 insertions(+), 48 deletions(-) create mode 100644 dlls/winspool.drv/cups.c diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index a0d0f9504f2..d40813d649c 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -8,6 +8,7 @@ EXTRALIBS = $(APPLICATIONSERVICES_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + cups.c \ info.c \ wspool.c diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c new file mode 100644 index 00000000000..207c95c568a --- /dev/null +++ b/dlls/winspool.drv/cups.c @@ -0,0 +1,101 @@ +/* + * CUPS functions + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <string.h> +#ifdef HAVE_CUPS_CUPS_H +#include <cups/cups.h> +#endif +#ifdef HAVE_CUPS_PPD_H +#include <cups/ppd.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" +#include "wine/debug.h" + +#include "wspool.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winspool); + +#ifdef SONAME_LIBCUPS + +void *libcups_handle = NULL; + +#define CUPS_FUNCS \ + DO_FUNC(cupsAddOption); \ + DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsFreeOptions); \ + DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetOption); \ + DO_FUNC(cupsParseOptions); \ + DO_FUNC(cupsPrintFile) +#define CUPS_OPT_FUNCS \ + DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsGetPPD3); \ + DO_FUNC(cupsLastErrorString) + +#define DO_FUNC(f) typeof(f) *p##f = NULL +CUPS_FUNCS; +#undef DO_FUNC +cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *) = NULL; +const char * (*pcupsGetPPD)(const char *) = NULL; +http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t) = NULL; +const char * (*pcupsLastErrorString)(void) = NULL; + +#endif /* SONAME_LIBCUPS */ + +NTSTATUS unix_process_attach( void *arg ) +{ +#ifdef SONAME_LIBCUPS + libcups_handle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); + TRACE( "%p: %s loaded\n", libcups_handle, SONAME_LIBCUPS ); + if (!libcups_handle) return STATUS_DLL_NOT_FOUND; + +#define DO_FUNC(x) \ + p##x = dlsym( libcups_handle, #x ); \ + if (!p##x) \ + { \ + ERR( "failed to load symbol %s\n", #x ); \ + libcups_handle = NULL; \ + return STATUS_ENTRYPOINT_NOT_FOUND; \ + } + CUPS_FUNCS; +#undef DO_FUNC +#define DO_FUNC(x) p##x = dlsym( libcups_handle, #x ) + CUPS_OPT_FUNCS; +#undef DO_FUNC + return STATUS_SUCCESS; +#else /* SONAME_LIBCUPS */ + return STATUS_NOT_SUPPORTED; +#endif /* SONAME_LIBCUPS */ +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 660a5afe74d..fd02d2b2b3e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -967,7 +967,7 @@ static void unlink_ppd( const WCHAR *ppd ) #ifdef SONAME_LIBCUPS -static void *cupshandle; +extern void *libcups_handle; #define CUPS_FUNCS \ DO_FUNC(cupsAddOption); \ @@ -983,13 +983,13 @@ static void *cupshandle; DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) -#define DO_FUNC(f) static typeof(f) *p##f +#define DO_FUNC(f) extern typeof(f) *p##f CUPS_FUNCS; #undef DO_FUNC -static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); -static const char * (*pcupsGetPPD)(const char *); -static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); -static const char * (*pcupsLastErrorString)(void); +extern cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +extern const char * (*pcupsGetPPD)(const char *); +extern http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); +extern const char * (*pcupsLastErrorString)(void); static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, @@ -1072,28 +1072,6 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) return ret; } -static void load_cups(void) -{ - cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); - if (!cupshandle) return; - - TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); - -#define DO_FUNC(x) \ - p##x = dlsym( cupshandle, #x ); \ - if (!p##x) \ - { \ - ERR("failed to load symbol %s\n", #x); \ - cupshandle = NULL; \ - return; \ - } - CUPS_FUNCS; -#undef DO_FUNC -#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) - CUPS_OPT_FUNCS; -#undef DO_FUNC -} - static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -1106,7 +1084,7 @@ static BOOL CUPS_LoadPrinters(void) HANDLE added_printer; cups_ptype_t printer_type; - if (!cupshandle) return FALSE; + if (!libcups_handle) return FALSE; if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { @@ -1807,10 +1785,6 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; BOOL done = FALSE; -#ifdef SONAME_LIBCUPS - load_cups(); -#endif - /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); if (!init_mutex) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index bbfb0fb0f42..90d35bee73e 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -110,22 +110,23 @@ BOOL load_backend(void) * Winspool entry point. * */ -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { - switch (reason) - { - case DLL_PROCESS_ATTACH: { - WINSPOOL_hInstance = hInstance; - DisableThreadLibraryCalls(hInstance); - WINSPOOL_LoadSystemPrinters(); - break; - } + switch (reason) + { + case DLL_PROCESS_ATTACH: + WINSPOOL_hInstance = instance; + DisableThreadLibraryCalls( instance ); + UNIX_CALL( process_attach, NULL ); + WINSPOOL_LoadSystemPrinters(); + break; + case DLL_PROCESS_DETACH: - if (lpReserved) break; - DeleteCriticalSection(&backend_cs); - FreeLibrary(hlocalspl); - break; - } + if (reserved) break; + DeleteCriticalSection(&backend_cs); + FreeLibrary(hlocalspl); + break; + } - return TRUE; + return TRUE; } diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 06c28231330..bca4a5ea02d 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -21,6 +21,7 @@ #include <windef.h> #include <winuser.h> +#include <winternl.h> extern HINSTANCE WINSPOOL_hInstance DECLSPEC_HIDDEN; @@ -35,3 +36,7 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN; #define FILENAME_DIALOG 100 #define EDITBOX 201 + +#define UNIX_CALL( func, params ) unix_ ## func( params ) + +NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 00/10] First step for supporting inlined frames in winedbg & dbghelp
by Eric Pouech 26 Oct '21

26 Oct '21

The following series implements: - local scope management in dbghelp (instead of SymSetContext) - basic implementation of some inline context oriented APIs of dbghelp (when the inline context doesn't represent an inlined frame) - let winedbg use all those APIs instead of the (old = non inline context oriented APIs) A+ --- Eric Pouech (10): dbghelp: let StackWalkEx() succeed even when inline mode is requested dbghelp: implement SymFromInlineContext() when context isn't in inline mode dbghelp: implement SymGetLineFromInlineContext*() when context isn't in inline mode dbghelp: add local scope information in struct process dbghelp: implement SymSetScopeFromAddr() and SymSetScopeFromIndex() dbghelp: rewrite SymSetContext() on top of SymSetScopeFromAddr() dbghelp: implement SymSetScopeFromInlineContext() when context isn't inlined programs/winedbg: add a pair of helpers for accessing frames' internal info programs/winedbg: use SymSetScopeFromAddr() instead of SymSetContext() programs/winedbg: use inline contexts oriented APIs for stack backtrace dlls/dbghelp/dbghelp.c | 60 ++++++++++------ dlls/dbghelp/dbghelp_private.h | 23 +++++++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/module.c | 10 ++- dlls/dbghelp/stack.c | 10 ++- dlls/dbghelp/symbol.c | 68 +++++++++++++----- programs/winedbg/debugger.h | 15 +++- programs/winedbg/stack.c | 121 +++++++++++++++------------------ programs/winedbg/symbol.c | 23 ++++--- 9 files changed, 212 insertions(+), 120 deletions(-)

1 10

[PATCH] include: Add CMSH264DecoderMFT CLSID
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 61381bee6d4..fd21ad54a40 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -30,3 +30,8 @@ coclass CMP3DecMediaObject {} uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) ] coclass CResamplerMediaObject {} + +[ + uuid(62ce7e72-4c71-4d20-b15d-452831a87d9d) +] +coclass CMSH264DecoderMFT {} -- 2.33.0

1 0

[PATCH v2] include: Add missing MFT CLSIDs
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 62e0ca3025a..d23995fbc18 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1620,4 +1620,12 @@ cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") +cpp_quote("EXTERN_GUID(CLSID_MSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);") +cpp_quote("EXTERN_GUID(CLSID_MSDDPlusDecMFT, 0x177c0afe, 0x900b, 0x48d4, 0x9e, 0x4c, 0x57, 0xad, 0xd2, 0x50, 0xb3, 0xd4);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGAudDecMFT, 0x70707b39, 0xb2ca, 0x4015, 0xab, 0xea, 0xf8, 0x44, 0x7d, 0x22, 0xd8, 0x8b);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2d709e52, 0x123f, 0x49b5, 0x9c, 0xbc, 0x9a, 0xf5, 0xcd, 0xe2, 0x8f, 0xb9);") +cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);") +cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") +cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") -- 2.33.0

1 0

[PATCH] include: Add missing MFT CLSIDs
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 62e0ca3025a..7f3af2eb1fd 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1620,4 +1620,12 @@ cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") +cpp_quote("EXTERN_GUID(CLSID_MSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);") +cpp_quote("EXTERN_GUID(CLSID_MSDDPlusDecMFT, 0x177C0AFE, 0x900B, 0x48d4, 0x9E, 0x4C, 0x57, 0xAD, 0xD2, 0x50, 0xB3, 0xD4);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGAudDecMFT, 0x70707B39, 0xB2CA, 0x4015, 0xAB, 0xEA, 0xF8, 0x44, 0x7D, 0x22, 0xD8, 0x8B);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2D709E52, 0x123F, 0x49b5, 0x9C, 0xBC, 0x9A, 0xF5, 0xCD, 0xE2, 0x8F, 0xB9);") +cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62CE7E72, 0x4C71, 0x4d20, 0xB1, 0x5D, 0x45, 0x28, 0x31, 0xA8, 0x7D, 0x9D);") +cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") +cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420A51A3, 0xD605, 0x430C, 0xB4, 0xFC, 0x45, 0x27, 0x4F, 0xA6, 0xC5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") -- 2.33.0

2 1

[PATCH 4/4] msdasql: Add IPersist interface support
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 27 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 38cec9e88e1..d9aaf491d3c 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -180,6 +180,7 @@ struct msdasql IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; IDBCreateSession IDBCreateSession_iface; + IPersist IPersist_iface; LONG ref; }; @@ -204,6 +205,11 @@ static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); } +static inline struct msdasql *impl_from_IPersist( IPersist *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql, IPersist_iface ); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -227,6 +233,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBCreateSession_iface; } + else if(IsEqualGUID(&IID_IPersist, riid)) + { + *out = &provider->IPersist_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -459,6 +469,45 @@ static const struct IDBCreateSessionVtbl dbsess_vtbl = dbsess_CreateSession }; +static HRESULT WINAPI persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); +} + +static ULONG WINAPI persist_AddRef(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI persist_Release(IPersist *iface) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI persist_GetClassID(IPersist *iface, CLSID *classid) +{ + struct msdasql *provider = impl_from_IPersist( iface ); + + TRACE("(%p)->(%p)\n", provider, classid); + + if(!classid) + return E_INVALIDARG; + + *classid = CLSID_MSDASQL; + return S_OK; + +} + +static const IPersistVtbl persistVtbl = { + persist_QueryInterface, + persist_AddRef, + persist_Release, + persist_GetClassID +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -472,6 +521,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; + provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ff4757eb236..16d6de6cd9a 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -36,6 +36,32 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 static BOOL db_created; static char mdbpath[MAX_PATH]; +static test_msdasql(void) +{ + HRESULT hr; + IUnknown *unk; + IPersist *persist; + CLSID classid; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersist_GetClassID(persist, &classid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&classid, &CLSID_MSDASQL), "got %s\n", debugstr_guid(&classid)); + + IPersist_Release(persist); + + IUnknown_Release(unk); +} + static void test_Properties(void) { HRESULT hr; @@ -264,6 +290,7 @@ START_TEST(provider) setup_database(); + test_msdasql(); test_Properties(); test_sessions(); -- 2.33.0

1 0

[PATCH 3/4] msdasql: Implement IDBCreateSession CreateSession
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 3 +- dlls/msdasql/msdasql_main.c | 12 +++- dlls/msdasql/msdasql_private.h | 19 ++++++ dlls/msdasql/session.c | 114 +++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 dlls/msdasql/msdasql_private.h create mode 100644 dlls/msdasql/session.c diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 04d9cb29f2a..ee8fa672623 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - msdasql_main.c + msdasql_main.c \ + session.c RC_SRCS = msdasql.rc diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 9a3adba49ff..38cec9e88e1 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,8 @@ #include "initguid.h" #include "msdasql.h" +#include "msdasql_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -437,10 +439,16 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou IUnknown **session) { struct msdasql *provider = impl_from_IDBCreateSession(iface); + HRESULT hr; - FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + TRACE("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); - return E_FAIL; + if (outer) + FIXME("outer currently not supported.\n"); + + hr = create_db_session(riid, (void**)session); + + return hr; } static const struct IDBCreateSessionVtbl dbsess_vtbl = diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h new file mode 100644 index 00000000000..a3d73498fe9 --- /dev/null +++ b/dlls/msdasql/msdasql_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c new file mode 100644 index 00000000000..57174be40f8 --- /dev/null +++ b/dlls/msdasql/session.c @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "msdasc.h" +#include "wine/heap.h" +#include "wine/debug.h" + +#include "msdasql.h" + +#include "msdasql_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +struct msdasql_session +{ + IUnknown session_iface; + LONG refs; +}; + +static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); +} + +static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = &session->session_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedIncrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + return refs; +} + +static ULONG WINAPI session_Release(IUnknown *iface) +{ + struct msdasql_session *session = impl_from_IUnknown( iface ); + LONG refs = InterlockedDecrement( &session->refs ); + TRACE( "%p new refcount %d\n", session, refs ); + if (!refs) + { + TRACE( "destroying %p\n", session ); + heap_free( session ); + } + return refs; +} + +static const IUnknownVtbl unkfactoryVtbl = +{ + session_QueryInterface, + session_AddRef, + session_Release, +}; + +HRESULT create_db_session(REFIID riid, void **unk) +{ + struct msdasql_session *session; + HRESULT hr; + + session = heap_alloc(sizeof(*session)); + if (!session) + return E_OUTOFMEMORY; + + session->session_iface.lpVtbl = &unkfactoryVtbl; + session->refs = 1; + + hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); + IUnknown_Release(&session->session_iface); + return hr; +} -- 2.33.0

1 0

[PATCH 2/4] msdasql: Add IDBCreateSession support
by Alistair Leslie-Hughes 26 Oct '21

26 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 8fac3fb23df..9a3adba49ff 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -177,6 +177,7 @@ struct msdasql IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; IDBInitialize IDBInitialize_iface; + IDBCreateSession IDBCreateSession_iface; LONG ref; }; @@ -196,6 +197,11 @@ static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); } +static inline struct msdasql *impl_from_IDBCreateSession(IDBCreateSession *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBCreateSession_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -215,6 +221,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBInitialize_iface; } + else if (IsEqualGUID(riid, &IID_IDBCreateSession)) + { + *out = &provider->IDBCreateSession_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -402,6 +412,45 @@ static const struct IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; +static HRESULT WINAPI dbsess_QueryInterface(IDBCreateSession *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbsess_AddRef(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbsess_Release(IDBCreateSession *iface) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *outer, REFIID riid, + IUnknown **session) +{ + struct msdasql *provider = impl_from_IDBCreateSession(iface); + + FIXME("%p, outer %p, riid %s, session %p stub\n", provider, outer, debugstr_guid(riid), session); + + return E_FAIL; +} + +static const struct IDBCreateSessionVtbl dbsess_vtbl = +{ + dbsess_QueryInterface, + dbsess_AddRef, + dbsess_Release, + dbsess_CreateSession +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -414,6 +463,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + provider->IDBCreateSession_iface.lpVtbl = &dbsess_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 1/6] dinput: Canonicalize code style of IDirectInputWImpl_EnumDevices.
by Rémi Bernon 26 Oct '21

26 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 95 +++++++++------------------------------ 1 file changed, 20 insertions(+), 75 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 985dae1ab36..da790bae36c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -270,58 +270,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) -{ - if (dwVersion < 0x0800) { - switch (dwDevType) { - case 0: return "All devices"; - case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; - case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; - case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unknown"; - } - } else { - switch (dwDevType) { - case DI8DEVCLASS_ALL: return "All devices"; - case DI8DEVCLASS_POINTER: return "DI8DEVCLASS_POINTER"; - case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; - case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; - case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL"; - default: return "Unknown"; - } - } -} - -static void _dump_EnumDevices_dwFlags(DWORD dwFlags) -{ - if (TRACE_ON(dinput)) { - unsigned int i; - static const struct { - DWORD mask; - const char *name; - } flags[] = { -#define FE(x) { x, #x} - FE(DIEDFL_ALLDEVICES), - FE(DIEDFL_ATTACHEDONLY), - FE(DIEDFL_FORCEFEEDBACK), - FE(DIEDFL_INCLUDEALIASES), - FE(DIEDFL_INCLUDEPHANTOMS), - FE(DIEDFL_INCLUDEHIDDEN) -#undef FE - }; - TRACE(" flags: "); - if (dwFlags == 0) { - TRACE("DIEDFL_ALLDEVICES\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(flags); i++) - if (flags[i].mask & dwFlags) - TRACE("%s ",flags[i].name); - } - TRACE("\n"); -} - static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) { int i; @@ -371,38 +319,35 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, /****************************************************************************** * IDirectInputW_EnumDevices */ -static HRESULT WINAPI IDirectInputWImpl_EnumDevices( - LPDIRECTINPUT7W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback, - LPVOID pvRef, DWORD dwFlags) +static HRESULT WINAPI IDirectInputWImpl_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, + void *context, DWORD flags ) { - IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - DIDEVICEINSTANCEW devInstance; - unsigned int i; - int j; - HRESULT r; + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + unsigned int i, j; + HRESULT hr; - TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), - lpCallback, pvRef, dwFlags); - _dump_EnumDevices_dwFlags(dwFlags); + TRACE( "iface %p, type %#x, callback %p, context %p, flags %#x\n", iface, type, callback, context, flags ); - if (!lpCallback || - dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) + if (!callback) return DIERR_INVALIDPARAM; + + if ((type > DI8DEVCLASS_GAMECTRL && type < DI8DEVTYPE_DEVICE) || type > DI8DEVTYPE_SUPPLEMENTAL) + return DIERR_INVALIDPARAM; + if (flags & ~(DIEDFL_ATTACHEDONLY|DIEDFL_FORCEFEEDBACK|DIEDFL_INCLUDEALIASES|DIEDFL_INCLUDEPHANTOMS|DIEDFL_INCLUDEHIDDEN)) return DIERR_INVALIDPARAM; - if (!This->initialized) + if (!impl->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + { if (!dinput_devices[i]->enum_device) continue; - for (j = 0, r = S_OK; SUCCEEDED(r); j++) { - devInstance.dwSize = sizeof(devInstance); + for (j = 0, hr = S_OK; SUCCEEDED(hr); j++) + { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - r = dinput_devices[i]->enum_device(dwDevType, dwFlags, &devInstance, This->dwVersion, j); - if (r == S_OK) - if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) - return S_OK; + hr = dinput_devices[i]->enum_device( type, flags, &instance, impl->dwVersion, j ); + if (hr != S_OK) continue; + if (enum_callback_wrapper( callback, &instance, context ) == DIENUM_STOP) return S_OK; } } -- 2.33.0

1 5