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

Huw Davies : wineps: Move some structs to the process heap.
by Alexandre Julliard April 3, 2012

April 3, 2012

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

Piotr Caban : wininet: Store element type and state in hash table key ( urlcache).
by Alexandre Julliard April 3, 2012

April 3, 2012

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 document title as a unicode string.
by Alexandre Julliard April 3, 2012

April 3, 2012

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: Free the output string from the correct heap.
by Alexandre Julliard April 3, 2012

April 3, 2012

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

Huw Davies : wineps: Store the unicode version of the printer name and call the unicode version of OpenPrinter .
by Alexandre Julliard April 3, 2012

April 3, 2012

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

Piotr Caban : wininet: Mark empty fields in the same way while hash table is created and element is removed .
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: edcc395dac99cf9d66f9c334284c471b7d010f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcc395dac99cf9d66f9c3342… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 3 16:45:29 2012 +0200 wininet: Mark empty fields in the same way while hash table is created and element is removed. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9e1f779..3a404c8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1401,7 +1401,7 @@ static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ (*ppHash)->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; for (i = 0; i < HASHTABLE_SIZE; i++) { - (*ppHash)->HashTable[i].dwOffsetEntry = 0; + (*ppHash)->HashTable[i].dwOffsetEntry = HASHTABLE_FREE; (*ppHash)->HashTable[i].dwHashKey = HASHTABLE_FREE; } return ERROR_SUCCESS;

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement::get_content implementation.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 5bbcdf7b9e59beacc00d8f2c4804e31c6558d664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bbcdf7b9e59beacc00d8f2c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:03:50 2012 +0200 mshtml: Added IHTMLMetaElement::get_content implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index ef222a9..d75b7f4 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -118,8 +118,19 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString content_str, val_str; + nsresult nsres; + + static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&content_str, contentW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &content_str, &val_str); + nsAString_Finish(&content_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 09b6586..c3927d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3259,6 +3259,22 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) IHTMLMetaElement_Release(meta); } +#define test_meta_content(a,b) _test_meta_content(__LINE__,a,b) +static void _test_meta_content(unsigned line, IUnknown *unk, const char *excontent) +{ + IHTMLMetaElement *meta; + BSTR content = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_content(meta, &content); + ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(content, excontent), "content = %s, expected %s\n", wine_dbgstr_w(content), excontent); + SysFreeString(content); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5289,6 +5305,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_doc_elem_by_id(doc, "metaid"); if(elem) { test_meta_name((IUnknown*)elem, "meta name"); + test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); IHTMLElement_Release(elem); }

1 0

Huw Davies : winspool: Correct the padding calculation when there is no buffer.
by Alexandre Julliard April 3, 2012

April 3, 2012

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

Huw Davies : winspool: Remove a FIXME now that we don't ignore the defaults .
by Alexandre Julliard April 3, 2012

April 3, 2012

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

Christian Costa : dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: f13806e185cc9e6b721d0335f6d6de8999e9f6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13806e185cc9e6b721d0335f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:52:45 2012 +0200 dmusic: Enumerate ports for midi out and midi in devices in EnumPort. --- dlls/dmusic/Makefile.in | 2 +- dlls/dmusic/dmusic.c | 120 +++++++++++++++++++++++++++++++--------------- 2 files changed, 82 insertions(+), 40 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index d863143..7522194 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,5 +1,5 @@ MODULE = dmusic.dll -IMPORTS = dxguid uuid ole32 advapi32 +IMPORTS = dxguid uuid ole32 advapi32 winmm C_SRCS = \ buffer.c \ diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index a36682c..b0dd7c9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -16,6 +16,9 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <stdio.h> + #include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -66,45 +69,84 @@ static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { } /* IDirectMusic8Impl IDirectMusic part: */ -static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - TRACE("(%p, %d, %p)\n", This, dwIndex, pPortCaps); - if (NULL == pPortCaps) { return E_POINTER; } - /* i guess the first port shown is always software synthesizer */ - if (dwIndex == 0) - { - IDirectMusicSynth8* synth; - TRACE("enumerating 'Microsoft Software Synthesizer' port\n"); - CoCreateInstance (&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); - IDirectMusicSynth8_GetPortCaps (synth, pPortCaps); - IDirectMusicSynth8_Release (synth); - return S_OK; - } - -/* it seems that the rest of devices are obtained thru dmusic32.EnumLegacyDevices...*sigh*...which is undocumented*/ -#if 0 - int numMIDI = midiOutGetNumDevs(); - int numWAVE = waveOutGetNumDevs(); - int i; - /* then return digital sound ports */ - for (i = 1; i <= numWAVE; i++) - { - TRACE("enumerating 'digital sound' ports\n"); - if (i == dwIndex) - { - DirectSoundEnumerateA(register_waveport, pPortCaps); - return S_OK; - } - } - /* finally, list all *real* MIDI ports*/ - for (i = numWAVE + 1; i <= numWAVE + numMIDI; i++) - { - TRACE("enumerating 'real MIDI' ports\n"); - if (i == dwIndex) - FIXME("Found MIDI port, but *real* MIDI ports not supported yet\n"); - } -#endif - return S_FALSE; +static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_PORTCAPS port_caps) +{ + IDirectMusic8Impl *This = (IDirectMusic8Impl*)iface; + ULONG nb_midi_out; + ULONG nb_midi_in; + const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; + + TRACE("(%p, %d, %p)\n", This, index, port_caps); + + if (!port_caps) + return E_POINTER; + + /* NOTE: It seems some native versions get the rest of devices through dmusic32.EnumLegacyDevices...*sigh*...which is undocumented */ + + /* NOTE: Should we enum wave devices ? Native does not seem to */ + + /* Fill common port caps for winmm ports */ + port_caps->dwType = DMUS_PORT_WINMM_DRIVER; + port_caps->dwMemorySize = 0; + port_caps->dwMaxChannelGroups = 1; + port_caps->dwMaxVoices = 0; + port_caps->dwMaxAudioChannels = 0; + port_caps->dwEffectFlags = DMUS_EFFECT_NONE; + /* Fake port GUID */ + port_caps->guidPort = IID_IUnknown; + port_caps->guidPort.Data1 = index + 1; + + nb_midi_out = midiOutGetNumDevs(); + + if (index == 0) + { + MIDIOUTCAPSW caps; + midiOutGetDevCapsW(MIDI_MAPPER, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_SHAREABLE; + port_caps->dwClass = DMUS_PC_OUTPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + if (index < (nb_midi_out + 1)) + { + MIDIOUTCAPSW caps; + midiOutGetDevCapsW(index - 1, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; + port_caps->dwClass = DMUS_PC_OUTPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + nb_midi_in = midiInGetNumDevs(); + + if (index < (nb_midi_in + nb_midi_out + 1)) + { + MIDIINCAPSW caps; + midiInGetDevCapsW(index - nb_midi_out - 1, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_EXTERNAL; + port_caps->dwClass = DMUS_PC_INPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + if (index == (nb_midi_in + nb_midi_out + 1)) + { + IDirectMusicSynth8* synth; + TRACE("Enumerating port: 'Microsoft Software Synthesizer'\n"); + CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); + IDirectMusicSynth8_GetPortCaps(synth, port_caps); + IDirectMusicSynth8_Release(synth); + return S_OK; + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) {

1 0