June 2012 - Wine-Commits - list.winehq.org

Francois Gouget : msi/tests: Get rid of unneeded function typedefs.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 7f0cfac5cc1bc26a59ff0f140e085d619afbec11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0cfac5cc1bc26a59ff0f140… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 15:20:09 2012 +0200 msi/tests: Get rid of unneeded function typedefs. --- dlls/msi/tests/db.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 8b62c39..107502f 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -453,11 +453,9 @@ static void test_msiinsert(void) ok(r == TRUE, "file didn't exist after commit\n"); } -typedef UINT (WINAPI *fnMsiDecomposeDescriptorA)(LPCSTR, LPCSTR, LPSTR, LPSTR, DWORD *); -static fnMsiDecomposeDescriptorA pMsiDecomposeDescriptorA; - static void test_msidecomposedesc(void) { + UINT (WINAPI *pMsiDecomposeDescriptorA)(LPCSTR, LPCSTR, LPSTR, LPSTR, DWORD *); char prod[MAX_FEATURE_CHARS+1], comp[MAX_FEATURE_CHARS+1], feature[MAX_FEATURE_CHARS+1]; const char *desc; UINT r; @@ -465,8 +463,7 @@ static void test_msidecomposedesc(void) HMODULE hmod; hmod = GetModuleHandle("msi.dll"); - pMsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) - GetProcAddress(hmod, "MsiDecomposeDescriptorA"); + pMsiDecomposeDescriptorA = (void*)GetProcAddress(hmod, "MsiDecomposeDescriptorA"); if (!pMsiDecomposeDescriptorA) return;

1 0

Francois Gouget : crypt32/tests: Get rid of unneeded function typedefs.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 6af6f025853aff1440f2fdad9152fb33cd75a643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af6f025853aff1440f2fdad9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 15:19:50 2012 +0200 crypt32/tests: Get rid of unneeded function typedefs. --- dlls/crypt32/tests/main.c | 62 +++++++++++++++----------------------------- dlls/crypt32/tests/store.c | 6 +--- dlls/crypt32/tests/str.c | 45 ++++++++++--------------------- 3 files changed, 38 insertions(+), 75 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 8c5b41e..8ceec7b 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -206,33 +206,22 @@ static void test_cryptAllocate(void) CryptMemFree(buf); } -typedef DWORD (WINAPI *I_CryptAllocTlsFunc)(void); -typedef LPVOID (WINAPI *I_CryptDetachTlsFunc)(DWORD dwTlsIndex); -typedef LPVOID (WINAPI *I_CryptGetTlsFunc)(DWORD dwTlsIndex); -typedef BOOL (WINAPI *I_CryptSetTlsFunc)(DWORD dwTlsIndex, LPVOID lpTlsValue); -typedef BOOL (WINAPI *I_CryptFreeTlsFunc)(DWORD dwTlsIndex, DWORD unknown); - -static I_CryptAllocTlsFunc pI_CryptAllocTls; -static I_CryptDetachTlsFunc pI_CryptDetachTls; -static I_CryptGetTlsFunc pI_CryptGetTls; -static I_CryptSetTlsFunc pI_CryptSetTls; -static I_CryptFreeTlsFunc pI_CryptFreeTls; static void test_cryptTls(void) { + DWORD (WINAPI *pI_CryptAllocTls)(void); + LPVOID (WINAPI *pI_CryptDetachTls)(DWORD dwTlsIndex); + LPVOID (WINAPI *pI_CryptGetTls)(DWORD dwTlsIndex); + BOOL (WINAPI *pI_CryptSetTls)(DWORD dwTlsIndex, LPVOID lpTlsValue); + BOOL (WINAPI *pI_CryptFreeTls)(DWORD dwTlsIndex, DWORD unknown); DWORD index; BOOL ret; - pI_CryptAllocTls = (I_CryptAllocTlsFunc)GetProcAddress(hCrypt, - "I_CryptAllocTls"); - pI_CryptDetachTls = (I_CryptDetachTlsFunc)GetProcAddress(hCrypt, - "I_CryptDetachTls"); - pI_CryptGetTls = (I_CryptGetTlsFunc)GetProcAddress(hCrypt, - "I_CryptGetTls"); - pI_CryptSetTls = (I_CryptSetTlsFunc)GetProcAddress(hCrypt, - "I_CryptSetTls"); - pI_CryptFreeTls = (I_CryptFreeTlsFunc)GetProcAddress(hCrypt, - "I_CryptFreeTls"); + pI_CryptAllocTls = (void *)GetProcAddress(hCrypt, "I_CryptAllocTls"); + pI_CryptDetachTls = (void *)GetProcAddress(hCrypt, "I_CryptDetachTls"); + pI_CryptGetTls = (void *)GetProcAddress(hCrypt, "I_CryptGetTls"); + pI_CryptSetTls = (void *)GetProcAddress(hCrypt, "I_CryptSetTls"); + pI_CryptFreeTls = (void *)GetProcAddress(hCrypt, "I_CryptFreeTls"); /* One normal pass */ index = pI_CryptAllocTls(); @@ -277,16 +266,12 @@ static void test_cryptTls(void) } } -typedef BOOL (WINAPI *I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc) - (LPCWSTR, DWORD *); - static void test_readTrustedPublisherDWORD(void) { - I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc pReadDWORD; - pReadDWORD = - (I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc)GetProcAddress( - hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); + BOOL (WINAPI *pReadDWORD)(LPCWSTR, DWORD *); + + pReadDWORD = (void *)GetProcAddress(hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); if (pReadDWORD) { static const WCHAR safer[] = { @@ -320,15 +305,12 @@ static void test_readTrustedPublisherDWORD(void) } } -typedef HCRYPTPROV (WINAPI *I_CryptGetDefaultCryptProvFunc)(DWORD w); - static void test_getDefaultCryptProv(void) { - I_CryptGetDefaultCryptProvFunc pI_CryptGetDefaultCryptProv; + HCRYPTPROV (WINAPI *pI_CryptGetDefaultCryptProv)(DWORD w); HCRYPTPROV prov; - pI_CryptGetDefaultCryptProv = (I_CryptGetDefaultCryptProvFunc) - GetProcAddress(hCrypt, "I_CryptGetDefaultCryptProv"); + pI_CryptGetDefaultCryptProv = (void *)GetProcAddress(hCrypt, "I_CryptGetDefaultCryptProv"); if (!pI_CryptGetDefaultCryptProv) return; prov = pI_CryptGetDefaultCryptProv(0xdeadbeef); @@ -345,14 +327,12 @@ static void test_getDefaultCryptProv(void) CryptReleaseContext(prov, 0); } -typedef int (WINAPI *I_CryptInstallOssGlobal)(DWORD,DWORD,DWORD); - static void test_CryptInstallOssGlobal(void) { + int (WINAPI *pI_CryptInstallOssGlobal)(DWORD,DWORD,DWORD); int ret,i; - I_CryptInstallOssGlobal pI_CryptInstallOssGlobal; - pI_CryptInstallOssGlobal= (I_CryptInstallOssGlobal)GetProcAddress(hCrypt,"I_CryptInstallOssGlobal"); + pI_CryptInstallOssGlobal = (void *)GetProcAddress(hCrypt,"I_CryptInstallOssGlobal"); /* passing in some random values to I_CryptInstallOssGlobal, it always returns 9 the first time, then 10, 11 etc.*/ for(i=0;i<30;i++) { @@ -363,10 +343,6 @@ static void test_CryptInstallOssGlobal(void) } } -static BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, - DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, DWORD *pcbFormat); - static const BYTE encodedInt[] = { 0x02,0x01,0x01 }; static const WCHAR encodedIntStr[] = { '0','2',' ','0','1',' ','0','1',0 }; static const BYTE encodedBigInt[] = { 0x02,0x1f,0x01,0x02,0x03,0x04,0x05,0x06, @@ -381,6 +357,10 @@ static const WCHAR encodedBigIntStr[] = { '0','2',' ','1','f',' ','0','1',' ', static void test_format_object(void) { + BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, + DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, + DWORD *pcbFormat); BOOL ret; DWORD size; LPWSTR str; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 40d407a..0a36c83 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -738,8 +738,6 @@ static const struct CertPropIDHeader *findPropID(const BYTE *buf, DWORD size, return ret; } -typedef DWORD (WINAPI *SHDeleteKeyAFunc)(HKEY, LPCSTR); - static void testRegStore(void) { static const char tempKey[] = "Software\\Wine\\CryptTemp"; @@ -1017,9 +1015,9 @@ static void testRegStore(void) */ if (shlwapi) { - SHDeleteKeyAFunc pSHDeleteKeyA = - (SHDeleteKeyAFunc)GetProcAddress(shlwapi, "SHDeleteKeyA"); + DWORD (WINAPI *pSHDeleteKeyA)(HKEY, LPCSTR); + pSHDeleteKeyA = (void*)GetProcAddress(shlwapi, "SHDeleteKeyA"); if (pSHDeleteKeyA) pSHDeleteKeyA(HKEY_CURRENT_USER, tempKey); FreeLibrary(shlwapi); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 1443597..dd61888 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -185,32 +185,22 @@ static WCHAR x500SubjectStrSemicolonReverseW[] = { 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', ';',' ','C','=','U','S',0 }; -typedef BOOL (WINAPI *CryptDecodeObjectFunc)(DWORD, LPCSTR, const BYTE *, - DWORD, DWORD, void *, DWORD *); -typedef DWORD (WINAPI *CertNameToStrAFunc)(DWORD,LPVOID,DWORD,LPSTR,DWORD); -typedef DWORD (WINAPI *CertNameToStrWFunc)(DWORD,LPVOID,DWORD,LPWSTR,DWORD); -typedef DWORD (WINAPI *CertRDNValueToStrAFunc)(DWORD, PCERT_RDN_VALUE_BLOB, +static HMODULE dll; +static DWORD (WINAPI *pCertNameToStrA)(DWORD,LPVOID,DWORD,LPSTR,DWORD); +static DWORD (WINAPI *pCertNameToStrW)(DWORD,LPVOID,DWORD,LPWSTR,DWORD); +static DWORD (WINAPI *pCertRDNValueToStrA)(DWORD, PCERT_RDN_VALUE_BLOB, LPSTR, DWORD); -typedef DWORD (WINAPI *CertRDNValueToStrWFunc)(DWORD, PCERT_RDN_VALUE_BLOB, +static DWORD (WINAPI *pCertRDNValueToStrW)(DWORD, PCERT_RDN_VALUE_BLOB, LPWSTR, DWORD); -typedef BOOL (WINAPI *CertStrToNameAFunc)(DWORD dwCertEncodingType, +static BOOL (WINAPI *pCertStrToNameA)(DWORD dwCertEncodingType, LPCSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, LPCSTR *ppszError); -typedef BOOL (WINAPI *CertStrToNameWFunc)(DWORD dwCertEncodingType, +static BOOL (WINAPI *pCertStrToNameW)(DWORD dwCertEncodingType, LPCWSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, LPCWSTR *ppszError); -typedef DWORD (WINAPI *CertGetNameStringAFunc)(PCCERT_CONTEXT cert, DWORD type, +static DWORD (WINAPI *pCertGetNameStringA)(PCCERT_CONTEXT cert, DWORD type, DWORD flags, void *typePara, LPSTR str, DWORD cch); -static HMODULE dll; -static CertNameToStrAFunc pCertNameToStrA; -static CertNameToStrWFunc pCertNameToStrW; -static CryptDecodeObjectFunc pCryptDecodeObject; -static CertRDNValueToStrAFunc pCertRDNValueToStrA; -static CertRDNValueToStrWFunc pCertRDNValueToStrW; -static CertStrToNameAFunc pCertStrToNameA; -static CertStrToNameWFunc pCertStrToNameW; -static CertGetNameStringAFunc pCertGetNameStringA; static void test_CertRDNValueToStrA(void) { @@ -1096,18 +1086,13 @@ START_TEST(str) { dll = GetModuleHandleA("Crypt32.dll"); - pCertNameToStrA = (CertNameToStrAFunc)GetProcAddress(dll,"CertNameToStrA"); - pCertNameToStrW = (CertNameToStrWFunc)GetProcAddress(dll,"CertNameToStrW"); - pCertRDNValueToStrA = (CertRDNValueToStrAFunc)GetProcAddress(dll, - "CertRDNValueToStrA"); - pCertRDNValueToStrW = (CertRDNValueToStrWFunc)GetProcAddress(dll, - "CertRDNValueToStrW"); - pCryptDecodeObject = (CryptDecodeObjectFunc)GetProcAddress(dll, - "CryptDecodeObject"); - pCertStrToNameA = (CertStrToNameAFunc)GetProcAddress(dll,"CertStrToNameA"); - pCertStrToNameW = (CertStrToNameWFunc)GetProcAddress(dll,"CertStrToNameW"); - pCertGetNameStringA = (CertGetNameStringAFunc)GetProcAddress(dll, - "CertGetNameStringA"); + pCertNameToStrA = (void*)GetProcAddress(dll,"CertNameToStrA"); + pCertNameToStrW = (void*)GetProcAddress(dll,"CertNameToStrW"); + pCertRDNValueToStrA = (void*)GetProcAddress(dll, "CertRDNValueToStrA"); + pCertRDNValueToStrW = (void*)GetProcAddress(dll, "CertRDNValueToStrW"); + pCertStrToNameA = (void*)GetProcAddress(dll,"CertStrToNameA"); + pCertStrToNameW = (void*)GetProcAddress(dll,"CertStrToNameW"); + pCertGetNameStringA = (void*)GetProcAddress(dll, "CertGetNameStringA"); test_CertRDNValueToStrA(); test_CertRDNValueToStrW();

1 0

Alexandre Julliard : windowscodecs: Fix some broken tests.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: a7d08fcb6e5a28bc46238bb486dfbc7b9c1ed7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d08fcb6e5a28bc46238bb48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 16:00:33 2012 +0200 windowscodecs: Fix some broken tests. --- dlls/windowscodecs/info.c | 1 + dlls/windowscodecs/tests/info.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 2677ca7..92d0542 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1086,6 +1086,7 @@ static HRESULT WINAPI PixelFormatInfo_GetComponentType(IWICPixelFormatInfo2 *ifa WICComponentType *pType) { TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; *pType = WICPixelFormat; return S_OK; } diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 3d7ecc8..0e09bab 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -130,7 +130,7 @@ static void test_pixelformat_info(void) DWORD signing; hr = get_component_info(&GUID_WICPixelFormat32bppBGRA, &info); - todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); if (FAILED(hr)) return; @@ -189,6 +189,8 @@ static void test_pixelformat_info(void) ok(hr == S_OK, "GetComponentType failed, hr=%x\n", hr); ok(componenttype == WICPixelFormat, "unexpected component type 0x%x\n", componenttype); + todo_wine + { len = 0xdeadbeef; hr = IWICComponentInfo_GetFriendlyName(info, 0, NULL, &len); ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr); @@ -216,6 +218,7 @@ static void test_pixelformat_info(void) hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ + } IWICComponentInfo_Release(info); }

1 0

Huw Davies : wineps: Retrieve the ppd file from the driver directory.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: bdaddc4b7c4b4391b593a5f4ab91b8121c698bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaddc4b7c4b4391b593a5f4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 15 12:53:56 2012 +0100 wineps: Retrieve the ppd file from the driver directory. --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/init.c | 136 +++++-------------------------------------- 2 files changed, 14 insertions(+), 123 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 1af9503..bd810f9 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,6 +1,5 @@ MODULE = wineps.drv IMPORTS = user32 gdi32 winspool advapi32 -EXTRAINCL = @CUPSINCL@ C_SRCS = \ afm.c \ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3d9bf38..64a3c74 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -24,12 +24,6 @@ #include <stdarg.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_CUPS_CUPS_H -# include <cups/cups.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -46,10 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -#ifdef SONAME_LIBCUPS -static void *cupshandle = NULL; -#endif - static const PSDRV_DEVMODE DefaultDevmode = { { /* dmPublic */ @@ -145,25 +135,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) HeapDestroy(PSDRV_Heap); return FALSE; } -#ifdef SONAME_LIBCUPS - /* dynamically load CUPS if not yet loaded */ - if (!cupshandle) { - cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0); - if (!cupshandle) cupshandle = (void*)-1; - } -#endif break; case DLL_PROCESS_DETACH: DeleteObject( PSDRV_DefaultFont ); HeapDestroy( PSDRV_Heap ); -#ifdef SONAME_LIBCUPS - if (cupshandle && (cupshandle != (void*)-1)) { - wine_dlclose(cupshandle, NULL, 0); - cupshandle = NULL; - } -#endif break; } @@ -573,104 +550,21 @@ static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODE *dm ) return SetPrinterW( printer, 9, (BYTE *)&info, 0 ); } -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_ppd_filename( HANDLE printer, const char *nameA, BOOL *needs_unlink ) +static char *get_ppd_filename( HANDLE printer ) { - char *ret = NULL; - DWORD needed, err, type; - HKEY hkey; - const char *data_dir, *filename; - - *needs_unlink = FALSE; - -#ifdef SONAME_LIBCUPS - if (cupshandle != (void*)-1) - { - typeof(cupsGetPPD) *pcupsGetPPD; - - pcupsGetPPD = wine_dlsym( cupshandle, "cupsGetPPD", NULL, 0 ); - if (pcupsGetPPD) - { - filename = pcupsGetPPD( nameA ); - - if (filename) - { - needed = strlen( filename ) + 1; - ret = HeapAlloc( GetProcessHeap(), 0, needed ); - memcpy( ret, filename, needed ); - *needs_unlink = TRUE; - return ret; - } - else - WARN( "CUPS did not find ppd for %s\n", debugstr_a(nameA) ); - } - } -#endif + DWORD needed; + DRIVER_INFO_2W *info; + char *unixname; - err = GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed ); - if (err == ERROR_MORE_DATA) - { - ret = HeapAlloc( GetProcessHeap(), 0, needed ); - if (!ret) return NULL; - GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", &type, - (BYTE *)ret, needed, &needed ); - return expand_env_string( ret, type ); - } - - /* Look for a ppd file for this printer in the config file. - * First look under that printer's name, and then under 'generic' - */ - /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ - if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey ) == ERROR_SUCCESS ) - { - const char *value_name = NULL; - - if (RegQueryValueExA( hkey, nameA, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) - value_name = nameA; - 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 ); - } - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(nameA) ); - return NULL; - } - ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); - if (ret) - { - strcpy( ret, data_dir ); - strcat( ret, filename ); - } + GetPrinterDriverW( printer, NULL, 2, NULL, 0, &needed ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + info = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!info) return NULL; + GetPrinterDriverW( printer, NULL, 2, (BYTE*)info, needed, &needed ); + unixname = wine_get_unix_file_name( info->pDataFile ); + HeapFree( GetProcessHeap(), 0, info ); - return ret; + return unixname; } static struct list printer_list = LIST_INIT( printer_list ); @@ -686,7 +580,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) const AFM *afm; HANDLE hPrinter = 0; char *ppd_filename = NULL, *nameA = NULL; - BOOL using_default_devmode = FALSE, needs_unlink = FALSE; + BOOL using_default_devmode = FALSE; int len; TRACE("'%s'\n", debugstr_w(name)); @@ -715,7 +609,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); if (!pi->Devmode) goto fail; - ppd_filename = get_ppd_filename( hPrinter, nameA, &needs_unlink ); + ppd_filename = get_ppd_filename( hPrinter ); if (!ppd_filename) goto fail; pi->ppd = PSDRV_ParsePPD( ppd_filename ); @@ -798,7 +692,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) } ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); - if (needs_unlink) unlink( ppd_filename ); HeapFree( GetProcessHeap(), 0, ppd_filename ); list_add_head( &printer_list, &pi->entry ); return pi; @@ -810,7 +703,6 @@ fail: HeapFree(PSDRV_Heap, 0, pi->Devmode); HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); - if (needs_unlink) unlink( ppd_filename ); HeapFree( GetProcessHeap(), 0, ppd_filename ); return NULL; }

1 0

Huw Davies : winspool: Set the printer location from the cups printer-location option.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 69ff2636b4a6e0aa5b21dabd8853dc47f550be49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ff2636b4a6e0aa5b21dabd8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 15 12:53:55 2012 +0100 winspool: Set the printer location from the cups printer-location option. --- dlls/winspool.drv/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e27d007..d1afe56 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -867,7 +867,7 @@ static BOOL CUPS_LoadPrinters(void) pi2.pPrintProcessor = WinPrintW; pi2.pDriverName = nameW; pi2.pComment = get_cups_option( "printer-info", dests[i].num_options, dests[i].options ); - pi2.pLocation = emptyStringW; + pi2.pLocation = get_cups_option( "printer-location", dests[i].num_options, dests[i].options ); pi2.pPortName = port; pi2.pParameters = emptyStringW; pi2.pShareName = emptyStringW; @@ -879,6 +879,7 @@ static BOOL CUPS_LoadPrinters(void) ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); HeapFree( GetProcessHeap(), 0, pi2.pComment ); + HeapFree( GetProcessHeap(), 0, pi2.pLocation ); } HeapFree( GetProcessHeap(), 0, port );

1 0

Huw Davies : winspool: Add a missing default priority value.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: afab51c4e75d463e8bbd6e6abb5300814bdf0bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=afab51c4e75d463e8bbd6e6ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 15 12:53:53 2012 +0100 winspool: Add a missing default priority value. --- dlls/winspool.drv/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 362ff27..1a09195 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3032,6 +3032,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); + set_reg_DWORD(hkeyPrinter, Default_PriorityW, pi->DefaultPriority); set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); set_reg_szW(hkeyPrinter, LocationW, pi->pLocation);

1 0

Francois Gouget : shell32/tests: Get rid of unneeded function typedefs.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: ef6f3a30cc88ef4cbec79433f234de8b2fe1fe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6f3a30cc88ef4cbec79433f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 15:20:30 2012 +0200 shell32/tests: Get rid of unneeded function typedefs. --- dlls/shell32/tests/shelllink.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index d28cff0..8c6275d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -37,15 +37,10 @@ # define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ #endif -typedef void (WINAPI *fnILFree)(LPITEMIDLIST); -typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); -typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); -typedef HRESULT (WINAPI *fnSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); - -static fnILFree pILFree; -static fnILIsEqual pILIsEqual; -static fnSHILCreateFromPath pSHILCreateFromPath; -static fnSHDefExtractIconA pSHDefExtractIconA; +static void (WINAPI *pILFree)(LPITEMIDLIST); +static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); +static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); @@ -1005,10 +1000,10 @@ START_TEST(shelllink) HMODULE hmod = GetModuleHandleA("shell32.dll"); HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155); - pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21); - pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28); - pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA"); + pILFree = (void *)GetProcAddress(hmod, (LPSTR)155); + pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); + pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); + pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA");

1 0

Huw Davies : winspool: Set the printer description from the cups printer-info option.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 5875185e342d0b574a60a5a0ee80025025d87333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5875185e342d0b574a60a5a0e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 15 12:53:54 2012 +0100 winspool: Set the printer description from the cups printer-info option. --- dlls/winspool.drv/info.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1a09195..e27d007 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,6 +721,7 @@ static void *cupshandle; DO_FUNC(cupsFreeDests); \ DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetOption); \ DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile); @@ -778,8 +779,21 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) return get_fallback_ppd( printer_name, ppd ); } -static WCHAR comment_cups[] = {'W','I','N','E','P','S',' ','P','r','i','n','t','e','r', - ' ','u','s','i','n','g',' ','C','U','P','S',0}; +static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t *options ) +{ + const char *value; + WCHAR *ret; + int len; + + value = pcupsGetOption( name, num_options, options ); + if (!value) return NULL; + + len = MultiByteToWideChar( CP_UNIXCP, 0, value, -1, NULL, 0 ); + ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (ret) MultiByteToWideChar( CP_UNIXCP, 0, value, -1, ret, len ); + + return ret; +} static BOOL CUPS_LoadPrinters(void) { @@ -852,7 +866,7 @@ static BOOL CUPS_LoadPrinters(void) pi2.pDatatype = rawW; pi2.pPrintProcessor = WinPrintW; pi2.pDriverName = nameW; - pi2.pComment = comment_cups; + pi2.pComment = get_cups_option( "printer-info", dests[i].num_options, dests[i].options ); pi2.pLocation = emptyStringW; pi2.pPortName = port; pi2.pParameters = emptyStringW; @@ -863,8 +877,10 @@ static BOOL CUPS_LoadPrinters(void) if (added_printer) ClosePrinter( added_printer ); else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); + + HeapFree( GetProcessHeap(), 0, pi2.pComment ); } - HeapFree(GetProcessHeap(),0,port); + HeapFree( GetProcessHeap(), 0, port ); hadprinter = TRUE; if (dests[i].is_default) {

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_GetClassName.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 9014211796b561abcbf90d11a545a76b71136cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9014211796b561abcbf90d11a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:29:21 2012 +0200 d3drm: Implement IDirect3DRMFrameX_GetClassName. --- dlls/d3drm/frame.c | 14 ++++++++++---- dlls/d3drm/tests/d3drm.c | 11 ++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 26ebaf3..0100221 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -594,9 +594,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetClassName(IDirect3DRMFrame2* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMFrame3_GetClassName(&This->IDirect3DRMFrame3_iface, size, name); } /*** IDirect3DRMFrame methods ***/ @@ -1493,9 +1493,15 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetClassName(IDirect3DRMFrame3* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Frame") || !name) + return E_INVALIDARG; + + strcpy(name, "Frame"); + *size = sizeof("Frame"); + + return D3DRM_OK; } /*** IDirect3DRMFrame methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7ed4394..9444756 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -569,13 +569,18 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); count = sizeof(cname); hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(count != sizeof(cname), "size didn't change: %u\n", count); + ok(count == sizeof("Frame"), "wrong strlen: %u\n", count); ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); - } hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_GetClassName.
by Alexandre Julliard June 15, 2012

June 15, 2012

Module: wine Branch: master Commit: 546a3dcffcdf40134c72478f3fb6b081471ffab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546a3dcffcdf40134c72478f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:30:07 2012 +0200 d3drm: Implement IDirect3DRMLight_GetClassName. --- dlls/d3drm/light.c | 10 ++++++++-- dlls/d3drm/tests/d3drm.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 67baaa7..558d836 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -172,9 +172,15 @@ static HRESULT WINAPI IDirect3DRMLightImpl_GetClassName(IDirect3DRMLight* iface, { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Light") || !name) + return E_INVALIDARG; + + strcpy(name, "Light"); + *size = sizeof("Light"); + + return D3DRM_OK; } /*** IDirect3DRMLight methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9444756..bbe2da3 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -879,13 +879,18 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &pLight); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + hr = IDirect3DRMLight_GetClassName(pLight, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMLight_GetClassName(pLight, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Light"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); - } type = IDirect3DRMLight_GetType(pLight); ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);

1 0