March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : wininet: Convert file size in cache entry to a large integer.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d790688afa9487007a255208865caf8aeb6dc52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790688afa9487007a2552088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 12:23:05 2011 +0100 wininet: Convert file size in cache entry to a large integer. --- dlls/wininet/urlcache.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 10b518b..f099fa5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -96,8 +96,7 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wExpiredDate; /* expire date in dos format */ WORD wExpiredTime; /* expire time in dos format */ DWORD dwUnknown1; /* usually zero */ - DWORD dwSizeLow; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow */ - DWORD dwSizeHigh; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeHigh */ + ULARGE_INTEGER size; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow/High */ DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ @@ -959,8 +958,8 @@ static DWORD URLCache_CopyEntry( lpCacheEntryInfo->u.dwExemptDelta = pUrlEntry->dwExemptDelta; lpCacheEntryInfo->dwHeaderInfoSize = pUrlEntry->dwHeaderInfoSize; lpCacheEntryInfo->dwHitRate = pUrlEntry->dwHitRate; - lpCacheEntryInfo->dwSizeHigh = pUrlEntry->dwSizeHigh; - lpCacheEntryInfo->dwSizeLow = pUrlEntry->dwSizeLow; + lpCacheEntryInfo->dwSizeHigh = pUrlEntry->size.u.HighPart; + lpCacheEntryInfo->dwSizeLow = pUrlEntry->size.u.LowPart; lpCacheEntryInfo->dwStructSize = sizeof(*lpCacheEntryInfo); lpCacheEntryInfo->dwUseCount = pUrlEntry->dwUseCount; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, &lpCacheEntryInfo->ExpireTime); @@ -2432,8 +2431,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwOffsetFileExtension = 0; - DWORD dwFileSizeLow = 0; - DWORD dwFileSizeHigh = 0; + LARGE_INTEGER file_size; BYTE cDirectory = 0; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; @@ -2452,7 +2450,8 @@ static BOOL CommitUrlCacheEntryInternal( if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); - + + file_size.QuadPart = 0; if (lpszLocalFileName) { HANDLE hFile; @@ -2465,8 +2464,7 @@ static BOOL CommitUrlCacheEntryInternal( } /* Get file size */ - dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh); - if ((dwFileSizeLow == INVALID_FILE_SIZE) && (GetLastError() != NO_ERROR)) + if (!GetFileSizeEx(hFile, &file_size)) { ERR("couldn't get file size (error is %d)\n", GetLastError()); CloseHandle(hFile); @@ -2595,9 +2593,7 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); - pUrlEntry->dwSizeHigh = 0; - pUrlEntry->dwSizeLow = dwFileSizeLow; - pUrlEntry->dwSizeHigh = dwFileSizeHigh; + pUrlEntry->size.QuadPart = file_size.QuadPart; pUrlEntry->dwUseCount = 0; GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); pUrlEntry->LastModifiedTime = LastModifiedTime;

1 0

Juan Lang : wininet: Account for disk space used by cache.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 7c15dc50a246d788c993736f10b60a567ce98afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c15dc50a246d788c993736f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:04:22 2011 -0800 wininet: Account for disk space used by cache. --- dlls/wininet/urlcache.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f099fa5..e888360 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2628,6 +2628,9 @@ static BOOL CommitUrlCacheEntryInternal( { if (pUrlEntry->CacheDir < pHeader->DirectoryCount) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + pHeader->CacheUsage.QuadPart += file_size.QuadPart; + if (pHeader->CacheUsage.QuadPart > pHeader->CacheLimit.QuadPart) + FIXME("file of size %s bytes fills cache\n", wine_dbgstr_longlong(file_size.QuadPart)); } cleanup:

1 0

André Hentschel : Wine 1.3.15 freigegeben
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: 0d3e7d5c5bd8dc6451b51a3391e703ae226916ab URL: http://source.winehq.org/git/website.git/?a=commit;h=0d3e7d5c5bd8dc6451b51a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 19:42:11 2011 +0100 Wine 1.3.15 freigegeben --- news/de/2011030401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2011030401.xml b/news/de/2011030401.xml new file mode 100644 index 0000000..b8eeee2 --- /dev/null +++ b/news/de/2011030401.xml @@ -0,0 +1,16 @@ +<news> +<date>4. März 2011</date> +<title>Wine 1.3.15 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Änderbarkeit von Netzwerk Kennwörtern.</li> + <li>Unterstützung für Reflektionen im Shader Compiler.</li> + <li>Tests versuchen nicht mehr dem Win9x Verhalten gerecht zu werden.</li> + <li>Einige MSHTML und MSXML Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : Fix 1.3. 15 release French translation
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: 2e0af31e2cfb064bf02d23f94116bfc8527cd094 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e0af31e2cfb064bf02d23… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 8 20:05:47 2011 +0100 Fix 1.3.15 release French translation --- news/fr/2011030401.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/fr/2011030401.xml b/news/fr/2011030401.xml index 2a2410a..3ce601f 100644 --- a/news/fr/2011030401.xml +++ b/news/fr/2011030401.xml @@ -7,7 +7,7 @@ <ul> <li>Possibilité de modifier les mots de passe réseau.</li> <li>Prise en charge de la réflexion dans le compilateur de shaders.</li> - <li>Les tests n'essaient plus s'accommoder du comportement Win9x.</li> + <li>Les tests n'essaient plus de s'accommoder du comportement Win9x.</li> <li>Plusieurs améliorations MSHTML et MSXML.</li> <li>Diverses corrections de bogues.</li> </ul>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.2 and 1.3.15
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: c7c941410a0760b1f717b9acd9d76cc383f70356 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7c941410a0760b1f717b9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 6 10:42:13 2011 +0100 Polish translation for release 1.3.2 and 1.3.15 --- news/pl/2010090301.xml | 15 +++++++++++++++ news/pl/2011030401.xml | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/news/pl/2010090301.xml b/news/pl/2010090301.xml new file mode 100644 index 0000000..8fe0ed4 --- /dev/null +++ b/news/pl/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>Wrzesień 3, 2010</date> +<title>Wydano Wine 1.3.2</title> +<body> + Wydanie rozwojowe Wine 1.3.2 jest już dostępne. + <a href="{$root}/announce/1.3.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacja silnika Gecko, teraz zawiera również wersję 64-bitową.</li> + <li>Nowa implementacja konsoli na terminalach Uniksowych.</li> + <li>Wiele nowych funkcji w bibliotekach uruchomieniowych dll napisanych w C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2011030401.xml b/news/pl/2011030401.xml new file mode 100644 index 0000000..eb9bc7a --- /dev/null +++ b/news/pl/2011030401.xml @@ -0,0 +1,16 @@ +<news> +<date>Marzec 4, 2011</date> +<title>Wydano Wine 1.3.15</title> +<body> + Wydanie rozwojowe Wine 1.3.15 jest już dostępne. + <a href="{$root}/announce/1.3.15">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla zmiany haseł sieciowych.</li> + <li>Wsparcie dla mechanizmu refleksji w kompilatorze cieniowania.</li> + <li>Testy już nie uwzględniają zachowania Win9x.</li> + <li>Kilka ulepszeń w MSHTML i MSXML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : user32: No longer export HOOK_CallHooks.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 383bda91cfb920171b3a0082bbb59551f00cf5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=383bda91cfb920171b3a0082b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:47 2011 +0100 user32: No longer export HOOK_CallHooks. --- dlls/user32/user32.spec | 5 ----- dlls/winex11.drv/x11drv.h | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index be54f77..c89b710 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -780,8 +780,3 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl HOOK_CallHooks(long long long long long) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6f0c8db..c973675 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -858,9 +858,6 @@ extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDE extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen); -/* FIXME: private functions imported from user32 */ -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); - #define XEMBED_MAPPED (1 << 0) #endif /* __WINE_X11DRV_H */

1 0

Alexandre Julliard : gdi32: Fix parameter type in the ModifyWorldTransform driver entry point.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: e6d9486453868f491d8226215c48291a2ccfa322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d9486453868f491d8226215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 15:21:52 2011 +0100 gdi32: Fix parameter type in the ModifyWorldTransform driver entry point. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/mapping.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 55d9b75..9a0f556 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -90,7 +90,7 @@ extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode ) DECLSPEC_HIDDEN; +extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/mapping.c b/dlls/gdi32/enhmfdrv/mapping.c index b72e0fc..5e3e971 100644 --- a/dlls/gdi32/enhmfdrv/mapping.c +++ b/dlls/gdi32/enhmfdrv/mapping.c @@ -119,7 +119,7 @@ BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode) +BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) { EMRMODIFYWORLDTRANSFORM emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f6c971d..504b120 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -128,7 +128,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,INT); + BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); INT (CDECL *pOffsetClipRgn)(PHYSDEV,INT,INT); INT (CDECL *pOffsetViewportOrg)(PHYSDEV,INT,INT);

1 0

Alexandre Julliard : gdi32: GetDIBColorTable doesn' t need to be part of the DC driver interface.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: fcfbb46d2eedcb7b7059262fa1f7bf80ac02e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcfbb46d2eedcb7b7059262fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 16:47:22 2011 +0100 gdi32: GetDIBColorTable doesn't need to be part of the DC driver interface. --- dlls/gdi32/dib.c | 23 +++++++++-------------- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0abd833..0fc2197 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -453,29 +453,24 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) { DC * dc; + BITMAPOBJ *bitmap; UINT result = 0; if (!(dc = get_dc_ptr( hdc ))) return 0; - if (dc->funcs->pGetDIBColorTable) - result = dc->funcs->pGetDIBColorTable(dc->physDev, startpos, entries, colors); - else + if ((bitmap = GDI_GetObjPtr( dc->hBitmap, OBJ_BITMAP ))) { - BITMAPOBJ *bitmap = GDI_GetObjPtr( dc->hBitmap, OBJ_BITMAP ); - if (bitmap) + /* Check if currently selected bitmap is a DIB */ + if (bitmap->color_table) { - /* Check if currently selected bitmap is a DIB */ - if (bitmap->color_table) + if (startpos < bitmap->nb_colors) { - if (startpos < bitmap->nb_colors) - { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); - result = entries; - } + if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; + memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); + result = entries; } - GDI_ReleaseObj( dc->hBitmap ); } + GDI_ReleaseObj( dc->hBitmap ); } release_dc_ptr( dc ); return result; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 38c4942..7966c64 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -110,7 +110,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(GdiComment); GET_FUNC(GetBitmapBits); GET_FUNC(GetCharWidth); - GET_FUNC(GetDIBColorTable); GET_FUNC(GetDIBits); GET_FUNC(GetDeviceCaps); GET_FUNC(GetDeviceGammaRamp); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8f0b932..db04f50 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -72,7 +72,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 504b120..015660f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -114,7 +114,6 @@ typedef struct tagDC_FUNCS BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,CONST BYTE*); LONG (CDECL *pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - UINT (CDECL *pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*); INT (CDECL *pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 553c363..436d8ec 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -70,7 +70,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */

1 0

Andy Norris : winealsa: Add support for alsa cards without a PCM mixer ( only Line).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 254b8f85b5f05e6fa6e688f453520f800086c2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=254b8f85b5f05e6fa6e688f45… Author: Andy Norris <bk-git(a)usrlocalsbin.com> Date: Sat Mar 5 16:03:55 2011 -0500 winealsa: Add support for alsa cards without a PCM mixer (only Line). --- dlls/winealsa.drv/alsa.c | 153 ++++++++++++++++++++++++--------------------- dlls/winealsa.drv/mixer.c | 10 +++- 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b242cfa..0b244fa 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -421,6 +421,8 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, snd_ctl_elem_info_t * eleminfop = NULL; snd_ctl_elem_value_t * elemvaluep = NULL; snd_ctl_elem_id_t * elemidp = NULL; + const char *names[] = {"PCM Playback Volume", "Line Playback Volume", NULL}; + const char **name; #define EXIT_ON_ERROR(f,txt,exitcode) do \ @@ -447,81 +449,88 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, /* Setup and find an element id that exactly matches the characteristic we want ** FIXME: It is probably short sighted to hard code and fixate on PCM Playback Volume */ - snd_ctl_elem_id_set_name(elemidp, "PCM Playback Volume"); - snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); - elem = snd_hctl_find_elem(hctl, elemidp); - if (elem) - { - /* Read and return volume information */ - EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); - value_count = snd_ctl_elem_info_get_count(eleminfop); - if (out_min || out_max || out_step) - { - if (!snd_ctl_elem_info_is_readable(eleminfop)) - { - ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); - rc = MMSYSERR_NOTSUPPORTED; - goto out; - } - - if (out_min) - *out_min = snd_ctl_elem_info_get_min(eleminfop); - - if (out_max) - *out_max = snd_ctl_elem_info_get_max(eleminfop); - - if (out_step) - *out_step = snd_ctl_elem_info_get_step(eleminfop); - } - - if (out_left || out_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - - if (out_left) - *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); - - if (out_right) - { - if (value_count == 1) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); - else if (value_count == 2) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); - rc = -1; - goto out; - } - } - } - /* Set the volume */ - if (new_left || new_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - if (new_left) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); - if (new_right) - { - if (value_count == 1) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); - else if (value_count == 2) - snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); - rc = -1; - goto out; - } - } - - EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); - } + for( name = names; *name; name++ ) + { + snd_ctl_elem_id_set_name(elemidp, *name); + snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); + elem = snd_hctl_find_elem(hctl, elemidp); + if (elem) + { + /* Read and return volume information */ + EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); + value_count = snd_ctl_elem_info_get_count(eleminfop); + if (out_min || out_max || out_step) + { + if (!snd_ctl_elem_info_is_readable(eleminfop)) + { + ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); + rc = MMSYSERR_NOTSUPPORTED; + goto out; + } + + if (out_min) + *out_min = snd_ctl_elem_info_get_min(eleminfop); + + if (out_max) + *out_max = snd_ctl_elem_info_get_max(eleminfop); + + if (out_step) + *out_step = snd_ctl_elem_info_get_step(eleminfop); + } + + if (out_left || out_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + + if (out_left) + *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); + + if (out_right) + { + if (value_count == 1) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); + else if (value_count == 2) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); + rc = -1; + goto out; + } + } + } + + /* Set the volume */ + if (new_left || new_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + if (new_left) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); + if (new_right) + { + if (value_count == 1) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); + else if (value_count == 2) + snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); + rc = -1; + goto out; + } + } + + EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); + } + + break; + } } - else + + if( !*name ) { - ERR("Could not find 'PCM Playback Volume' element\n"); + ERR("Could not find '{PCM,Line} Playback Volume' element\n"); rc = MMSYSERR_NOTSUPPORTED; } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 90760eb..7d5b452 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -435,7 +435,7 @@ static void ALSA_MixerInit(void) char cardind[6], cardname[10]; snd_ctl_t *ctl; - snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *micelem = NULL; + snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *lineelem = NULL, *micelem = NULL; memset(info, 0, snd_ctl_card_info_sizeof()); memset(&mixdev[mixnum], 0, sizeof(*mixdev)); @@ -520,6 +520,8 @@ static void ALSA_MixerInit(void) headelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "PCM") && !pcmelem) pcmelem = elem; + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Line") && !lineelem) + lineelem = elem; ++(mixdev[mixnum].chans); } } @@ -548,6 +550,12 @@ static void ALSA_MixerInit(void) mastelem = pcmelem; capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); } + else if (lineelem && !mastelem) + { + /* Use 'Line' as master device */ + mastelem = lineelem; + capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); + } else if (!mastelem && !captelem && !micelem) { /* If there is nothing sensible that can act as 'Master' control, something is wrong */

1 0

Maarten Lankhorst : ntdll: Fix time units for SystemPerformanceProcessorInformation, and steal idle time for kernel time.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 67755d2593c372539005fab2aaf01fa1c61fffbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=67755d2593c372539005fab2a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Mar 6 18:17:06 2011 +0100 ntdll: Fix time units for SystemPerformanceProcessorInformation, and steal idle time for kernel time. --- dlls/ntdll/nt.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8b4f09c..fb89a42 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1310,6 +1310,25 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } +static void fill_in_sppi(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi, DWORD64 idle, DWORD64 sys, DWORD64 usr) +{ + DWORD64 steal; + sppi->IdleTime.QuadPart = idle * 10000000 / sysconf(_SC_CLK_TCK); + sppi->KernelTime.QuadPart = sys * 10000000 / sysconf(_SC_CLK_TCK); + sppi->UserTime.QuadPart = usr * 10000000 / sysconf(_SC_CLK_TCK); + + /* Add 1% from idle time to kernel time, to make .NET happy */ + steal = sppi->IdleTime.QuadPart / 100; + sppi->IdleTime.QuadPart -= steal; + sppi->KernelTime.QuadPart += steal; + + /* DPC time */ + sppi->Reserved1[0].QuadPart = 0; + /* Interrupt time */ + sppi->Reserved1[1].QuadPart = 0; + sppi->Reserved2 = 0; +} + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1610,11 +1629,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( usr += nice; sppi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - sppi->IdleTime.QuadPart = idle; - sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr+nice; - sppi->Reserved1[0].QuadPart = 0; - sppi->Reserved1[1].QuadPart = 0; + fill_in_sppi(sppi, idle, sys, usr); cpus = 1; len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); } @@ -1638,20 +1653,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( usr += nice; out_cpus --; if (name[3]=='0') /* first cpu */ - { - sppi->IdleTime.QuadPart = idle; - sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr; - } + fill_in_sppi(sppi, idle, sys, usr); else /* new cpu */ { len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); - sppi[cpus].IdleTime.QuadPart = idle; - sppi[cpus].KernelTime.QuadPart = sys; - sppi[cpus].UserTime.QuadPart = usr; - sppi[cpus].Reserved1[0].QuadPart = 0; - sppi[cpus].Reserved1[1].QuadPart = 0; + fill_in_sppi(sppi + cpus, idle, sys, usr); cpus++; } }

1 0