December 2009 - Wine-devel - list.winehq.org

Re: [PATCH 2/3] winex11.drv: set global key state
by Alexandre Julliard 18 Aug '10

18 Aug '10

Rafał Miłecki <zajec5(a)gmail.com> writes: > @@ -1250,6 +1250,21 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD > key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; > } > > + SERVER_START_REQ( set_global_key_state ) > + { > + req->key = wVk; > + req->state = key_state_table[wVk]; > + wine_server_call( req ); > + } > + SERVER_END_REQ; > + SERVER_START_REQ( set_global_key_state ) > + { > + req->key = wVkStripped; > + req->state = key_state_table[wVkStripped]; > + wine_server_call( req ); > + } > + SERVER_END_REQ; > + You don't want to add 2 extra server calls for every key, especially since the server already receives the necessary information through the key event. -- Alexandre Julliard julliard(a)winehq.org

3 2

re: Remove NoAppDBEntry keyword?
by Dan Kegel 24 Apr '10

24 Apr '10

Jerome Leclanche wrote: > Austin English <austinenglish at gmail.com> wrote: >> Anyone opposed to removing that keyword? > > +1 on removing it. > It would be nice to have a bugzilla filter to replace it, too. > > Are we keeping "tasklist" and "tasklet" keywords as well? theres > barely a dozen very old bugs for both of them. I think it'd be fine to remove noappdbentry, tasklist, and tasklet. If there are no objections by next weekend, let's go ahead and do it. - Dan

4 4

Re: [1/7] avifile: Initial test data and simple test for avifil32 depends
by Paul Vriens 03 Jan '10

03 Jan '10

On 12/30/2009 03:21 AM, Julius Schwartzenberg wrote: > This patch depends on Detlef Riekenberg's patch from June 2008 and > expects it to have been applied: > http://www.winehq.org/pipermail/wine-patches/2008-June/056310.html > > It was not committed due to bug 14085: > http://bugs.winehq.org/show_bug.cgi?id=14085 Can't you just submit that initial test framework with the 3 imports (if all 3 are indeed needed)? The bug will of course not be closed but at least some of your work could be committed. -- Cheers, Paul.

4 3

avifile tests
by Julius Schwartzenberg 01 Jan '10

01 Jan '10

Hi, I still have some fixes for avifile here, but because they are quite nasty, I thought it'd be useful to have proper tests to show the fixes are really correct. Unfortunately there is still a problem with the avifile tests as Detlef indicated in this mail: http://www.winehq.org/pipermail/wine-devel/2009-November/079693.html Based on Detlef's patch however, I was able to create an initial patch which should provide the base for the tests I want to add. I have attached it here. The idea of the tests is that I write out a complete AVI file with the stdio functions and then read it back in using the VFW API and test the values in the different headers through the API. Later tests will change the values of the default headers and test how this affects the headers when they are being read back in. (I discovered Windows' avifil32 overrides some headers with values from other headers, there is some more info in my previous mails.) The inlining structure of the current header file is now actually based on the RIFF tree in the AVI file. Is this useful or should I just use plain indentation? Should the avi file data really be put in an extra header or should it be merged with api.c? What do you think of the general idea of the tests? Thanks a lot in advance for your feedback! Julius >From 00dc5fa4d767b2edbb0e9d42931c0fd9585c1b90 Mon Sep 17 00:00:00 2001 From: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Fri, 25 Dec 2009 20:29:43 +0100 Subject: initial version of avifile testing framework --- dlls/avifil32/tests/api.c | 72 ++++++++++++++++++ dlls/avifil32/tests/api_test.h | 160 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 0 deletions(-) create mode 100644 dlls/avifil32/tests/api_test.h diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 55b194f..c41ebfb 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -28,6 +29,8 @@ #include "vfw.h" #include "wine/test.h" +#include "api_test.h" + /* ########################### */ static const CHAR winetest0[] = "winetest0"; @@ -87,11 +90,80 @@ static void test_AVISaveOptions(void) /* ########################### */ +void init_test_struct(COMMON_AVI_HEADERS *cah) +{ + MainAVIHeader *mah = malloc(sizeof(MainAVIHeader)); + AVIStreamHeader *ash0 = malloc(sizeof(AVIStreamHeader)); + AVIStreamHeader *ash1 = malloc(sizeof(AVIStreamHeader)); + PCMWAVEFORMAT *pcmwf = malloc(sizeof(PCMWAVEFORMAT)); + memcpy(mah, &defmah, sizeof(defmah)); + memcpy(ash0, &defash0, sizeof(defash0)); + memcpy(ash1, &defash1, sizeof(defash1)); + memcpy(pcmwf, &defpcmwf, sizeof(defpcmwf)); + cah->mah = mah; + cah->ash0 = ash0; + cah->ash1 = ash1; + cah->pcmwf = pcmwf; +} + +void create_avi_file(COMMON_AVI_HEADERS *cah) +{ + FILE * pFile; + pFile = fopen("small.avi", "wb"); + + fwrite(file_header, 1, sizeof(file_header), pFile); /* de file wordt hier niet goed aangemaakt */ + fwrite(cah->mah, 1, sizeof(MainAVIHeader), pFile); + fwrite(streamlist, 1, sizeof(streamlist), pFile); + fwrite(cah->ash0, 1, 0x38, pFile); + fwrite(videostreamformat, 1, sizeof(videostreamformat), pFile); + fwrite(padding1, 1, sizeof(padding1), pFile); + fwrite(videopropheader, 1, sizeof(videopropheader), pFile); + fwrite(cah->ash1, 1, 0x38, pFile); + fwrite(audiostreamformat_pre, 1, sizeof(audiostreamformat_pre), pFile); + fwrite(cah->pcmwf, 1, sizeof(PCMWAVEFORMAT), pFile); + fwrite(data, 1, sizeof(data), pFile); + + fclose (pFile); +} + +void test_default_data() +{ + COMMON_AVI_HEADERS *cah; + PAVIFILE pFile; + int res; + LONG lSize; + WAVEFORMATEX wfx; + PAVISTREAM pStream; + + cah = calloc(sizeof(int),4); + init_test_struct(cah); + create_avi_file(cah); + + res = AVIFileOpen(&pFile, "small.avi", OF_SHARE_DENY_WRITE, 0L); + ok(res == 0, "Unable to open file: error=%u\n", res); + + res = AVIFileGetStream(pFile, &pStream, 0, 1); + ok(res == 0, "Unable to open audio stream: error=%u\n", res); + + ok(AVIStreamReadFormat(pStream, AVIStreamStart(pStream), NULL, &lSize) == 0, "Unable to read format size\n"); + ok(AVIStreamReadFormat(pStream, AVIStreamStart(pStream), &wfx, &lSize) == 0, "Unable to read format\n"); + + ok(wfx.wFormatTag == 1, "got %u (expected 1)\n",wfx.wFormatTag); + ok(wfx.nChannels == 2, "got %u (expected 2)\n",wfx.nChannels); + ok(wfx.wFormatTag == 1, "got %u (expected 1)\n",wfx.wFormatTag); + ok(wfx.nSamplesPerSec == 11025, "got %u (expected 11025)\n",wfx.nSamplesPerSec); + ok(wfx.nAvgBytesPerSec == 22050, "got %u (expected 22050)\n",wfx.nAvgBytesPerSec); + ok(wfx.nBlockAlign == 2, "got %u (expected 2)\n",wfx.nBlockAlign); +} + +/* ########################### */ + START_TEST(api) { AVIFileInit(); test_AVISaveOptions(); + test_default_data(); AVIFileExit(); } diff --git a/dlls/avifil32/tests/api_test.h b/dlls/avifil32/tests/api_test.h new file mode 100644 index 0000000..395cfa3 --- /dev/null +++ b/dlls/avifil32/tests/api_test.h @@ -0,0 +1,160 @@ +/* + * Unit test suite header for AVI Functions + * + * Copyright 2009 Julius Schwartzenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + + +typedef struct common_avi_headers { + MainAVIHeader *mah; + AVIStreamHeader *ash0; + AVIStreamHeader *ash1; + PCMWAVEFORMAT *pcmwf; +} COMMON_AVI_HEADERS; + +static const MainAVIHeader defmah = +{ + 0x00008256, /* dwMicroSecPerFrame */ + 0x000080e8, /* dwMaxBytesPerSec */ + 0x00000000, /* dwPaddingGranularity */ + 0x00000910, /* dwFlags */ + 1, /* dwTotalFrames */ + 0, /* dwInitialFrames */ + 2, /* dwStreams */ + 0x00100000, /* dwSuggestedBufferSize*/ + 8, /* dwWidth */ + 6, /* dwHeight */ + { 0, 0, 0, 0 } /* dwReserved[4] */ +}; + +static const AVIStreamHeader defash0 = +{ + streamtypeVIDEO, /* fccType */ + 0x30323449, /* fccHandler */ + 0x00000000, /* dwFlags */ + 0, /* wPriority */ + 0, /* wLanguage */ + 0, /* dwInitialFrames */ + 0x000003e9, /* dwScale */ + 0x00007530, /* dwRate */ + 0, /* dwStart */ + 1, /* dwLength */ + 0x00100000, /* dwSuggestedBufferSize*/ + 0xffffffff, /* dwQuality */ + 0, /* dwSampleSize */ + { 0, 0, 0, 0 } /* short left right top bottom */ +}; + +static const AVIStreamHeader defash1 = +{ + /* AVIStreamHeader */ + streamtypeAUDIO, /* fccType */ + 1, /* fccHandler */ + 0, /* dwFlags */ + 0, /* wPriority */ + 0, /* wLanguage */ + 0, /* dwInitialFrames */ + 1, /* dwScale */ + 0x00002b11, /* dwRate */ + 0, /* dwStart */ + 0x00000665, /* dwLength */ + 0x00003000, /* dwSuggestedBufferSize*/ + 0xffffffff, /* dwQuality */ + 2, /* dwSampleSize */ + { 0, 0, 0, 0 } /* short left right top bottom */ +}; + +static const PCMWAVEFORMAT defpcmwf = +{ + { + 1, /* wFormatTag */ + 2, /* nChannels */ + 11025, /* nSamplesPerSec */ + 22050, /* nAvgBytesPerSec */ + 2, /* nBlockAlign */ + }, + 8, /* wBitsPerSample */ +}; + +/* Extra data needed to get the VFW API to load the file */ +DWORD file_header[] = +{ + FOURCC_RIFF, 0x34c6 /* length */, formtypeAVI, + FOURCC_LIST, 0x1ac /* length */, + listtypeAVIHEADER, ckidAVIMAINHDR, sizeof(MainAVIHeader), +}; + +/* MainAVIHeader mah */ + +DWORD streamlist[] = +{ + FOURCC_LIST, 0xd4 /* length */, + listtypeSTREAMHEADER, ckidSTREAMHEADER, 0x38 /* length */, +}; + +/* AVIStreamHeader ash0 */ + +DWORD videostreamformat[] = +{ + ckidSTREAMFORMAT, 0x28 /* length */, + 0x00000028, 0x00000008, 0x00000006, 0x00180001, + 0x30323449, 0x00000090, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, +}; +DWORD padding1[] = +{ + ckidAVIPADDING, 0xc /* length */, + 0x00000004, 0x00000000, 0x63643030 +}; +DWORD videopropheader[] = +{ + 0x70727076, 0x44 /* length */, + 0x00000000, 0x00000000, + 0x0000001e, 0x00000008, 0x00000006, 0x00100009, + 0x00000008, 0x00000006, 0x00000001, 0x00000006, + 0x00000008, 0x00000006, 0x00000008, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, + FOURCC_LIST, 0x70 /* length */, + listtypeSTREAMHEADER, ckidSTREAMHEADER, 0x38 /* length */, +}; + +/* AVIStreamHeader ash1 */ + +DWORD audiostreamformat_pre[] = +{ + ckidSTREAMFORMAT, sizeof(PCMWAVEFORMAT) /* length */, +}; + +/* PCMWAVEFORMAT pcmwf */ + +DWORD data[] = +{ + ckidAVIPADDING, 0xc /* length */, + 0x00000004, 0x00000000, 0x62773130, + ckidAVIPADDING, 0xc /* length */, + 0x6c6d646f, 0x686c6d64, 0x000000f8, + FOURCC_LIST, 0x18 /* length */, + 0x4f464e49, + 0x54465349, 0xc /* length */, + 0x6676614c, 0x332e3235, 0x00302e37, + ckidAVIPADDING, 0x4 /* length */, + 0, + + FOURCC_LIST, 0xd1b /* length */, listtypeAVIMOVIE, + 0, 0 +}; -- 1.6.3.3

4 6

valgrind bot back online
by Dan Kegel 31 Dec '09

31 Dec '09

The valgrind bot seems to have locked up soon after I left for vacation, but it's back up. Today's results: http://kegel.com/wine/valgrind/logs/2009-12-31-09.07/ Stats: 1 Invalid free/ delete / delete[] 1 Use of uninitialised value of size 4 2 Invalid write of size 4 2 Source and destination overlap in memcpy 3 Syscall param writev 6 Invalid read of size 2 8 Invalid write of size 1 12 Invalid read of size 4 49 Conditional jump or move depends on uninitialised value 598 XXX bytes in XXX blocks are definitely lost total: 682 The total on Dec 18th was 807. Nice progress!

1 0

va_list breakage introduced today
by Gerald Pfeifer 31 Dec '09

31 Dec '09

I believe the following patch commit 8268ed978389662c7b43212e008037cae3ce900e Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 22:19:31 2009 +0100 kernel32: Do not include 16-bit headers in 32-bit files. is causing gmake[2]: Entering directory `/usr/test/Wine/dlls/kernel32' /files/pfeifer/gcc/bin/gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_KERNEL32_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes -Wwrite-strings -Wtype-limits -Wpointer-arith -I/usr/local/include -g -O2 -o module.o module.c In file included from module.c:36:0: ../../include/winbase.h:1560:84: error: expected declaration specifiers or '...' before 'va_list' ../../include/winbase.h:1561:85: error: expected declaration specifiers or '...' before 'va_list' In file included from module.c:37:0: ../../include/winternl.h:2223:81: error: expected declaration specifiers or '...' before 'va_list' ../../include/winternl.h:2389:58: error: expected declaration specifiers or '...' before 'va_list' ../../include/winternl.h:2390:75: error: expected declaration specifiers or '...' before 'va_list' over here on my FreeBSD 7.2 tester. Gerald

2 2

WineTestBot changes
by Greg Geldorp 31 Dec '09

31 Dec '09

I've completed phase 2 of the testbot: besides (32 and 64 bit) Windows executables you can now also submit patch files to the bot. The bot will apply the patch files to a clean git tree, cross-compile the test and run the test on Windows VMs. You'll also be able to download the cross-compiled test executable to test it on different Windows machines. Ge.

3 2

Re: [PATCH 2/2] d3d10: Parse effect shaders as anonymous shaders.
by Henri Verbeet 31 Dec '09

31 Dec '09

2009/12/31 Rico Schüller <kgbricola(a)web.de>: > struct d3d10_effect_shader_variable *s; ... > + v->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3d10_effect_shader_variable)); ... > + s = v->data; I think this would be nicer: s = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*s)); ... v->data = s; That's mostly my fault for writing it like that in the first place, but we might as well fix that. > + default: > + ERR("This should not happen!\n"); > + break; You'll probably want to return E_FAIL here. > + struct d3d10_effect_variable *v = &e->anonymous_shaders[e->anonymous_shader_current]; > + struct d3d10_effect_type *t = &e->anonymous_shader_type[e->anonymous_shader_current]; ... > + hr = parse_fx10_anonymous_shader(o->pass->technique->effect, o->type); ... > + o->data = &o->pass->technique->effect->anonymous_shaders[o->pass->technique->effect->anonymous_shader_current-1]; If you create a structure for anonymous shaders, you can store that in a single array. You can then pass a pointer to that structure to parse_fx10_anonymous_shader(), and handle "anonymous_shader_current" in parse_fx10_object(). E.g.: struct d3d10_effect *effect = o->pass->technique->effect; struct d3d10_effect_anonymous_shader *shader = &effect->anonymous_shaders[effect->anonymous_shader_current]; hr = parse_fx10_anonymous_shader(effect, o->type, shader); if (FAILED(hr)) return hr; ++effect->anonymous_shader_current; o->data = shader; Note that you should also validate that "anonymous_shader_current" < "anonymous_shader_count". The count is supposed to be correct, but the .fx might lie about it, possibly on purpose.

1 0

Re: [PATCH 1/2] d3d10: Add a function to initialize the null variables.
by Henri Verbeet 31 Dec '09

31 Dec '09

2009/12/31 Rico Schüller <kgbricola(a)web.de>: > +static struct d3d10_effect_variable null_local_buffer = {0}; > +static struct d3d10_effect_variable null_variable = {0}; > +static struct d3d10_effect_variable null_scalar_variable = {0}; > +static struct d3d10_effect_variable null_vector_variable = {0}; > +static struct d3d10_effect_variable null_matrix_variable = {0}; > +static struct d3d10_effect_variable null_string_variable = {0}; > +static struct d3d10_effect_variable null_shader_resource_variable = {0}; > +static struct d3d10_effect_variable null_render_target_view_variable = {0}; > +static struct d3d10_effect_variable null_depth_stencil_view_variable = {0}; > +static struct d3d10_effect_variable null_shader_variable = {0}; > +static struct d3d10_effect_variable null_blend_variable = {0}; > +static struct d3d10_effect_variable null_depth_stencil_variable = {0}; > +static struct d3d10_effect_variable null_rasterizer_variable = {0}; > +static struct d3d10_effect_variable null_sampler_variable = {0}; This doesn't hurt (much), but since a lot of people seem to be unaware of this I think it's worth mentioning again. Global variables as well as static (local) variables are initialized to 0 / NULL by default. The way this works in the language spec is that objects with static storage duration (i.e. the entire lifetime of the program/module) are initialized to 0 / NULL unless explicitly initialized. In practice that means global and static variables (but note that static on a global variable or function has a different meaning from static on a local variable). > +static void d3d10_null_effect_variable_init(struct d3d10_effect_variable *v, struct ID3D10EffectVariableVtbl *vtbl) > +{ > + v->vtbl = vtbl; > + v->buffer = &null_local_buffer; > + v->effect = NULL; > + v->name = NULL; > + v->semantic = NULL; > + v->buffer_offset = 0; > + v->annotation_count = 0; > + v->flag = 0; > + v->data_size = 0; > + v->type = &null_type; > + v->elements = NULL; > + v->members = NULL; > + v->annotations = NULL; > +} Most of these are redundant, since the variable will be already initialized with zeroes.

1 0

Tango Icons (Almost) Ready to Go!!
by Joel Holdsworth 31 Dec '09

31 Dec '09

Hi All, I'm pleased to announce that after a lot of work lately I've pretty much completed the graphics for the icons for shell32, user32 and the programs all sizes and screen depths: http://www.airwebreathe.org.uk/wine-icon/ There are a few minor things left to do: * comctl32: Finish and submit - only idb_std_small.bmp needs to be upgraded. Only idb_std_small.bmp is 32-bit in XP, and Vista * comdlg32: Convert bitmaps to 8-bit. Maybe rework comdlg32 so that the graphics are stored as a icons not bitmaps for so that different colour depths can be handled elegantly. What does windows do? * credui: Test on a low bit-depth platform, and submit. * cryptui: Redo emblems on certwarning.bmp, certerror.bmp, and convert bitmaps into icons for so that different colour depths can be handled elegantly. * winecfg: new transparent bitmap won't work without xrender on a 32-bpp screen. Think again. * wine: image lists still strip the alpha channel. talk to thunderbird about 32-bit DDBs * control, dxdiag, iexplore, winecfg: These programs currently do not have an icon, and although my patches add the icon to the src dir, further patches will be needed to add the icon to the progam's resources, and display them in the app windows. These things are all relatively minor, and I think at this stage it would be good to merge as soon as possible. The only major issue that remains is that there are 3 icons from Gnome that need to be relicensed as LGPL for our use. I've e-mailed the gnome artists mailing list, so hopefully we'll hear back from them soon. Once this is done I'm suggesting we merge the icons for shell32, user32 and the programs. If you're interested you can try them right now at the public-beta-2 branch of my gitorious repo: http://gitorious.org/wine-tango/wine-tango/commits/public-beta-2 My final question is about what to do with my source artwork. The artwork has been collected from a variety of sources. Some is SVGs, some gimp .xcf.bz2s, and some plain PNGs. I guess these shouldn't go into the wine source repo, but does anyone have any bright ideas where these files *should* go? They'll need to be published in case the icons ever need to be changed in any way. Any thoughts? Best Regards Joel

3 3