November 2007 - Wine-commits

Alexandre Julliard : Wine release 0.9.49
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: website Branch: master Commit: 7345426ee19057155cc1e9d64a0ecccfaf4ff0ac URL: http://source.winehq.org/git/website.git/?a=commit;h=7345426ee19057155cc1e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 18:08:02 2007 +0100 Wine release 0.9.49 --- include/winehq.conf | 2 +- news/2007110901.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index 95651c6..9e9d477 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.48 +snapshot_date: 0.9.49 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007110901.xml b/news/2007110901.xml new file mode 100644 index 0000000..c7d8bef --- /dev/null +++ b/news/2007110901.xml @@ -0,0 +1,26 @@ +<news> +<date>November 9, 2007</date> +<title>Wine 0.9.49 Released</title> +<body> +<p>Wine 0.9.49 was released today, with the following main changes:</p> + +<ul> +<li>Many copy protection fixes.</li> +<li>GLSL is now the default for Direct3D.</li> +<li>Lots of memory errors fixed thanks to Valgrind.</li> +<li>Support for TOPMOST windows.</li> +<li>Beginnings of an inetcomm dll implementation.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.49.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.49">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.49.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 1d9300104e4edaf482bcfffa6a810f846f10cfa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9300104e4edaf482bcfffa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 17:56:12 2007 +0100 Release 0.9.49. --- ANNOUNCE | 1168 +++++++++++++++++------------------ ChangeLog | 2018 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2595 insertions(+), 611 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d9300104e4edaf482bcf…

1 0

Tag wine-0.9.49 : Alexandre Julliard : Release 0.9.49
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: refs/tags/wine-0.9.49 Tag: 11d2b79ec1a1e754d21a482c1384340dd9076fce URL: http://source.winehq.org/git/wine.git/?a=tag;h=11d2b79ec1a1e754d21a482c1384… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 17:56:12 2007 +0100 Release 0.9.49

1 0

Alexandre Julliard : user32/tests: Fix access to an uninitialized variable.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 5fa4e85ad6b6301cc9eb7b7a84db1e70c9102474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa4e85ad6b6301cc9eb7b7a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 13:14:37 2007 +0100 user32/tests: Fix access to an uninitialized variable. --- dlls/user32/tests/dde.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5c01181..044e003 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -254,6 +254,7 @@ static HDDEDATA CALLBACK client_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon static void test_ddeml_client(void) { UINT ret; + char buffer[32]; LPSTR str; DWORD size, res; HDDEDATA hdata, op; @@ -359,8 +360,8 @@ static void test_ddeml_client(void) item = DdeCreateStringHandleA(client_pid, "poker", CP_WINANSI); - lstrcpyA(str, "poke data\r\n"); - hdata = DdeCreateDataHandle(client_pid, (LPBYTE)str, lstrlenA(str) + 1, + lstrcpyA(buffer, "poke data\r\n"); + hdata = DdeCreateDataHandle(client_pid, (LPBYTE)buffer, lstrlenA(buffer) + 1, 0, item, CF_TEXT, 0); ok(hdata != NULL, "Expected non-NULL hdata\n"); @@ -402,8 +403,8 @@ static void test_ddeml_client(void) DdeFreeDataHandle(hdata); - lstrcpyA(str, "[Command(Var)]"); - hdata = DdeCreateDataHandle(client_pid, (LPBYTE)str, lstrlenA(str) + 1, + lstrcpyA(buffer, "[Command(Var)]"); + hdata = DdeCreateDataHandle(client_pid, (LPBYTE)buffer, lstrlenA(buffer) + 1, 0, NULL, CF_TEXT, 0); ok(hdata != NULL, "Expected non-NULL hdata\n");

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 81a5701ca9991db03f05c0321beacd838205c777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a5701ca9991db03f05c0321… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 12:37:53 2007 +0100 Assorted spelling fixes. --- dlls/advapi32/security.c | 4 ++-- dlls/kernel32/tests/loader.c | 2 +- dlls/shell32/dialogs.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- tools/widl/widl.man.in | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bd2ac06..4fdbb54 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -130,8 +130,8 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, }; -/* these SIDs must be constructed as relative to some domain - only the RID is well-kown */ -typedef struct WELLKOWNRID +/* these SIDs must be constructed as relative to some domain - only the RID is well-known */ +typedef struct WELLKNOWNRID { WELL_KNOWN_SID_TYPE Type; DWORD Rid; diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8f425da..363c2fd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -147,7 +147,7 @@ START_TEST(loader) 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x1000, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), - ERROR_BAD_EXE_FORMAT /* XP doesn't like aligments */ + ERROR_BAD_EXE_FORMAT /* XP doesn't like alignments */ }, { &dos_header, sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x200, diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 76c3d6e..f972cfc 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -390,7 +390,7 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D HANDLE hToken; TOKEN_PRIVILEGES npr; - /* enable shutdown privilege for current process */ + /* enable the shutdown privilege for the current process */ if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adfaa9f..73fb0f6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2537,7 +2537,7 @@ void pshader_glsl_texkill(SHADER_OPCODE_ARG* arg) { /* 2.0 shaders compare all 4 components in texkill */ shader_addline(arg->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); } else { - /* 1.X shaders only compare the first 3 components, propably due to the nature of the texkill + /* 1.X shaders only compare the first 3 components, probably due to the nature of the texkill * instruction as a tex* instruction, and phase, which kills all a / w components. Even if all * 4 components are defined, only the first 3 are used */ diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 81c6e40..df7d1c0 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -94,8 +94,8 @@ Do not preprocess input. .IP "\fB-W\fR" Enable pedantic warnings. .IP "\fB-d \fIn\fR" -Set debug level to the nonnegative integer \fIn\fR. If -prefixed with \fB0x\fR, it will be interpretted as a hexidecimal +Set debug level to the non negative integer \fIn\fR. If +prefixed with \fB0x\fR, it will be interpreted as an hexadecimal number. For the meaning of values, see the \fBDebug\fR section. .PP .B Miscellaneous options:

1 0

Francois Gouget : winex11: Add C alternatives to the assembly bits in X11DRV_DIB_SetImageBits_8().
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: f288ed99b06e5d3d411c615cccd2fc2406827496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f288ed99b06e5d3d411c615cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 12:45:58 2007 +0100 winex11: Add C alternatives to the assembly bits in X11DRV_DIB_SetImageBits_8(). --- dlls/winex11.drv/dib.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 5d4ac45..8fb61dd 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -1427,15 +1427,14 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, switch (bmpImage->depth) { case 15: case 16: -#if defined(__i386__) && defined(__GNUC__) /* Some X servers might have 32 bit/ 16bit deep pixel */ if (lines && width && (bmpImage->bits_per_pixel == 16) && (ImageByteOrder(gdi_display)==LSBFirst) ) { - dstbits=(BYTE*)bmpImage->data+left*2+(lines-1)*bmpImage->bytes_per_line; - /* FIXME: Does this really handle all these cases correctly? */ /* ==== pal 8 dib -> rgb or bgr 555 or 565 bmp ==== */ + dstbits=(BYTE*)bmpImage->data+left*2+(lines-1)*bmpImage->bytes_per_line; for (h = lines ; h--; ) { +#if defined(__i386__) && defined(__GNUC__) int _cl1,_cl2; /* temp outputs for asm below */ /* Borrowed from DirectDraw */ __asm__ __volatile__( @@ -1454,23 +1453,33 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, "d" (colors) :"eax", "cc", "memory" ); +#else + DWORD* dstpixel=(DWORD*)dstbits; + for (x=0; x<width/2; x++) { + /* Do 2 pixels at a time */ + *dstpixel++=(colors[srcbyte[1]] << 16) | colors[srcbyte[0]]; + srcbyte+=2; + } + if (width&1) { + /* And then the odd pixel */ + *((WORD*)dstpixel)=colors[srcbyte[0]]; + } +#endif srcbyte = (srcbits += linebytes); dstbits -= bmpImage->bytes_per_line; } return; } break; -#endif case 24: case 32: -#if defined(__i386__) && defined(__GNUC__) if (lines && width && (bmpImage->bits_per_pixel == 32) && (ImageByteOrder(gdi_display)==LSBFirst) ) { dstbits=(BYTE*)bmpImage->data+left*4+(lines-1)*bmpImage->bytes_per_line; - /* FIXME: Does this really handle both cases correctly? */ /* ==== pal 8 dib -> rgb or bgr 0888 bmp ==== */ for (h = lines ; h--; ) { +#if defined(__i386__) && defined(__GNUC__) int _cl1,_cl2; /* temp outputs for asm below */ /* Borrowed from DirectDraw */ __asm__ __volatile__( @@ -1489,13 +1498,18 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, "d" (colors) :"eax", "cc", "memory" ); +#else + DWORD* dstpixel=(DWORD*)dstbits; + for (x=0; x<width; x++) { + *dstpixel++=colors[*srcbyte++]; + } +#endif srcbyte = (srcbits += linebytes); dstbits -= bmpImage->bytes_per_line; } return; } break; -#endif default: break; /* use slow generic case below */ }

1 0

Dmitry Timoshkov : user32: Simplify some code.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 57226607586ad6116152e96d195b197ed57cf882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57226607586ad6116152e96d1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Nov 9 17:52:11 2007 +0800 user32: Simplify some code. --- dlls/user32/menu.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8e9a631..59f84b9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -703,18 +703,17 @@ static MENUITEM *MENU_FindItemByCoords( const POPUPMENU *menu, { MENUITEM *item; UINT i; - RECT wrect; RECT rect; - if (!GetWindowRect(menu->hWnd,&wrect)) return NULL; - pt.x -= wrect.left;pt.y -= wrect.top; + if (!GetWindowRect(menu->hWnd, &rect)) return NULL; + pt.x -= rect.left; + pt.y -= rect.top; item = menu->items; for (i = 0; i < menu->nItems; i++, item++) { rect = item->rect; MENU_AdjustMenuItemRect(menu, &rect); - if ((pt.x >= rect.left) && (pt.x < rect.right) && - (pt.y >= rect.top) && (pt.y < rect.bottom)) + if (PtInRect(&rect, pt)) { if (pos) *pos = i; return item; @@ -1109,7 +1108,7 @@ MENU_GetMaxPopupHeight(LPPOPUPMENU lppop) * * Calculate the size of a popup menu. */ -static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND hwndOwner ) +static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) { MENUITEM *lpitem; HDC hdc; @@ -1143,7 +1142,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND hwndOwner ) if ((i != start) && (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; - MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, FALSE, lppop ); + MENU_CalcItemSize( hdc, lpitem, lppop->hwndOwner, orgX, orgY, FALSE, lppop ); maxX = max( maxX, lpitem->rect.right ); orgY = lpitem->rect.bottom; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) @@ -1792,7 +1791,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, menu->hwndOwner = hwndOwner; menu->nScrollPos = 0; - MENU_PopupMenuCalcSize( menu, hwndOwner ); + MENU_PopupMenuCalcSize( menu ); /* adjust popup menu pos so that it fits within the desktop */ @@ -3657,7 +3656,7 @@ INT WINAPI GetMenuStringA( if (!str || !nMaxSiz) return strlenW(item->text); if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) str[nMaxSiz-1] = 0; - TRACE("returning '%s'\n", str ); + TRACE("returning %s\n", debugstr_a(str)); return strlen(str); } @@ -3682,6 +3681,7 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, return 0; } lstrcpynW( str, item->text, nMaxSiz ); + TRACE("returning %s\n", debugstr_w(str)); return strlenW(str); }

1 0

Francois Gouget : d3dx8: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 8fc8f2625ca965e2dc01396dd86b735f3d0c4312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc8f2625ca965e2dc01396dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 12:38:58 2007 +0100 d3dx8: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx8/math.c | 319 ++++++++++++++++++++++++----------------------- dlls/d3dx8/tests/math.c | 230 +++++++++++++++++----------------- 2 files changed, 276 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fc8f2625ca965e2dc013…

1 0

Francois Gouget : gdi32/tests: Dynamically load GdiAlphaBlend() so the test runs on Win9x.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 2bbfc931d10c073658b41e2f2091c232d57ebb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbfc931d10c073658b41e2f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 12:39:19 2007 +0100 gdi32/tests: Dynamically load GdiAlphaBlend() so the test runs on Win9x. --- dlls/gdi32/tests/bitmap.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e1e4437..6f87e29 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -31,6 +31,8 @@ #include "wine/test.h" +static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); + #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } static BOOL is_win9x; @@ -1836,20 +1838,31 @@ static void test_get16dibits(void) void test_GdiAlphaBlend() { /* test out-of-bound parameters for GdiAlphaBlend */ - HDC hdcNull = GetDC(NULL); + HDC hdcNull; - HDC hdcDst = CreateCompatibleDC(hdcNull); - HBITMAP bmpDst = CreateCompatibleBitmap(hdcNull, 100, 100); + HDC hdcDst; + HBITMAP bmpDst; HBITMAP oldDst; BITMAPINFO bmi; - HDC hdcSrc = CreateCompatibleDC(hdcNull); + HDC hdcSrc; HBITMAP bmpSrc; HBITMAP oldSrc; LPVOID bits; BLENDFUNCTION blend; + if (!pGdiAlphaBlend) + { + skip("GdiAlphaBlend() is not implemented\n"); + return; + } + + hdcNull = GetDC(NULL); + hdcDst = CreateCompatibleDC(hdcNull); + 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; @@ -1868,22 +1881,22 @@ void test_GdiAlphaBlend() blend.SourceConstantAlpha = 128; blend.AlphaFormat = 0; - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend), TRUE, BOOL, "%d"); + expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend), TRUE, BOOL, "%d"); SetLastError(0xdeadbeef); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), FALSE, BOOL, "%d"); + 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(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), FALSE, BOOL, "%d"); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 15, 0, 10, 10, blend), FALSE, BOOL, "%d"); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%d"); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%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"); SetWindowOrgEx(hdcSrc, -10, -10, NULL); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), TRUE, BOOL, "%d"); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), TRUE, BOOL, "%d"); + 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"); SetMapMode(hdcSrc, MM_ANISOTROPIC); ScaleWindowExtEx(hdcSrc, 10, 1, 10, 1, NULL); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 30, 30, blend), TRUE, BOOL, "%d"); - expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend), TRUE, BOOL, "%d"); + 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"); SelectObject(hdcDst, oldDst); SelectObject(hdcSrc, oldSrc); @@ -1898,8 +1911,12 @@ void test_GdiAlphaBlend() START_TEST(bitmap) { + HMODULE hdll; is_win9x = GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC) == 0; + hdll = GetModuleHandle("gdi32.dll"); + pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); + test_createdibitmap(); test_dibsections(); test_mono_dibsection();

1 0

Francois Gouget : user32/tests: Skip some tests when DdeClientTransaction() returns NULL. This avoids some crashes on Win9x.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 2b6abd5f850720d4141ef83756054029bb013daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6abd5f850720d4141ef8375… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 12:42:32 2007 +0100 user32/tests: Skip some tests when DdeClientTransaction() returns NULL. This avoids some crashes on Win9x. --- dlls/user32/tests/dde.c | 69 +++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index ca9fe20..5c01181 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -285,57 +285,66 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(hdata != NULL, "Expected non-NULL hdata, got %p\n", hdata); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", res); } + if (hdata == NULL) + ok(FALSE, "hdata is NULL\n"); + else + { + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); + ok(size == 19, "Expected 19, got %d\n", size); - str = (LPSTR)DdeAccessData(hdata, &size); - ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); - - ret = DdeUnaccessData(hdata); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + } /* XTYP_REQUEST, fAckReq = TRUE */ res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(hdata != NULL, "Expected non-NULL hdata\n"); todo_wine { ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); } + if (hdata == NULL) + ok(FALSE, "hdata is NULL\n"); + else + { + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); + ok(size == 19, "Expected 19, got %d\n", size); - str = (LPSTR)DdeAccessData(hdata, &size); - ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); - - ret = DdeUnaccessData(hdata); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + } /* XTYP_REQUEST, all params normal */ res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); todo_wine { ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); } + if (hdata == NULL) + ok(FALSE, "hdata is NULL\n"); + else + { + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); + ok(size == 19, "Expected 19, got %d\n", size); - str = (LPSTR)DdeAccessData(hdata, &size); - ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); - - ret = DdeUnaccessData(hdata); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + } /* XTYP_REQUEST, no item */ res = 0xdeadbeef; @@ -444,22 +453,24 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); todo_wine { ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); } + if (hdata == NULL) + ok(FALSE, "hdata is NULL\n"); + else + { + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); + ok(size == 21, "Expected 21, got %d\n", size); - str = (LPSTR)DdeAccessData(hdata, &size); - ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21, "Expected 21, got %d\n", size); - - ret = DdeUnaccessData(hdata); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + } /* invalid transactions */ - res = 0xdeadbeef; DdeGetLastError(client_pid); op = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_ADVREQ, default_timeout, &res);

1 0