wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Charles Davis : ntdll: Also set CPU_FEATURE_HTT on Mac OS.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: fe6140e0fd6418e13ce515a1c788d7856d2528c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6140e0fd6418e13ce515a1c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 10 15:34:55 2011 -0600 ntdll: Also set CPU_FEATURE_HTT on Mac OS. --- dlls/ntdll/nt.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 000c62a..6a919aa 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1280,6 +1280,7 @@ void fill_cpu_info(void) if (strstr(buffer, "SSE2")) user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "SSE3")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "PAE")) user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = TRUE; + if (strstr(buffer, "HTT")) cached_sci.FeatureSet |= CPU_FEATURE_HTT; } break; /* CPU_TYPE_I386 */ default: break;

1 0

Andrew Eikum : wineoss.drv: Trim the sub-device part of the device path.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 8d133f54c25833a259d8d6ee9e185177d7f38f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d133f54c25833a259d8d6ee9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 10 15:57:06 2011 -0500 wineoss.drv: Trim the sub-device part of the device path. --- dlls/wineoss.drv/mmdevdrv.c | 58 +++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 5de0a15..6f8e2d2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -119,6 +119,7 @@ struct ACImpl { int fd; oss_audioinfo ai; + char devnode[OSS_DEVNODE_SIZE]; BOOL initted, playing; UINT64 written_frames; @@ -281,10 +282,34 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Preferred; } +static const char *oss_clean_devnode(const char *devnode) +{ + static char ret[OSS_DEVNODE_SIZE]; + + const char *dot, *slash; + size_t len; + + dot = strrchr(devnode, '.'); + if(!dot) + return devnode; + + slash = strrchr(devnode, '/'); + if(slash && dot < slash) + return devnode; + + len = dot - devnode; + + memcpy(ret, devnode, len); + ret[len] = '\0'; + + return ret; +} + static UINT get_default_index(EDataFlow flow, char **keys, UINT num) { int fd = -1, err, i; oss_audioinfo ai; + const char *devnode; if(flow == eRender) fd = open("/dev/dsp", O_WRONLY); @@ -306,8 +331,9 @@ static UINT get_default_index(EDataFlow flow, char **keys, UINT num) close(fd); TRACE("Default devnode: %s\n", ai.devnode); + devnode = oss_clean_devnode(ai.devnode); for(i = 0; i < num; ++i) - if(!strcmp(ai.devnode, keys[i])) + if(!strcmp(devnode, keys[i])) return i; WARN("Couldn't find default device! Choosing first.\n"); @@ -317,7 +343,7 @@ static UINT get_default_index(EDataFlow flow, char **keys, UINT num) HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, UINT *num, UINT *def_index) { - int i, mixer_fd; + int i, j, mixer_fd; oss_sysinfo sysinfo; static int print_once = 0; @@ -365,6 +391,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, *num = 0; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; + const char *devnode; int fd; ai.dev = i; @@ -374,13 +401,22 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, continue; } + devnode = oss_clean_devnode(ai.devnode); + + /* check for duplicates */ + for(j = 0; j < *num; ++j) + if(!strcmp(devnode, (*keys)[j])) + break; + if(j != *num) + continue; + if(flow == eRender) - fd = open(ai.devnode, O_WRONLY, 0); + fd = open(devnode, O_WRONLY, 0); else - fd = open(ai.devnode, O_RDONLY, 0); + fd = open(devnode, O_RDONLY, 0); if(fd < 0){ WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", - ai.devnode, errno, strerror(errno)); + devnode, errno, strerror(errno)); continue; } close(fd); @@ -390,7 +426,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, size_t len; (*keys)[*num] = HeapAlloc(GetProcessHeap(), 0, - strlen(ai.devnode) + 1); + strlen(devnode) + 1); if(!(*keys)[*num]){ for(i = 0; i < *num; ++i){ HeapFree(GetProcessHeap(), 0, (*ids)[i]); @@ -401,7 +437,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, close(mixer_fd); return E_OUTOFMEMORY; } - strcpy((*keys)[*num], ai.devnode); + strcpy((*keys)[*num], devnode); len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, @@ -468,6 +504,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, return E_FAIL; } + strcpy(This->devnode, devnode); + TRACE("OSS audioinfo:\n"); TRACE("devnode: %s\n", This->ai.devnode); TRACE("name: %s\n", This->ai.name); @@ -1100,12 +1138,12 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); if(This->dataflow == eRender) - fd = open(This->ai.devnode, O_WRONLY, 0); + fd = open(This->devnode, O_WRONLY, 0); else if(This->dataflow == eCapture) - fd = open(This->ai.devnode, O_RDONLY, 0); + fd = open(This->devnode, O_RDONLY, 0); if(fd < 0){ - ERR("Unable to open device %s: %d (%s)\n", This->ai.devnode, errno, + ERR("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); return AUDCLNT_E_DEVICE_INVALIDATED; }

1 0

Andrew Eikum : winealsa.drv: Don't try to control ALSA's behavior.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: b0652dd8bdb144645be4a6bf77cbb68a8ade49d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0652dd8bdb144645be4a6bf7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 10 15:56:55 2011 -0500 winealsa.drv: Don't try to control ALSA's behavior. Now, winealsa maintains its own buffer, which is written to ALSA on the period cycle requested by the application. We also let ALSA start when it has enough data and stop when it runs out, recovering from the expected underruns. This seems to be more like how ALSA expects to be used. --- dlls/winealsa.drv/mmdevdrv.c | 312 +++++++++++++++--------------------------- 1 files changed, 109 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0652dd8bdb144645be4a…

1 0

Aric Stewart : usp10: Implement SSA_FALLBACK.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 14eaa18daeb0b304136226d023da2a0c5106a520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eaa18daeb0b304136226d02… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 10 14:59:36 2011 -0500 usp10: Implement SSA_FALLBACK. --- dlls/usp10/Makefile.in | 2 +- dlls/usp10/usp10.c | 231 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 179 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14eaa18daeb0b30413622…

1 0

Aric Stewart : usp10: Improve handling of tabs and SSA_TAB.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 314553f194da4e9392d8dbd3d92e51dbb28f0842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314553f194da4e9392d8dbd3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 10 14:59:30 2011 -0500 usp10: Improve handling of tabs and SSA_TAB. --- dlls/usp10/usp10.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5a8a468..b48d8c9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -897,6 +897,72 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem return res; } +static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int charPos, int current_x) +{ + int defWidth; + int cTabStops=0; + INT *lpTabPos = NULL; + INT nTabOrg = 0; + INT x = 0; + + if (pTabdef) + lpTabPos = pTabdef->pTabStops; + + if (pTabdef && pTabdef->iTabOrigin) + { + if (pTabdef->iScale) + nTabOrg = (pTabdef->iTabOrigin * pTabdef->iScale)/4; + else + nTabOrg = pTabdef->iTabOrigin * psc->tm.tmAveCharWidth; + } + + if (pTabdef) + cTabStops = pTabdef->cTabStops; + + if (cTabStops == 1) + { + if (pTabdef->iScale) + defWidth = ((pTabdef->pTabStops[0])*pTabdef->iScale) / 4; + else + defWidth = (pTabdef->pTabStops[0])*psc->tm.tmAveCharWidth; + cTabStops = 0; + } + else + defWidth = 8 * psc->tm.tmAveCharWidth; + + for (; cTabStops>0 ; lpTabPos++, cTabStops--) + { + int position = *lpTabPos; + if (position < 0) + position = -1 * position; + if (pTabdef->iScale) + position = (position * pTabdef->iScale) / 4; + else + position = position * psc->tm.tmAveCharWidth; + + if( nTabOrg + position > current_x) + { + if( *lpTabPos >= 0) + { + /* a left aligned tab */ + x = (nTabOrg + *lpTabPos) - current_x; + break; + } + else + { + FIXME("Negative tabstop\n"); + break; + } + } + } + if ((!cTabStops) && (defWidth > 0)) + x =((((current_x - nTabOrg) / defWidth)+1) * defWidth) - current_x; + else if ((!cTabStops) && (defWidth < 0)) + FIXME("TODO: Negative defWidth\n"); + + return x; +} + /*********************************************************************** * ScriptStringAnalyse (USP10.@) * @@ -989,6 +1055,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_GLYPHS) { + int tab_x = 0; if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) goto error; @@ -1013,6 +1080,17 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, piAdvance, pGoffset, abc); + if (dwFlags & SSA_TAB) + { + int tabi = 0; + for (tabi = 0; tabi < cChar; tabi++) + { + if (pStr[analysis->pItem[i].iCharPos+tabi] == 0x0009) + piAdvance[tabi] = getGivenTabWidth(analysis->sc, pTabdef, analysis->pItem[i].iCharPos+tabi, tab_x); + tab_x+=piAdvance[tabi]; + } + } + analysis->glyphs[i].numGlyphs = numGlyphsReturned; analysis->glyphs[i].glyphs = glyphs; analysis->glyphs[i].pwLogClust = pwLogClust; @@ -1798,6 +1876,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, chInput = mirror_char(pwcChars[idx]); else chInput = pwcChars[idx]; + /* special case for tabs */ + if (chInput == 0x0009) + chInput = 0x0020; if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) { WORD glyph;

1 0

Aric Stewart : user32: Use uniscribe ScriptBreak to handle edit control linebreaking.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: de8a059d526096fc972c5f4cd2d66917fec75e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8a059d526096fc972c5f4cd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 10 14:54:41 2011 -0500 user32: Use uniscribe ScriptBreak to handle edit control linebreaking. --- dlls/user32/Makefile.in | 2 +- dlls/user32/edit.c | 115 +++++++++++++++++++++++------------------------ 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index d2cdc92..3607956 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 -DELAYIMPORTS = imm32 +DELAYIMPORTS = imm32 usp10 C_SRCS = \ button.c \ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 87f8682..e02a268 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -53,6 +53,7 @@ #include "winnt.h" #include "win.h" #include "imm.h" +#include "usp10.h" #include "wine/unicode.h" #include "controls.h" #include "user_private.h" @@ -153,6 +154,10 @@ typedef struct */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ + /* + * Uniscribe Data + */ + SCRIPT_LOGATTR *logAttr; } EDITSTATE; @@ -247,6 +252,14 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) } +static inline UINT get_text_length(EDITSTATE *es) +{ + if(es->text_length == (UINT)-1) + es->text_length = strlenW(es->text); + return es->text_length; +} + + /********************************************************************* * * EDIT_WordBreakProc @@ -256,61 +269,51 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) * allows to be called without linebreaks between s[0] up to * s[count - 1]. Remember it is only called * internally, so we can decide this for ourselves. + * Additional we will always be breaking the full string. * */ -static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action) +static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT action) { - INT ret = 0; + INT ret = 0; - TRACE("s=%p, index=%d, count=%d, action=%d\n", s, index, count, action); + TRACE("s=%p, index=%d, count=%d, action=%d\n", s, index, count, action); - if(!s) return 0; + if(!s) return 0; - switch (action) { - case WB_LEFT: - if (!count) - break; - if (index) - index--; - if (s[index] == ' ') { - while (index && (s[index] == ' ')) - index--; - if (index) { - while (index && (s[index] != ' ')) - index--; - if (s[index] == ' ') - index++; - } - } else { - while (index && (s[index] != ' ')) - index--; - if (s[index] == ' ') - index++; - } - ret = index; - break; - case WB_RIGHT: - if (!count) - break; - if (index) - index--; - if (s[index] == ' ') - while ((index < count) && (s[index] == ' ')) index++; - else { - while (s[index] && (s[index] != ' ') && (index < count)) - index++; - while ((s[index] == ' ') && (index < count)) index++; - } - ret = index; - break; - case WB_ISDELIMITER: - ret = (s[index] == ' '); - break; - default: - ERR("unknown action code, please report !\n"); - break; - } - return ret; + if (!es->logAttr) + { + SCRIPT_ANALYSIS psa; + + memset(&psa,0,sizeof(SCRIPT_ANALYSIS)); + psa.eScript = SCRIPT_UNDEFINED; + + es->logAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * get_text_length(es)); + ScriptBreak(es->text, get_text_length(es), &psa, es->logAttr); + } + + switch (action) { + case WB_LEFT: + if (index) + index--; + while (index && !es->logAttr[index].fSoftBreak) + index--; + ret = index; + break; + case WB_RIGHT: + if (!count) + break; + while (s[index] && index < count && !es->logAttr[index].fSoftBreak) + index++; + ret = index; + break; + case WB_ISDELIMITER: + ret = es->logAttr[index].fWhiteSpace; + break; + default: + ERR("unknown action code, please report !\n"); + break; + } + return ret; } @@ -357,7 +360,7 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count } } else - ret = EDIT_WordBreakProc(es->text + start, index, count, action); + ret = EDIT_WordBreakProc(es, es->text, index+start, count+start, action) - start; return ret; } @@ -642,14 +645,6 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta ReleaseDC(es->hwndSelf, dc); } - -static inline UINT get_text_length(EDITSTATE *es) -{ - if(es->text_length == (UINT)-1) - es->text_length = strlenW(es->text); - return es->text_length; -} - /********************************************************************* * * EDIT_GetPasswordPointer_SL @@ -1086,6 +1081,9 @@ static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT static inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; + + HeapFree( GetProcessHeap(), 0, es->logAttr ); + es->logAttr = NULL; } /********************************************************************* @@ -4318,6 +4316,7 @@ cleanup: HeapFree(GetProcessHeap(), 0, es->first_line_def); HeapFree(GetProcessHeap(), 0, es->undo_text); if (es->hloc32W) LocalFree(es->hloc32W); + HeapFree(GetProcessHeap(), 0, es->logAttr); HeapFree(GetProcessHeap(), 0, es); return FALSE; }

1 0

André Hentschel : wineps.drv: Print the commands in decimal.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: ef5f3c1676d0622a325978e864d99549087e73de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5f3c1676d0622a325978e86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 10 20:11:49 2011 +0200 wineps.drv: Print the commands in decimal. --- dlls/wineps.drv/escape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index d869164..eff7500 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -360,7 +360,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, } } default: - FIXME("Unimplemented code 0x%x\n", nEscape); + FIXME("Unimplemented code %d\n", nEscape); return 0; } }

1 0

André Hentschel : include: Add more postscript commands.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 4899eeb15baf0d20a4124a27ccd71175875710ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4899eeb15baf0d20a4124a27c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 10 20:11:41 2011 +0200 include: Add more postscript commands. --- include/wingdi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index fcecb2c..dc3f8f7 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -353,6 +353,11 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE) #define ENCAPSULATED_POSTSCRIPT 4116 #define POSTSCRIPT_IDENTIFY 4117 #define POSTSCRIPT_INJECTION 4118 +#define CHECKJPEGFORMAT 4119 +#define CHECKPNGFORMAT 4120 +#define GET_PS_FEATURESETTING 4121 +#define GDIPLUS_TS_QUERYVER 4122 +#define GDIPLUS_TS_RECORD 4123 /* for POSTSCRIPT_IDENTIFY */ #define PSIDENT_GDICENTRIC 0

1 0

Alexandre Julliard : gdi32/tests: Add tests for GdiAlphaBlend with source alpha.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 2adcb2b94abf519bf6c4272c3bf84e5c4cc2c08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2adcb2b94abf519bf6c4272c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 12:03:18 2011 +0200 gdi32/tests: Add tests for GdiAlphaBlend with source alpha. --- dlls/gdi32/bitblt.c | 4 +- dlls/gdi32/tests/bitmap.c | 136 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 111 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d58cd64..c595a60 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -292,7 +292,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &bits, src ); release_dc_ptr( dc_src ); - if (err) return FALSE; + if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); @@ -326,6 +326,8 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (bits.free) bits.free( &bits ); +done: + if (err) SetLastError( err ); return !err; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c5e8f59..55c1d07 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -35,8 +35,6 @@ static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); -#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } - static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1; @@ -3232,19 +3230,16 @@ static void test_StretchDIBits(void) static void test_GdiAlphaBlend(void) { - /* test out-of-bound parameters for GdiAlphaBlend */ HDC hdcNull; - HDC hdcDst; HBITMAP bmpDst; HBITMAP oldDst; - - BITMAPINFO bmi; + BITMAPINFO *bmi; HDC hdcSrc; HBITMAP bmpSrc; HBITMAP oldSrc; LPVOID bits; - + BOOL ret; BLENDFUNCTION blend; if (!pGdiAlphaBlend) @@ -3258,14 +3253,14 @@ static void test_GdiAlphaBlend(void) bmpDst = CreateCompatibleBitmap(hdcNull, 100, 100); hdcSrc = CreateCompatibleDC(hdcNull); - memset(&bmi, 0, sizeof(bmi)); /* as of Wine 0.9.44 we require the src to be a DIB section */ - bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = 20; - bmi.bmiHeader.biWidth = 20; - bmi.bmiHeader.biBitCount = 32; - bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biCompression = BI_RGB; - bmpSrc = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, &bits, NULL, 0); + bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[3] )); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 20; + bmi->bmiHeader.biWidth = 20; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); oldDst = SelectObject(hdcDst, bmpDst); @@ -3276,26 +3271,111 @@ static void test_GdiAlphaBlend(void) blend.SourceConstantAlpha = 128; blend.AlphaFormat = 0; - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend), TRUE, BOOL, "%d"); SetLastError(0xdeadbeef); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), FALSE, BOOL, "%d"); - expect_eq(GetLastError(), ERROR_INVALID_PARAMETER, int, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), FALSE, BOOL, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 15, 0, 10, 10, blend), FALSE, BOOL, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%d"); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 15, 0, 10, 10, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); SetWindowOrgEx(hdcSrc, -10, -10, NULL); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), TRUE, BOOL, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), TRUE, BOOL, "%d"); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); SetMapMode(hdcSrc, MM_ANISOTROPIC); ScaleWindowExtEx(hdcSrc, 10, 1, 10, 1, NULL); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 30, 30, blend), TRUE, BOOL, "%d"); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend), TRUE, BOOL, "%d"); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 30, 30, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, NULL, 0, 0, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + /* AC_SRC_ALPHA requires 32-bpp BI_RGB format */ + + blend.AlphaFormat = AC_SRC_ALPHA; + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + + bmi->bmiHeader.biCompression = BI_BITFIELDS; + ((DWORD *)bmi->bmiColors)[0] = 0xff0000; + ((DWORD *)bmi->bmiColors)[1] = 0x00ff00; + ((DWORD *)bmi->bmiColors)[2] = 0x0000ff; + bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = SelectObject(hdcSrc, bmpSrc); + DeleteObject( oldSrc ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + + bmi->bmiHeader.biCompression = BI_BITFIELDS; + ((DWORD *)bmi->bmiColors)[0] = 0x0000ff; + ((DWORD *)bmi->bmiColors)[1] = 0x00ff00; + ((DWORD *)bmi->bmiColors)[2] = 0xff0000; + bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = SelectObject(hdcSrc, bmpSrc); + DeleteObject( oldSrc ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + bmi->bmiHeader.biBitCount = 24; + bmi->bmiHeader.biCompression = BI_RGB; + bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = SelectObject(hdcSrc, bmpSrc); + DeleteObject( oldSrc ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + bmi->bmiHeader.biBitCount = 1; + bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = SelectObject(hdcSrc, bmpSrc); + DeleteObject( oldSrc ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + bmpSrc = CreateBitmap( 100, 100, 1, 1, NULL ); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = SelectObject(hdcSrc, bmpSrc); + DeleteObject( oldSrc ); SetLastError(0xdeadbeef); - expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, NULL, 0, 0, 20, 20, blend), FALSE, BOOL, "%d"); - expect_eq(GetLastError(), 0xdeadbeef, int, "%d"); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SelectObject(hdcDst, oldDst); SelectObject(hdcSrc, oldSrc);

1 0

Alexandre Julliard : winex11: Require an A8R8G8B8 format for blending with a source alpha.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: d36b7a7f245e8bbc390605a3a0364ca7f04e6027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36b7a7f245e8bbc390605a3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 11:53:02 2011 +0200 winex11: Require an A8R8G8B8 format for blending with a source alpha. --- dlls/winex11.drv/xrender.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 33ad4bd..cb0ec9b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -507,7 +507,7 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif return WXR_INVALID_FORMAT; } -static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *info, BOOL use_alpha ) +static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *info ) { if (info->bmiHeader.biPlanes != 1) return WXR_INVALID_FORMAT; @@ -539,8 +539,7 @@ static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *inf break; } if (info->bmiHeader.biCompression != BI_RGB) break; - if (info->bmiHeader.biBitCount == 16) return WXR_FORMAT_X1R5G5B5; - return use_alpha ? WXR_FORMAT_A8R8G8B8 : WXR_FORMAT_X8R8G8B8; + return (info->bmiHeader.biBitCount == 16) ? WXR_FORMAT_X1R5G5B5 : WXR_FORMAT_A8R8G8B8; } return WXR_INVALID_FORMAT; } @@ -2678,7 +2677,7 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA dst_format = physdev->format; } - src_format = get_xrender_format_from_bitmapinfo( info, TRUE ); + src_format = get_xrender_format_from_bitmapinfo( info ); if (!(pict_format = pict_formats[src_format])) goto update_format; /* make sure we can create an image with the same bpp */ @@ -2792,7 +2791,12 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); } - format = get_xrender_format_from_bitmapinfo( info, func.AlphaFormat & AC_SRC_ALPHA ); + format = get_xrender_format_from_bitmapinfo( info ); + if (!(func.AlphaFormat & AC_SRC_ALPHA)) + format = get_format_without_alpha( format ); + else if (format != WXR_FORMAT_A8R8G8B8) + return ERROR_INVALID_PARAMETER; + if (!(pict_format = pict_formats[format])) goto update_format; /* make sure we can create an image with the same bpp */ @@ -2866,6 +2870,12 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } + if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->format != WXR_FORMAT_A8R8G8B8) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (physdev_dst != physdev_src) { int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None );

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
79
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 October 2011