February 2008 - Wine-commits

Roderick Colenbrander : wined3d: Make sure to set the color key when it is needed including for index_in_alpha .
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 1b78457bc6b27c9c781de314c06dad392f17e941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b78457bc6b27c9c781de314c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Jan 29 20:08:25 2008 +0100 wined3d: Make sure to set the color key when it is needed including for index_in_alpha. --- dlls/wined3d/surface.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 44507e7..a34c0cf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1930,15 +1930,14 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] table[i][1] = device->palettes[device->currentPalette][i].peGreen; table[i][2] = device->palettes[device->currentPalette][i].peBlue; - if(index_in_alpha) { + /* BltOverride uses a GL_ALPHA_TEST based on GL_NOT_EQUAL 0, so the alpha component + of pixels that should be masked away should be 0. When inde_in_alpha is set, + we will store the palette index (the glReadPixels code reads GL_ALPHA back) + or else we store 0xff. */ + if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { + table[i][3] = 0; + } else if(index_in_alpha) { table[i][3] = i; - } else if (colorkey && - (i >= This->SrcBltCKey.dwColorSpaceLowValue) && - (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - /* We should maybe here put a more 'neutral' color than the standard bright purple - one often used by application to prevent the nice purple borders when bi-linear - filtering is on */ - table[i][3] = 0x00; } else { table[i][3] = 0xFF; } @@ -1951,16 +1950,14 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] table[i][1] = pal->palents[i].peGreen; table[i][2] = pal->palents[i].peBlue; - if(index_in_alpha) { - table[i][3] = i; - } - else if (colorkey && - (i >= This->SrcBltCKey.dwColorSpaceLowValue) && - (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - /* We should maybe here put a more 'neutral' color than the standard bright purple - one often used by application to prevent the nice purple borders when bi-linear - filtering is on */ + /* BltOverride uses a GL_ALPHA_TEST based on GL_NOT_EQUAL 0, so the alpha component + of pixels that should be masked away should be 0. When inde_in_alpha is set, + we will store the palette index (the glReadPixels code reads GL_ALPHA back) + or else we store 0xff. */ + if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { table[i][3] = 0x00; + } else if(index_in_alpha) { + table[i][3] = i; } else if(pal->Flags & WINEDDPCAPS_ALPHA) { table[i][3] = pal->palents[i].peFlags; } else {

1 0

Roderick Colenbrander : wined3d: Reload the palette on a color key change. This fixes the ddex4/ddex5 samples from the dx7 sdk.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: f84589ea1fd7aae9a2c2c70a6124951aada9e889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84589ea1fd7aae9a2c2c70a6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Jan 29 22:42:32 2008 +0100 wined3d: Reload the palette on a color key change. This fixes the ddex4/ddex5 samples from the dx7 sdk. --- dlls/wined3d/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a34c0cf..6cc3b5a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2102,11 +2102,18 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + /* Make sure the texture is reloaded because of the color key change, this kills performance though :( */ + /* TODO: This is not necessarily needed with hw palettized texture support */ + This->Flags &= ~SFLAG_INTEXTURE; } else if(palette9_changed(This)) { TRACE("Reloading surface because the d3d8/9 palette was changed\n"); /* TODO: This is not necessarily needed with hw palettized texture support */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + + /* Make sure the texture is reloaded because of the color key change, this kills performance though :( */ + This->Flags &= ~SFLAG_INTEXTURE; } else { TRACE("surface is already in texture\n"); return WINED3D_OK;

1 0

Roderick Colenbrander : wined3d: Allow read back of P8 surfaces. This fixes some of the redrawing issues in Red Alert.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 424e9c3e08367da1bb8b1472771e82e5bbd898b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424e9c3e08367da1bb8b14727… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 5 10:15:46 2008 +0100 wined3d: Allow read back of P8 surfaces. This fixes some of the redrawing issues in Red Alert. --- dlls/wined3d/surface.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6cc3b5a..d6ce92f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -55,7 +55,8 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { return; } - if(This->Flags & SFLAG_CONVERTED) { + /* Only support read back of converted P8 surfaces */ + if(This->Flags & SFLAG_CONVERTED && (This->resource.format != WINED3DFMT_P8)) { FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); return; } @@ -86,9 +87,17 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { LEAVE_GL(); } else { void *mem; + GLenum format = This->glDescription.glFormat; + GLenum type = This->glDescription.glType; int src_pitch = 0; int dst_pitch = 0; + /* In case of P8 the index is stored in the alpha component if the primary render target uses P8 */ + if(This->resource.format == WINED3DFMT_P8) { + format = GL_ALPHA; + type = GL_UNSIGNED_BYTE; + } + if (This->Flags & SFLAG_NONPOW2) { unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; src_pitch = This->bytesPerPixel * This->pow2Width; @@ -100,21 +109,21 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { } TRACE("(%p) : Calling glGetTexImage level %d, format %#x, type %#x, data %p\n", This, This->glDescription.level, - This->glDescription.glFormat, This->glDescription.glType, mem); + format, type, mem); if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); checkGLcall("glBindBufferARB"); - glGetTexImage(This->glDescription.target, This->glDescription.level, This->glDescription.glFormat, - This->glDescription.glType, NULL); + glGetTexImage(This->glDescription.target, This->glDescription.level, format, + type, NULL); checkGLcall("glGetTexImage()"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } else { - glGetTexImage(This->glDescription.target, This->glDescription.level, This->glDescription.glFormat, - This->glDescription.glType, mem); + glGetTexImage(This->glDescription.target, This->glDescription.level, format, + type, mem); checkGLcall("glGetTexImage()"); } LEAVE_GL();

1 0

Roderick Colenbrander : wined3d: Redownload the surface data in case of a palette change. This fixes a lot of redrawing problems in Red Alert.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 35e0bb8225bb9c9b654f19b21560756f4e455da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e0bb8225bb9c9b654f19b21… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 5 13:25:18 2008 +0100 wined3d: Redownload the surface data in case of a palette change. This fixes a lot of redrawing problems in Red Alert. --- dlls/wined3d/surface_base.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8a6f546..d733852 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -297,8 +297,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { - if(!This->Flags & SFLAG_INSYSMEM) { - FIXME("Palette changed with surface that does not have an up to date system memory copy\n"); + if(!(This->Flags & SFLAG_INSYSMEM)) { + TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); } TRACE("Dirtifying surface\n"); IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);

1 0

Detlef Riekenberg : localspl: Initialize pointers in struct PRINTPROVIDOR.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 9e65dbc3944a7154da53c185b0f93de400289eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e65dbc3944a7154da53c185b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 4 08:59:54 2008 +0100 localspl: Initialize pointers in struct PRINTPROVIDOR. --- dlls/localspl/localspl_main.c | 107 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 3585c34..29cb4b8 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -1,7 +1,7 @@ /* * Implementation of the Local Printmonitor * - * Copyright 2006 Detlef Riekenberg + * Copyright 2006-2008 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,8 +35,110 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl); +/* ############################### */ + HINSTANCE LOCALSPL_hInstance = NULL; +static const PRINTPROVIDOR * pp = NULL; + +/***************************************************** + * get_backend [internal] + */ +static const PRINTPROVIDOR * get_backend(void) +{ + static const PRINTPROVIDOR backend = { + NULL, /* fpOpenPrinter */ + NULL, /* fpSetJob */ + NULL, /* fpGetJob */ + NULL, /* fpEnumJobs */ + NULL, /* fpAddPrinter */ + NULL, /* fpDeletePrinter */ + NULL, /* fpSetPrinter */ + NULL, /* fpGetPrinter */ + NULL, /* fpEnumPrinters */ + NULL, /* fpAddPrinterDriver */ + NULL, /* fpEnumPrinterDrivers */ + NULL, /* fpGetPrinterDriver */ + NULL, /* fpGetPrinterDriverDirectory */ + NULL, /* fpDeletePrinterDriver */ + NULL, /* fpAddPrintProcessor */ + NULL, /* fpEnumPrintProcessors */ + NULL, /* fpGetPrintProcessorDirectory */ + NULL, /* fpDeletePrintProcessor */ + NULL, /* fpEnumPrintProcessorDatatypes */ + NULL, /* fpStartDocPrinter */ + NULL, /* fpStartPagePrinter */ + NULL, /* fpWritePrinter */ + NULL, /* fpEndPagePrinter */ + NULL, /* fpAbortPrinter */ + NULL, /* fpReadPrinter */ + NULL, /* fpEndDocPrinter */ + NULL, /* fpAddJob */ + NULL, /* fpScheduleJob */ + NULL, /* fpGetPrinterData */ + NULL, /* fpSetPrinterData */ + NULL, /* fpWaitForPrinterChange */ + NULL, /* fpClosePrinter */ + NULL, /* fpAddForm */ + NULL, /* fpDeleteForm */ + NULL, /* fpGetForm */ + NULL, /* fpSetForm */ + NULL, /* fpEnumForms */ + NULL, /* fpEnumMonitors */ + NULL, /* fpEnumPorts */ + NULL, /* fpAddPort */ + NULL, /* fpConfigurePort */ + NULL, /* fpDeletePort */ + NULL, /* fpCreatePrinterIC */ + NULL, /* fpPlayGdiScriptOnPrinterIC */ + NULL, /* fpDeletePrinterIC */ + NULL, /* fpAddPrinterConnection */ + NULL, /* fpDeletePrinterConnection */ + NULL, /* fpPrinterMessageBox */ + NULL, /* fpAddMonitor */ + NULL, /* fpDeleteMonitor */ + NULL, /* fpResetPrinter */ + NULL, /* fpGetPrinterDriverEx */ + NULL, /* fpFindFirstPrinterChangeNotification */ + NULL, /* fpFindClosePrinterChangeNotification */ + NULL, /* fpAddPortEx */ + NULL, /* fpShutDown */ + NULL, /* fpRefreshPrinterChangeNotification */ + NULL, /* fpOpenPrinterEx */ + NULL, /* fpAddPrinterEx */ + NULL, /* fpSetPort */ + NULL, /* fpEnumPrinterData */ + NULL, /* fpDeletePrinterData */ + NULL, /* fpClusterSplOpen */ + NULL, /* fpClusterSplClose */ + NULL, /* fpClusterSplIsAlive */ + NULL, /* fpSetPrinterDataEx */ + NULL, /* fpGetPrinterDataEx */ + NULL, /* fpEnumPrinterDataEx */ + NULL, /* fpEnumPrinterKey */ + NULL, /* fpDeletePrinterDataEx */ + NULL, /* fpDeletePrinterKey */ + NULL, /* fpSeekPrinter */ + NULL, /* fpDeletePrinterDriverEx */ + NULL, /* fpAddPerMachineConnection */ + NULL, /* fpDeletePerMachineConnection */ + NULL, /* fpEnumPerMachineConnections */ + NULL, /* fpXcvData */ + NULL, /* fpAddPrinterDriverEx */ + NULL, /* fpSplReadPrinter */ + NULL, /* fpDriverUnloadComplete */ + NULL, /* fpGetSpoolFileInfo */ + NULL, /* fpCommitSpoolData */ + NULL, /* fpCloseSpoolFileHandle */ + NULL, /* fpFlushPrinter */ + NULL, /* fpSendRecvBidiData */ + NULL /* fpAddDriverCatalog */ + }; + TRACE("=> %p (%u byte for %u entries)\n", &backend, sizeof(backend), sizeof(backend) / sizeof(VOID *)); + return &backend; + +} + /***************************************************** * DllMain */ @@ -52,6 +154,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); LOCALSPL_hInstance = hinstDLL; + pp = get_backend(); break; } return TRUE; @@ -84,7 +187,7 @@ BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, { TRACE("(%p, %u, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath)); - ZeroMemory(pPrintProvidor, (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR)); + memcpy(pPrintProvidor, pp, (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR)); return TRUE; }

1 0

Detlef Riekenberg : localspl: Implement fpGetPrinterDriverDirectory.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: df03457ed07bca3a2f02ee6c491488af1b9ebf38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df03457ed07bca3a2f02ee6c4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 4 09:39:38 2008 +0100 localspl: Implement fpGetPrinterDriverDirectory. --- dlls/localspl/localspl_main.c | 157 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 29cb4b8..6780c06 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -37,10 +37,165 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl); /* ############################### */ +typedef struct { + LPCWSTR envname; + LPCWSTR subdir; + DWORD driverversion; + LPCWSTR versionregpath; + LPCWSTR versionsubdir; +} printenv_t; + +/* ############################### */ + HINSTANCE LOCALSPL_hInstance = NULL; static const PRINTPROVIDOR * pp = NULL; + +static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; + +static const WCHAR win40_envnameW[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; +static const WCHAR win40_subdirW[] = {'w','i','n','4','0',0}; +static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; +static const WCHAR version0_subdirW[] = {'\\','0',0}; + +static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR x86_subdirW[] = {'w','3','2','x','8','6',0}; +static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; +static const WCHAR version3_subdirW[] = {'\\','3',0}; + + +static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, + version3_regpathW, version3_subdirW}; + +static const printenv_t env_win40 = {win40_envnameW, win40_subdirW, 0, + version0_regpathW, version0_subdirW}; + +static const printenv_t * const all_printenv[] = {&env_x86, &env_win40}; + +/****************************************************************** + * validate_envW [internal] + * + * validate the user-supplied printing-environment + * + * PARAMS + * env [I] PTR to Environment-String or NULL + * + * RETURNS + * Success: PTR to printenv_t + * Failure: NULL and ERROR_INVALID_ENVIRONMENT + * + * NOTES + * An empty string is handled the same way as NULL. + * + */ + +static const printenv_t * validate_envW(LPCWSTR env) +{ + const printenv_t *result = NULL; + unsigned int i; + + TRACE("(%s)\n", debugstr_w(env)); + if (env && env[0]) + { + for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + { + if (lstrcmpiW(env, all_printenv[i]->envname) == 0) + { + result = all_printenv[i]; + break; + } + } + if (result == NULL) { + FIXME("unsupported Environment: %s\n", debugstr_w(env)); + SetLastError(ERROR_INVALID_ENVIRONMENT); + } + /* on win9x, only "Windows 4.0" is allowed, but we ignore this */ + } + else + { + result = (GetVersion() & 0x80000000) ? &env_win40 : &env_x86; + } + + TRACE("=> using %p: %s\n", result, debugstr_w(result ? result->envname : NULL)); + return result; +} + +/***************************************************************************** + * fpGetPrinterDriverDirectory [exported through PRINTPROVIDOR] + * + * Return the PATH for the Printer-Drivers + * + * PARAMS + * pName [I] Servername (NT only) or NULL (local Computer) + * pEnvironment [I] Printing-Environment (see below) or NULL (Default) + * Level [I] Structure-Level (must be 1) + * pDriverDirectory [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pDriverDirectory + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / + * required for pDriverDirectory + * + * RETURNS + * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory + * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, + * if cbBuf is too small + * + * Native Values returned in pDriverDirectory on Success: + *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" + *| NT(Windows 4.0): "%winsysdir%\\spool\\DRIVERS\\win40" + *| win9x(Windows 4.0): "%winsysdir%" + * + * "%winsysdir%" is the Value from GetSystemDirectoryW() + * + */ +BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, LPDWORD pcbNeeded) +{ + DWORD needed; + const printenv_t * env; + + TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), + debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); + + if (pName != NULL && pName[0]) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + env = validate_envW(pEnvironment); + if (!env) return FALSE; /* pEnvironment invalid or unsupported */ + + + /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ + needed = GetSystemDirectoryW(NULL, 0); + /* add the Size for the Subdirectories */ + needed += lstrlenW(spooldriversW); + needed += lstrlenW(env->subdir); + needed *= sizeof(WCHAR); /* return-value is size in Bytes */ + + *pcbNeeded = needed; + + if (needed > cbBuf) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (pDriverDirectory == NULL) { + /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); + /* add the Subdirectories */ + lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); + lstrcatW((LPWSTR) pDriverDirectory, env->subdir); + + TRACE("=> %s\n", debugstr_w((LPWSTR) pDriverDirectory)); + return TRUE; +} + /***************************************************** * get_backend [internal] */ @@ -59,7 +214,7 @@ static const PRINTPROVIDOR * get_backend(void) NULL, /* fpAddPrinterDriver */ NULL, /* fpEnumPrinterDrivers */ NULL, /* fpGetPrinterDriver */ - NULL, /* fpGetPrinterDriverDirectory */ + fpGetPrinterDriverDirectory, NULL, /* fpDeletePrinterDriver */ NULL, /* fpAddPrintProcessor */ NULL, /* fpEnumPrintProcessors */

1 0

Detlef Riekenberg : winspool: Use the backend for GetPrinterDriverDirectory .
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 36130b4d77a5baf8018365b97209b7102fa211bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=36130b4d77a5baf8018365b97… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 4 09:51:38 2008 +0100 winspool: Use the backend for GetPrinterDriverDirectory. --- dlls/winspool.drv/info.c | 50 +++++--------------------- dlls/winspool.drv/wspool.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/wspool.h | 3 ++ 3 files changed, 99 insertions(+), 41 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3143429..2ccaa3c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4844,57 +4844,25 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, LPDWORD pcbNeeded) { - DWORD needed; - const printenv_t * env; - TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); - if(pName != NULL && pName[0]) { - FIXME("pName unsupported: %s\n", debugstr_w(pName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - env = validate_envW(pEnvironment); - if(!env) return FALSE; /* pEnvironment invalid or unsupported */ + if ((backend == NULL) && !load_backend()) return FALSE; - if(Level != 1) { - WARN("(Level: %d) is ignored in win9x\n", Level); + if (Level != 1) { + /* (Level != 1) is ignored in win9x */ SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - - /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ - needed = GetSystemDirectoryW(NULL, 0); - /* add the Size for the Subdirectories */ - needed += lstrlenW(spooldriversW); - needed += lstrlenW(env->subdir); - needed *= sizeof(WCHAR); /* return-value is size in Bytes */ - - if(pcbNeeded) - *pcbNeeded = needed; - TRACE("required: 0x%x/%d\n", needed, needed); - if(needed > cbBuf) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - if(pcbNeeded == NULL) { - WARN("(pcbNeeded == NULL) is ignored in win9x\n"); + if (pcbNeeded == NULL) { + /* (pcbNeeded == NULL) is ignored in win9x */ SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - if(pDriverDirectory == NULL) { - /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } - - GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); - /* add the Subdirectories */ - lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); - lstrcatW((LPWSTR) pDriverDirectory, env->subdir); - TRACE(" => %s\n", debugstr_w((LPWSTR) pDriverDirectory)); - return TRUE; + + return backend->fpGetPrinterDriverDirectory(pName, pEnvironment, Level, + pDriverDirectory, cbBuf, pcbNeeded); + } diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 27c39e6..1685573 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -27,10 +27,96 @@ #include "winbase.h" #include "wingdi.h" #include "winspool.h" + +#include "winreg.h" +#include "ddk/winsplp.h" +#include "wine/debug.h" + #include "wspool.h" +WINE_DEFAULT_DEBUG_CHANNEL(winspool); + +/* ############################### */ + +static CRITICAL_SECTION backend_cs; +static CRITICAL_SECTION_DEBUG backend_cs_debug = +{ + 0, 0, &backend_cs, + { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } +}; +static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; + +/* ############################### */ + HINSTANCE WINSPOOL_hInstance = NULL; +static HMODULE hlocalspl = NULL; +static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + +PRINTPROVIDOR * backend = NULL; + +/****************************************************************************** + * load_backend [internal] + * + * load and init our backend (the local printprovider: "localspl.dll") + * + * PARAMS + * + * RETURNS + * Success: TRUE + * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE + * + * NOTES + * In windows, winspool.drv use RPC to interact with the spooler service + * (spoolsv.exe with spoolss.dll) and the spooler router (spoolss.dll) interact + * with the correct printprovider (localspl.dll for the local system) + * + */ +BOOL load_backend(void) +{ + static PRINTPROVIDOR mybackend; + DWORD res; + + EnterCriticalSection(&backend_cs); + hlocalspl = LoadLibraryA("localspl.dll"); + if (hlocalspl) { + pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor"); + if (pInitializePrintProvidor) { + + /* native localspl does not clear unused entries */ + memset(&mybackend, 0, sizeof(mybackend)); + res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL); + if (res) { + backend = &mybackend; + LeaveCriticalSection(&backend_cs); + TRACE("backend: %p (%p)\n", backend, hlocalspl); + return TRUE; + } + } + FreeLibrary(hlocalspl); + } + + LeaveCriticalSection(&backend_cs); + + WARN("failed to load the backend: %u\n", GetLastError()); + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; +} + +/****************************************************************************** + * unload_backend [internal] + * + */ +void unload_backend(void) +{ + EnterCriticalSection(&backend_cs); + backend = NULL; + FreeLibrary(hlocalspl); + LeaveCriticalSection(&backend_cs); +} + + /****************************************************************************** * DllMain * @@ -48,6 +134,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) break; } case DLL_PROCESS_DETACH: + unload_backend(); break; } diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 06178bc..5b831dc 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -21,6 +21,9 @@ extern HINSTANCE WINSPOOL_hInstance; +extern PRINTPROVIDOR * backend; +extern BOOL load_backend(void); + extern void WINSPOOL_LoadSystemPrinters(void); #define IDS_CAPTION 10

1 0

Michael Stefaniuc : msi: Fix "type of 'x' defaults to 'int'" warnings.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 41848c828b9dcc69068ff2bfdf1ba1c5cd53600d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41848c828b9dcc69068ff2bfd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 14:17:21 2008 +0100 msi: Fix "type of 'x' defaults to 'int'" warnings. --- dlls/msi/format.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 4a31f74..128f159 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -393,13 +393,13 @@ static BOOL format_str_is_number(LPWSTR str) return TRUE; } -static BOOL format_is_alpha(x) +static BOOL format_is_alpha(WCHAR x) { return (!format_is_number(x) && x != '\0' && x != '[' && x != ']' && x != '{' && x != '}'); } -static BOOL format_is_literal(x) +static BOOL format_is_literal(WCHAR x) { return (format_is_alpha(x) || format_is_number(x)); }

1 0

Alexandre Julliard : gdi32: Avoid locking in BITMAP_CopyBitmap.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 31576d408eba55382306099d6eb52df4622f65da URL: http://source.winehq.org/git/wine.git/?a=commit;h=31576d408eba55382306099d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 5 18:26:25 2008 +0100 gdi32: Avoid locking in BITMAP_CopyBitmap. --- dlls/gdi32/bitmap.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a873457..c468920 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -510,14 +510,10 @@ LONG WINAPI SetBitmapBits( */ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) { - BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC ); HBITMAP res = 0; BITMAP bm; - if(!bmp) return 0; - - bm = bmp->bitmap; - bm.bmBits = NULL; + if (!GetObjectW( hbitmap, sizeof(bm), &bm )) return 0; res = CreateBitmapIndirect(&bm); if(res) { @@ -527,8 +523,6 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) SetBitmapBits (res, bm.bmWidthBytes * bm.bmHeight, buf); HeapFree( GetProcessHeap(), 0, buf ); } - - GDI_ReleaseObj( hbitmap ); return res; }

1 0

Alexandre Julliard : gdi32: Use a separate critical section for freetype locking instead of relying on the GDI lock .
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 35c09c01b20b9a568f41f690cddb72dd6890e3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c09c01b20b9a568f41f690c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 5 21:16:06 2008 +0100 gdi32: Use a separate critical section for freetype locking instead of relying on the GDI lock. --- dlls/gdi32/freetype.c | 143 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 120 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35c09c01b20b9a568f41f…

1 0