May 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : Revert "gdi32: Pre-multiply RGB values by alpha for subpixel font rendering."
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: aa9c78170363699491c1abe3efa45b2100eb0803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9c78170363699491c1abe3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 00:09:21 2010 +0200 Revert "gdi32: Pre-multiply RGB values by alpha for subpixel font rendering." This reverts commit aff0eac21b7d66a0ba4869cade6368a988ab34ee. The RGB values are already alpha values, they don't need to be pre-multiplied. --- dlls/gdi32/freetype.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 53732c4..ddb3d24 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5025,22 +5025,19 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { for ( x = 0; x < src_width / hmul; x++ ) { - unsigned int alpha = (src[hmul * x + rgb_interval * 0] + - src[hmul * x + rgb_interval * 1] + - src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } else { - dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } } src += src_pitch * vmul;

1 0

André Hentschel : German translation of release news 1 .2-rc1
by Jeremy Newman May 27, 2010

May 27, 2010

Module: website Branch: master Commit: 106d50bd6eb92832987f8837f420a2a3ab9311f9 URL: http://source.winehq.org/git/website.git/?a=commit;h=106d50bd6eb92832987f88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 24 19:41:48 2010 +0200 German translation of release news 1.2-rc1 --- news/de/2010052101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/de/2010052101.xml b/news/de/2010052101.xml new file mode 100644 index 0000000..91187ee --- /dev/null +++ b/news/de/2010052101.xml @@ -0,0 +1,20 @@ +<news> +<date>21. Mai 2010</date> +<title>Wine 1.2-rc1 Freigegeben</title> +<body> + Die Entwicklungsversion 1.2-rc1 von Wine ist jetzt verfügbar. + Das ist der erste Release Candidate für Wine 1.2. Es läutet den Anfang des Code-Freeze ein. Bitte testet das Release gut durch um uns zu helfen 1.2 so gut wie möglich zu machen. + <a href="{$root}/announce/1.2-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele neue Symbolleisten Icons.</li> + <li>Unterstützung für Alpha blending in Image Listen.</li> + <li>Viel vollständigerer Shader Assembler.</li> + <li>Unterstützung für verbundene, arabische Schrift.</li> + <li>Einige Behebungen für Video Rendering.</li> + <li>Schrift Antialiasing Konfiguration per fontconfig.</li> + <li>Verbesserte Handhabung von Desktop Links.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.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

Alexandre Julliard : winedump: Don't include winbase16.h.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: a72f3f3075e68987a71e1ca607f154e161553e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72f3f3075e68987a71e1ca60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:09:14 2010 +0200 winedump: Don't include winbase16.h. --- tools/winedump/ne.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index 9328ccf..992d885 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" #include "winedump.h" struct ne_segtable_entry @@ -50,6 +49,23 @@ struct relocation_entry WORD target2; /* Target specification */ }; +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + #define NE_RADDR_LOWBYTE 0 #define NE_RADDR_SELECTOR 2 #define NE_RADDR_POINTER32 3 @@ -63,6 +79,34 @@ struct relocation_entry #define NE_RELTYPE_OSFIXUP 3 #define NE_RELFLAG_ADDITIVE 4 +#define NE_SEGFLAGS_DATA 0x0001 +#define NE_SEGFLAGS_ALLOCATED 0x0002 +#define NE_SEGFLAGS_LOADED 0x0004 +#define NE_SEGFLAGS_ITERATED 0x0008 +#define NE_SEGFLAGS_MOVEABLE 0x0010 +#define NE_SEGFLAGS_SHAREABLE 0x0020 +#define NE_SEGFLAGS_PRELOAD 0x0040 +#define NE_SEGFLAGS_EXECUTEONLY 0x0080 +#define NE_SEGFLAGS_READONLY 0x0080 +#define NE_SEGFLAGS_RELOC_DATA 0x0100 +#define NE_SEGFLAGS_SELFLOAD 0x0800 +#define NE_SEGFLAGS_DISCARDABLE 0x1000 +#define NE_SEGFLAGS_32BIT 0x2000 + +#define NE_RSCTYPE_CURSOR 0x8001 +#define NE_RSCTYPE_BITMAP 0x8002 +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_MENU 0x8004 +#define NE_RSCTYPE_DIALOG 0x8005 +#define NE_RSCTYPE_STRING 0x8006 +#define NE_RSCTYPE_FONTDIR 0x8007 +#define NE_RSCTYPE_FONT 0x8008 +#define NE_RSCTYPE_ACCELERATOR 0x8009 +#define NE_RSCTYPE_RCDATA 0x800a +#define NE_RSCTYPE_GROUP_CURSOR 0x800c +#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc + static inline WORD get_word( const BYTE *ptr ) { return ptr[0] | (ptr[1] << 8); @@ -78,8 +122,8 @@ static void dump_ne_header( const IMAGE_OS2_HEADER *ne ) printf( "Auto data segment: %x\n", ne->ne_autodata ); printf( "Heap size: %d bytes\n", ne->ne_heap ); printf( "Stack size: %d bytes\n", ne->ne_stack ); - printf( "Stack pointer: %x:%04x\n", SELECTOROF(ne->ne_sssp), OFFSETOF(ne->ne_sssp) ); - printf( "Entry point: %x:%04x\n", SELECTOROF(ne->ne_csip), OFFSETOF(ne->ne_csip) ); + printf( "Stack pointer: %x:%04x\n", HIWORD(ne->ne_sssp), LOWORD(ne->ne_sssp) ); + printf( "Entry point: %x:%04x\n", HIWORD(ne->ne_csip), LOWORD(ne->ne_csip) ); printf( "Number of segments: %d\n", ne->ne_cseg ); printf( "Number of modrefs: %d\n", ne->ne_cmod ); printf( "Segment table: %x\n", ne->ne_segtab );

1 0

Marcus Meissner : include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1).
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 122bfcc18526ad51021b987d53b322e1d525a662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122bfcc18526ad51021b987d5… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 27 15:40:48 2010 +0200 include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1). --- include/wine/winbase16.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index aaa3336..b70ecd6 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -217,8 +217,6 @@ enum arg_types ARG_VARARG /* start of varargs */ }; -#include <poppack.h> - #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) #define INFINITE16 0xFFFF @@ -315,6 +313,7 @@ typedef struct #define NE_RSCTYPE_GROUP_ICON 0x800e #define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc /* Resource found in .fot files */ +#include <poppack.h> #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT)

1 0

Marcus Meissner : wininet: Check for NULL lpwhh (Coverity).
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: b7f3aa61f43c5beac32ef51285dd0dee78df491c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f3aa61f43c5beac32ef5128… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 26 09:53:55 2010 +0200 wininet: Check for NULL lpwhh (Coverity). --- dlls/wininet/internet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5b1913a..fd93276 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2581,6 +2581,11 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } case INTERNET_OPTION_CONTEXT_VALUE: { + if (!lpwhh) + { + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } if (!lpBuffer || dwBufferLength != sizeof(DWORD_PTR)) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_POW.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 6f57aabc0a1223e27b52fc6c752e7605fd9a87e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f57aabc0a1223e27b52fc6c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 27 10:23:19 2010 +0200 wined3d: Handle a zero source value for WINED3DSIH_POW. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 056e9ad..ba16eae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2213,10 +2213,15 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); - if (dst_size > 1) { - shader_addline(buffer, "vec%d(pow(abs(%s), %s)));\n", dst_size, src0_param.param_str, src1_param.param_str); - } else { - shader_addline(buffer, "pow(abs(%s), %s));\n", src0_param.param_str, src1_param.param_str); + if (dst_size > 1) + { + shader_addline(buffer, "vec%d(%s == 0.0 ? 0.0 : pow(abs(%s), %s)));\n", + dst_size, src0_param.param_str, src0_param.param_str, src1_param.param_str); + } + else + { + shader_addline(buffer, "%s == 0.0 ? 0.0 : pow(abs(%s), %s));\n", + src0_param.param_str, src0_param.param_str, src1_param.param_str); } }

1 0

Alexandre Julliard : user32: Don't include winbase16.h.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: ed4846bed92d9c6e2bafa83d729863de018a978e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4846bed92d9c6e2bafa83d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:08 2010 +0200 user32: Don't include winbase16.h. --- dlls/user32/exticon.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a720cf3..fb9ff03 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -65,6 +65,26 @@ typedef struct icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e + #include "poppack.h" #if 0

1 0

Austin English : qedit: Fix return value of DllUnregisterServer.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: caf0e0befee9622f3ebed0f2a7da71794ca361e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf0e0befee9622f3ebed0f2a… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 01:23:56 2010 -0500 qedit: Fix return value of DllUnregisterServer. --- dlls/qedit/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/regsvr.c b/dlls/qedit/regsvr.c index d70c822..d007311 100644 --- a/dlls/qedit/regsvr.c +++ b/dlls/qedit/regsvr.c @@ -326,5 +326,5 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); hr = unregister_coclasses(coclass_list); - return S_OK; + return hr; }

1 0

Nikolay Sivov : comctl32: Export subclass calls by names too.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: d926939b12d3c260ad1e4bc3d0ba7341901dcd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d926939b12d3c260ad1e4bc3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 02:03:09 2010 +0400 comctl32: Export subclass calls by names too. --- dlls/comctl32/comctl32.spec | 8 +++--- dlls/comctl32/tests/subclass.c | 45 +++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 4249d56..c2c76a3 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -101,10 +101,10 @@ 402 stdcall -noname FindMRUStringW(long wstr ptr) 403 stdcall -noname EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) -410 stdcall -noname SetWindowSubclass(long ptr long long) -411 stdcall -noname GetWindowSubclass(long ptr long ptr) -412 stdcall -noname RemoveWindowSubclass(long ptr long) -413 stdcall -noname DefSubclassProc(long long long long) +410 stdcall -ordinal SetWindowSubclass(long ptr long long) +411 stdcall -ordinal GetWindowSubclass(long ptr long ptr) +412 stdcall -ordinal RemoveWindowSubclass(long ptr long) +413 stdcall -ordinal DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) 415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW 416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index f5a74ba..8511275 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -279,25 +279,50 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -START_TEST(subclass) +static int init_function_pointers(void) { - HMODULE hdll; - - hdll = GetModuleHandleA("comctl32.dll"); - assert(hdll); + HMODULE hmod; + void *ptr; + + hmod = GetModuleHandleA("comctl32.dll"); + assert(hmod); + /* Functions have to be loaded by ordinal. Only XP and W2K3 export * them by name. */ - pSetWindowSubclass = (void*)GetProcAddress(hdll, (LPSTR)410); - pRemoveWindowSubclass = (void*)GetProcAddress(hdll, (LPSTR)412); - pDefSubclassProc = (void*)GetProcAddress(hdll, (LPSTR)413); - +#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) + MAKEFUNC_ORD(SetWindowSubclass, 410); + MAKEFUNC_ORD(RemoveWindowSubclass, 412); + MAKEFUNC_ORD(DefSubclassProc, 413); +#undef MAKEFUNC_ORD + if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); - return; + return 0; + } + + /* test named exports */ + ptr = GetProcAddress(hmod, "SetWindowSubclass"); + ok(broken(ptr == 0) || ptr != 0, "expected named export for SetWindowSubclass\n"); + if(ptr) + { +#define TESTNAMED(f) \ + ptr = (void*)GetProcAddress(hmod, #f); \ + ok(ptr != 0, "expected named export for " #f "\n"); + TESTNAMED(RemoveWindowSubclass); + TESTNAMED(DefSubclassProc); + /* GetWindowSubclass exported for V6 only */ +#undef TESTNAMED } + return 1; +} + +START_TEST(subclass) +{ + if(!init_function_pointers()) return; + if(!RegisterWindowClasses()) assert(0); test_subclass();

1 0

Alexandre Julliard : version: Don't include winbase16.h.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: c94e7645a48f6639d94f9a8db18772b3e5426195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94e7645a48f6639d94f9a8db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:12 2010 +0200 version: Don't include winbase16.h. --- dlls/version/resource.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index e27a967..64d39dd 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -39,10 +39,25 @@ #include "winver.h" #include "wine/unicode.h" -#include "wine/winbase16.h" - #include "wine/debug.h" +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + WINE_DEFAULT_DEBUG_CHANNEL(ver);

1 0