system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

localspl: Use separate structure to store printserver handles.

Browse source
This commit is contained in:
Piotr Caban 2022-12-01 16:05:15 +01:00 committed by Alexandre Julliard
parent 730b0826a0
commit da4d55db4b
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
dlls/localspl/provider.c
View file

@ -248,6 +248,8 @@ typedef struct {
} type;
} handle_header_t;
typedef handle_header_t server_t;
typedef struct {
handle_header_t header;
monitor_t *pm;
@ -1536,6 +1538,24 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname)
return hui;
}
static HANDLE server_alloc_handle(const WCHAR *name, BOOL *stop_search)
{
server_t *server;
*stop_search = FALSE;
if (name)
return NULL;
server = malloc(sizeof(*server));
if (!server)
{
*stop_search = TRUE;
return NULL;
}
server->type = HANDLE_SERVER;
return (HANDLE)server;
}
static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL *stop_search)
{
static const WCHAR xcv_monitor[] = L"XcvMonitor ";
@ -1544,7 +1564,7 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL *
xcv_t *xcv;
*stop_search = FALSE;
if (!name || name[0] != ',')
if (name[0] != ',')
return NULL;
name++;
@ -1613,13 +1633,6 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename,
return NULL;
}
if (!basename)
{
TRACE("using the local printserver\n");
printer->header.type = HANDLE_SERVER;
return (HANDLE)printer;
}
printer->info = get_printer_info(basename);
if (!printer->info)
{
@ -2646,7 +2659,9 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter,
return FALSE;
}
*hprinter = xcv_alloc_handle(basename, def, &stop_search);
*hprinter = server_alloc_handle(basename, &stop_search);
if (!*hprinter && !stop_search)
*hprinter = xcv_alloc_handle(basename, def, &stop_search);
if (!*hprinter && !stop_search)
*hprinter = printer_alloc_handle(name, basename, def);
@ -3417,7 +3432,11 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter)
if (!header)
return FALSE;
if (header->type == HANDLE_XCV)
if (header->type == HANDLE_SERVER)
{
free(header);
}
else if (header->type == HANDLE_XCV)
{
xcv_t *xcv = (xcv_t *)hprinter;
@ -3427,7 +3446,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter)
monitor_unload(xcv->pm);
free(xcv);
}
else if (header->type == HANDLE_SERVER || header->type == HANDLE_PRINTER)
else if (header->type == HANDLE_PRINTER)
{
printer_t *printer = (printer_t *)hprinter;