wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Piotr Caban : wininet: Correctly set next hash table offset.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 39bc1faa8fb1ad891572b60a0714c34214e02d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bc1faa8fb1ad891572b60a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 3 16:45:07 2012 +0200 wininet: Correctly set next hash table offset. --- dlls/wininet/urlcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 762a09d..9e1f779 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1323,7 +1323,7 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD key = URLCache_HashKey(lpszUrl); DWORD offset = (key & (HASHTABLE_NUM_ENTRIES-1)) * HASHTABLE_BLOCKSIZE; - HASH_CACHEFILE_ENTRY * pHashEntry; + HASH_CACHEFILE_ENTRY * pHashEntry, *pHashPrev = NULL; DWORD dwHashTableNumber = 0; DWORD error; @@ -1334,6 +1334,8 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHashEntry->dwAddressNext)) { int i; + pHashPrev = pHashEntry; + if (pHashEntry->dwHashTableNumber != dwHashTableNumber++) { ERR("not right hash table number (%d) expected %d\n", pHashEntry->dwHashTableNumber, dwHashTableNumber); @@ -1357,7 +1359,7 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, } } } - error = URLCache_CreateHashTable(pHeader, pHashEntry, &pHashEntry); + error = URLCache_CreateHashTable(pHeader, pHashPrev, &pHashEntry); if (error != ERROR_SUCCESS) return error;

1 0

Piotr Caban : wininet: Store element type and state in hash table key ( urlcache).
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: dedd42fb4f1b6b92f09274e927f33f334eaa1c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedd42fb4f1b6b92f09274e92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 3 16:34:50 2012 +0200 wininet: Store element type and state in hash table key (urlcache). --- dlls/wininet/urlcache.c | 63 +++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a217236..762a09d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -60,18 +60,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -#define ENTRY_START_OFFSET 0x4000 -#define DIR_LENGTH 8 -#define BLOCKSIZE 128 -#define HASHTABLE_SIZE 448 -#define HASHTABLE_BLOCKSIZE 7 -#define HASHTABLE_FREE 3 +#define ENTRY_START_OFFSET 0x4000 +#define DIR_LENGTH 8 +#define BLOCKSIZE 128 +#define HASHTABLE_SIZE 448 +#define HASHTABLE_NUM_ENTRIES 64 /* this needs to be power of 2, that divides HASHTABLE_SIZE */ +#define HASHTABLE_BLOCKSIZE (HASHTABLE_SIZE / HASHTABLE_NUM_ENTRIES) #define ALLOCATION_TABLE_OFFSET 0x250 -#define ALLOCATION_TABLE_SIZE (0x1000 - ALLOCATION_TABLE_OFFSET) -#define HASHTABLE_NUM_ENTRIES (HASHTABLE_SIZE / HASHTABLE_BLOCKSIZE) +#define ALLOCATION_TABLE_SIZE (ENTRY_START_OFFSET - ALLOCATION_TABLE_OFFSET) #define NEWFILE_NUM_BLOCKS 0xd80 #define NEWFILE_SIZE (NEWFILE_NUM_BLOCKS * BLOCKSIZE + ENTRY_START_OFFSET) +#define HASHTABLE_URL 0 +#define HASHTABLE_LEAK 1 +#define HASHTABLE_LOCK 2 +#define HASHTABLE_FREE 3 +#define HASHTABLE_REDR 5 +#define HASHTABLE_FLAG_BITS 4 + #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') #define REDR_SIGNATURE DWORD_SIG('R','E','D','R') @@ -1200,19 +1206,19 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct * each block therefore contains a chain of 7 key/offset pairs * how position in table is calculated: * 1. the url is hashed in helper function - * 2. the key % 64 * 8 is the offset - * 3. the key in the hash table is the hash key aligned to 64 + * 2. the key % HASHTABLE_NUM_ENTRIES is the bucket number + * 3. bucket number * HASHTABLE_BLOCKSIZE is offset of the bucket * * note: * there can be multiple hash tables in the file and the offset to * the next one is stored in the header of the hash table */ DWORD key = URLCache_HashKey(lpszUrl); - DWORD offset = (key % HASHTABLE_NUM_ENTRIES) * sizeof(struct _HASH_ENTRY); + DWORD offset = (key & (HASHTABLE_NUM_ENTRIES-1)) * HASHTABLE_BLOCKSIZE; HASH_CACHEFILE_ENTRY * pHashEntry; DWORD dwHashTableNumber = 0; - key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + key >>= HASHTABLE_FLAG_BITS; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); URLCache_IsHashEntryValid(pHeader, pHashEntry); @@ -1234,7 +1240,7 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct for (i = 0; i < HASHTABLE_BLOCKSIZE; i++) { struct _HASH_ENTRY * pHashElement = &pHashEntry->HashTable[offset + i]; - if (key == (pHashElement->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES) + if (key == pHashElement->dwHashKey>>HASHTABLE_FLAG_BITS) { /* FIXME: we should make sure that this is the right element * before returning and claiming that it is. We can do this @@ -1268,20 +1274,17 @@ static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, stru } /*********************************************************************** - * URLCache_HashEntrySetUse (Internal) + * URLCache_HashEntrySetFlags (Internal) * - * Searches all the hash tables in the index for the given URL and - * sets the use count (stored or'ed with key) + * Sets special bits in hash key * * RETURNS - * TRUE if the entry was found - * FALSE if the entry could not be found + * nothing * */ -static BOOL URLCache_HashEntrySetUse(struct _HASH_ENTRY * pHashEntry, DWORD dwUseCount) +static void URLCache_HashEntrySetFlags(struct _HASH_ENTRY * pHashEntry, DWORD dwFlag) { - pHashEntry->dwHashKey = dwUseCount | (pHashEntry->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; - return TRUE; + pHashEntry->dwHashKey = (pHashEntry->dwHashKey >> HASHTABLE_FLAG_BITS << HASHTABLE_FLAG_BITS) | dwFlag; } /*********************************************************************** @@ -1314,17 +1317,17 @@ static BOOL URLCache_DeleteEntryFromHash(struct _HASH_ENTRY * pHashEntry) * Any other Win32 error code if the entry could not be added * */ -static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry) +static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry, DWORD dwFieldType) { /* see URLCache_FindEntryInHash for structure of hash tables */ DWORD key = URLCache_HashKey(lpszUrl); - DWORD offset = (key % HASHTABLE_NUM_ENTRIES) * sizeof(struct _HASH_ENTRY); + DWORD offset = (key & (HASHTABLE_NUM_ENTRIES-1)) * HASHTABLE_BLOCKSIZE; HASH_CACHEFILE_ENTRY * pHashEntry; DWORD dwHashTableNumber = 0; DWORD error; - key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + key = ((key >> HASHTABLE_FLAG_BITS) << HASHTABLE_FLAG_BITS) + dwFieldType; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); URLCache_IsHashEntryValid(pHeader, pHashEntry); @@ -2010,7 +2013,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_LOCK); GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2111,7 +2114,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_LOCK); GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2227,7 +2230,8 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } pUrlEntry->dwUseCount--; - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + if (!pUrlEntry->dwUseCount) + URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2298,7 +2302,8 @@ BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) return FALSE; } pUrlEntry->dwUseCount--; - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + if (!pUrlEntry->dwUseCount) + URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2777,7 +2782,7 @@ static BOOL CommitUrlCacheEntryInternal( strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetFileExtension), lpszFileExtensionA); error = URLCache_AddEntryToHash(pHeader, lpszUrlNameA, - (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); + (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader), HASHTABLE_URL); if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); else

1 0

Huw Davies : wineps: Store the unicode version of the printer name and call the unicode version of OpenPrinter .
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 7c3a522dd3d6469481f08077891db5d3346658b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3a522dd3d6469481f080778… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:53 2012 +0100 wineps: Store the unicode version of the printer name and call the unicode version of OpenPrinter. --- dlls/wineps.drv/driver.c | 16 ++++++++++++- dlls/wineps.drv/escape.c | 4 +- dlls/wineps.drv/init.c | 51 +++++++++++++++++++++++---------------------- dlls/wineps.drv/psdrv.h | 4 +- 4 files changed, 44 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c3a522dd3d6469481f08…

1 0

Huw Davies : wineps: Store the document title as a unicode string.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: a152666920b32be11b0c5d70e1b1e23f3155001b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a152666920b32be11b0c5d70e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:52 2012 +0100 wineps: Store the document title as a unicode string. --- dlls/wineps.drv/escape.c | 13 ++++--------- dlls/wineps.drv/init.c | 13 ------------- dlls/wineps.drv/ps.c | 20 ++++++++++++++------ dlls/wineps.drv/psdrv.h | 16 ++++++++++++++-- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 66a1a89..a8a89d1 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -378,7 +378,7 @@ INT PSDRV_StartPage( PHYSDEV dev ) } if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.DocName )) + if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) return 0; } @@ -457,12 +457,7 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) physDev->job.quiet = FALSE; physDev->job.in_passthrough = FALSE; physDev->job.had_passthrough_rect = FALSE; - if(doc->lpszDocName) { - INT len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); - physDev->job.DocName = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, physDev->job.DocName, len, NULL, NULL ); - } else - physDev->job.DocName = NULL; + physDev->job.doc_name = strdupW( doc->lpszDocName ); return physDev->job.id; } @@ -492,8 +487,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) ClosePrinter(physDev->job.hprinter); physDev->job.hprinter = NULL; physDev->job.id = 0; - HeapFree(GetProcessHeap(), 0, physDev->job.DocName); - physDev->job.DocName = NULL; + HeapFree( GetProcessHeap(), 0, physDev->job.doc_name ); + physDev->job.doc_name = NULL; return ret; } diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a927338..d5c8547 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -41,7 +41,6 @@ #include "winnls.h" #include "psdrv.h" #include "winspool.h" -#include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -172,18 +171,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline WCHAR *strdupW( const WCHAR *str ) -{ - int size; - WCHAR *ret; - - if (!str) return NULL; - size = (strlenW( str ) + 1) * sizeof(WCHAR); - ret = HeapAlloc( GetProcessHeap(), 0, size ); - if (ret) memcpy( ret, str, size ); - return ret; -} - static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { PAGESIZE *page; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 19784f3..8b0d576 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -241,18 +241,23 @@ static INT PSDRV_WriteFeature(PHYSDEV dev, LPCSTR feature, LPCSTR value, LPCSTR * in brackets. Truncate string to represent at most 0x80 characters. * */ -static char *escape_title(LPCSTR str) +static char *escape_title(LPCWSTR wstr) { - char *ret, *cp; + char *ret, *cp, *str; int i, extra = 0; - if(!str) + if(!wstr) { ret = HeapAlloc(GetProcessHeap(), 0, 1); *ret = '\0'; return ret; } + i = WideCharToMultiByte( CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL ); + str = HeapAlloc( GetProcessHeap(), 0, i ); + if (!str) return NULL; + WideCharToMultiByte( CP_ACP, 0, wstr, -1, str, i, NULL, NULL ); + for(i = 0; i < 0x80 && str[i]; i++) { if(!isprint(str[i])) @@ -264,7 +269,7 @@ static char *escape_title(LPCSTR str) ret = HeapAlloc(GetProcessHeap(), 0, i + 1); memcpy(ret, str, i); ret[i] = '\0'; - return ret; + goto done; } extra += 2; /* two for the brackets */ @@ -285,11 +290,14 @@ static char *escape_title(LPCSTR str) } *cp++ = ')'; *cp = '\0'; + +done: + HeapFree( GetProcessHeap(), 0, str ); return ret; } -INT PSDRV_WriteHeader( PHYSDEV dev, LPCSTR title ) +INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *escaped_title; @@ -299,7 +307,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCSTR title ) int win_duplex; int llx, lly, urx, ury; - TRACE("%s\n", debugstr_a(title)); + TRACE("%s\n", debugstr_w(title)); escaped_title = escape_title(title); buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) + diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index fd82bd5..13d8de2 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winspool.h" +#include "wine/unicode.h" #include "wine/gdi_driver.h" #include "wine/list.h" @@ -347,7 +348,7 @@ typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ LPWSTR output; /* Output file/port */ - LPSTR DocName; /* Document Name */ + LPWSTR doc_name; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */ INT PageNo; @@ -491,7 +492,7 @@ extern void PSDRV_CreateColor( PHYSDEV dev, PSCOLOR *pscolor, COLORREF wincolor ) DECLSPEC_HIDDEN; extern char PSDRV_UnicodeToANSI(int u) DECLSPEC_HIDDEN; -extern INT PSDRV_WriteHeader( PHYSDEV dev, LPCSTR title ) DECLSPEC_HIDDEN; +extern INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DECLSPEC_HIDDEN; extern INT PSDRV_WriteFooter( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT PSDRV_WriteNewPage( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT PSDRV_WriteEndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; @@ -580,5 +581,16 @@ extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HID setlocale(LC_NUMERIC,tmplocale); \ } while (0) +static inline WCHAR *strdupW( const WCHAR *str ) +{ + int size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} #endif

1 0

Huw Davies : wineps: Move some structs to the process heap.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: c9ddabad2227226e7795f30dc45c6a49784e3488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ddabad2227226e7795f30dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:51 2012 +0100 wineps: Move some structs to the process heap. --- dlls/wineps.drv/init.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4057bdd..a927338 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -275,11 +275,11 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) /*********************************************************** * DEVMODEdupWtoA * - * Creates an ascii copy of supplied devmode on heap + * Creates an ascii copy of supplied devmode on the process heap * * Copied from dlls/winspool/info.c until full unicodification */ -static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) +static LPDEVMODEA DEVMODEdupWtoA( const DEVMODEW *dmW ) { LPDEVMODEA dmA; DWORD size; @@ -290,7 +290,7 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) if(!dmW) return NULL; Formname = (dmW->dmSize > off_formname); size = dmW->dmSize - CCHDEVICENAME - (Formname ? CCHFORMNAME : 0); - dmA = HeapAlloc(heap, HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra); + dmA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra ); WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1, (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL); if(!Formname) { @@ -315,13 +315,13 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) { PSDRV_PDEVICE *physDev; - physDev = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*physDev) ); + physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ); if (!physDev) return NULL; - physDev->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(PSDRV_DEVMODEA) ); + physDev->Devmode = HeapAlloc( GetProcessHeap(), 0, sizeof(PSDRV_DEVMODEA) ); if (!physDev->Devmode) { - HeapFree( PSDRV_Heap, 0, physDev ); + HeapFree( GetProcessHeap(), 0, physDev ); return NULL; } @@ -370,9 +370,9 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) { - DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); + DEVMODEA *devmodeA = DEVMODEdupWtoA( initData ); PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODEA *)devmodeA, pi); - HeapFree(PSDRV_Heap, 0, devmodeA); + HeapFree( GetProcessHeap(), 0, devmodeA ); } PSDRV_UpdateDevCaps(physDev); @@ -411,9 +411,9 @@ static BOOL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); - HeapFree( PSDRV_Heap, 0, physDev->Devmode ); + HeapFree( GetProcessHeap(), 0, physDev->Devmode ); HeapFree( GetProcessHeap(), 0, physDev->job.output ); - HeapFree( PSDRV_Heap, 0, physDev ); + HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; } @@ -427,9 +427,9 @@ static HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); if(lpInitData) { - DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, lpInitData); + DEVMODEA *devmodeA = DEVMODEdupWtoA( lpInitData ); PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODEA *)devmodeA, physDev->pi); - HeapFree(PSDRV_Heap, 0, devmodeA); + HeapFree( GetProcessHeap(), 0, devmodeA ); PSDRV_UpdateDevCaps(physDev); } return dev->hdc;

1 0

Huw Davies : wineps: Free the output string from the correct heap.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 1432b3141ae8d8a0e9f37a6e785174a7542a31fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1432b3141ae8d8a0e9f37a6e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:50 2012 +0100 wineps: Free the output string from the correct heap. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c6a4488..4057bdd 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -412,7 +412,7 @@ static BOOL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); HeapFree( PSDRV_Heap, 0, physDev->Devmode ); - HeapFree( PSDRV_Heap, 0, physDev->job.output ); + HeapFree( GetProcessHeap(), 0, physDev->job.output ); HeapFree( PSDRV_Heap, 0, physDev ); return TRUE;

1 0

Andrew Eikum : mmddk.h: Remove unused, Wine-specific WinMM defines.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 1b21fe827f385d0cc0cc8b900994ce56de656cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b21fe827f385d0cc0cc8b900… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 09:14:16 2012 -0500 mmddk.h: Remove unused, Wine-specific WinMM defines. --- dlls/dsound/dsound.c | 4 ---- dlls/winmm/lolvldrv.c | 4 ---- include/mmddk.h | 8 -------- 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 444b933..91184c9 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1203,10 +1203,6 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) return DSERR_OUTOFMEMORY; } - /* We rely on the sound driver to return the actual sound format of - * the device if it does not support 22050x8x2 and is given the - * WAVE_DIRECTSOUND flag. - */ device->pwfx->wFormatTag = WAVE_FORMAT_PCM; device->pwfx->nSamplesPerSec = ds_default_sample_rate; device->pwfx->wBitsPerSample = ds_default_bits_per_sample; diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 820d28b..7081a86 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -340,10 +340,6 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, case DRV_QUERYDEVICEINTERFACESIZE: return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */ - case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/ - return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - default: WARN("Unknown call %04x\n", uMsg); return MMSYSERR_INVALPARAM; diff --git a/include/mmddk.h b/include/mmddk.h index d6359ef..d4217f2 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -91,10 +91,6 @@ typedef struct { #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) #define DRV_QUERYFUNCTIONINSTANCEID (DRV_RESERVED + 17) #define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18) -#ifdef __WINESRC__ -#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) -#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) -#endif #define DRVM_MAPPER_PREFERRED_FLAGS_PREFERREDONLY 0x00000001 @@ -466,10 +462,6 @@ BOOL WINAPI mmTaskSignal(DWORD); VOID WINAPI mmTaskYield(VOID); DWORD WINAPI mmGetCurrentTask(VOID); -#ifdef __WINESRC__ -#define WAVE_DIRECTSOUND 0x0080 -#endif - #include <poppack.h> #ifdef __cplusplus

1 0

Huw Davies : winspool: Remove a FIXME now that we don't ignore the defaults .
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: b24da40410ad5df12d4cd25c8db113b9fdd2ae03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24da40410ad5df12d4cd25c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:41 2012 +0100 winspool: Remove a FIXME now that we don't ignore the defaults. --- dlls/winspool.drv/info.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4845447..14d4b14 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1899,10 +1899,6 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU { TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); - if (pDefault) { - FIXME("PRINTER_DEFAULTS ignored => %s,%p,0x%08x\n", - debugstr_w(pDefault->pDatatype), pDefault->pDevMode, pDefault->DesiredAccess); - } if(!phPrinter) { /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */

1 0

Huw Davies : winspool/tests: Add some tests for OpenPrinter with non-NULL defaults.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: bfab84378de6d6795b5eae8a1c9fe836146a1511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfab84378de6d6795b5eae8a1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:40 2012 +0100 winspool/tests: Add some tests for OpenPrinter with non-NULL defaults. --- dlls/winspool.drv/tests/info.c | 110 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3f26693..b9d2201 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2871,6 +2871,115 @@ static void test_IsValidDevmodeW(void) ok(br == FALSE, "Got %d\n", br); } +static void test_OpenPrinter_defaults(void) +{ + HANDLE printer; + BOOL ret; + DWORD needed; + short default_size; + ADDJOB_INFO_1 *add_job; + JOB_INFO_2 *job_info; + DEVMODE my_dm; + PRINTER_DEFAULTS prn_def; + PRINTER_INFO_2 *pi; + + if (!default_printer) + { + skip("There is no default printer installed\n"); + return; + } + + /* Printer opened with NULL defaults. Retrieve default paper size + and confirm that jobs have this size. */ + + ret = OpenPrinter( default_printer, &printer, NULL ); + if (!ret) + { + skip("Unable to open the default printer (%s)\n", default_printer); + return; + } + + ret = GetPrinter( printer, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetPrinter( printer, 2, (BYTE *)pi, needed, &needed ); + ok( ret, "got %d\n", ret ); + default_size = pi->pDevMode->u1.s1.dmPaperSize; + HeapFree( GetProcessHeap(), 0, pi ); + + ret = AddJob( printer, 1, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + add_job = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = AddJob( printer, 1, (BYTE *)add_job, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ret = GetJob( printer, add_job->JobId, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + job_info = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetJob( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); + ok( ret, "got %d\n", ret ); + +todo_wine + ok( job_info->pDevMode != NULL, "got NULL devmode\n"); + if (job_info->pDevMode) + ok( job_info->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", + job_info->pDevMode->u1.s1.dmPaperSize, default_size ); + + HeapFree( GetProcessHeap(), 0, job_info ); + ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ + HeapFree( GetProcessHeap(), 0, add_job ); + ClosePrinter( printer ); + + /* Printer opened with something other than the default paper size. */ + + memset( &my_dm, 0, sizeof(my_dm) ); + my_dm.dmSize = sizeof(my_dm); + my_dm.dmFields = DM_PAPERSIZE; + my_dm.u1.s1.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; + + prn_def.pDatatype = NULL; + prn_def.pDevMode = &my_dm; + prn_def.DesiredAccess = PRINTER_ACCESS_USE; + + ret = OpenPrinter( default_printer, &printer, &prn_def ); + ok( ret, "got %d\n", ret ); + + /* GetPrinter stills returns default size */ + ret = GetPrinter( printer, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetPrinter( printer, 2, (BYTE *)pi, needed, &needed ); + ok( ret, "got %d\n", ret ); + ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", + pi->pDevMode->u1.s1.dmPaperSize, default_size ); + + HeapFree( GetProcessHeap(), 0, pi ); + + /* However the GetJob has the new size */ + ret = AddJob( printer, 1, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + add_job = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = AddJob( printer, 1, (BYTE *)add_job, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ret = GetJob( printer, add_job->JobId, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + job_info = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetJob( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08x\n", + job_info->pDevMode->dmFields ); + ok( job_info->pDevMode->u1.s1.dmPaperSize == my_dm.u1.s1.dmPaperSize, + "got %d new size %d\n", + job_info->pDevMode->u1.s1.dmPaperSize, my_dm.u1.s1.dmPaperSize ); + + HeapFree( GetProcessHeap(), 0, job_info ); + ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ + HeapFree( GetProcessHeap(), 0, add_job ); + ClosePrinter( printer ); +} + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); @@ -2919,6 +3028,7 @@ START_TEST(info) test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); test_IsValidDevmodeW(); + test_OpenPrinter_defaults(); /* Cleanup our temporary file */ DeleteFileA(tempfileA);

1 0

Huw Davies : winspool: Correct the padding calculation when there is no buffer.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: fa00fce68409b65318755179b5cfe0e1bcccafe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa00fce68409b65318755179b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:39 2012 +0100 winspool: Correct the padding calculation when there is no buffer. --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8e3fdf3..4845447 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7299,7 +7299,7 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf else { /* align DEVMODE to a DWORD boundary */ - shift= (4 - ( (DWORD_PTR) ptr & 3)) & 3; + shift = (4 - (*pcbNeeded & 3)) & 3; size += shift; if (size <= left) @@ -7308,7 +7308,7 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf memcpy(ptr, devmode, size-shift); ji2->pDevMode = (LPDEVMODEW)ptr; if (!unicode) HeapFree(GetProcessHeap(), 0, dmA); - ptr += size; + ptr += size-shift; left -= size; } else

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012