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

NetBSD compiler warnings patches - review request
by Austin English 24 Apr '09

24 Apr '09

Howdy, I recently started retesting NetBSD (5.0 this time), and have filed bugs for most of the warnings. A few of them I have patches ready for, but figured I should probably get reviewed first: First up, bug 18161: gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -o cdrom.o cdrom.c cdrom.c: In function 'CDROM_DeviceIoControl': cdrom.c:1728: warning: 'lun' may be used uninitialized in this function cdrom.c:1728: warning: 'targetid' may be used uninitialized in this function cdrom.c:1728: warning: 'busid' may be used uninitialized in this function cdrom.c:1728: warning: 'portnum' may be used uninitialized in this function Fixed by cdrom.txt Bug 18162: gcc -c -I. -I. -I../../../include -I../../../include -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -o treeview.o treeview.c treeview.c: In function 'TestCallback': treeview.c:279: warning: value computed is not used treeview.c:304: warning: value computed is not used treeview.c:313: warning: value computed is not used treeview.c:322: warning: value computed is not used treeview.c: In function 'TestExpandInvisible': treeview.c:769: warning: value computed is not used Fixed by treeview.txt. Also tested on windows 2k, test still passes. Bug 18165: gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/f reetype2 -I/usr/X11R7/include -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -o net.o net.c net.c: In function 'netconn_init': net.c:243: warning: assignment discards qualifiers from pointer target type Fixed by winhttp.txt. Also fixes a similar problem in wininet/netconnection.c Bug 18166: gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include -o directory.o directory.c directory.c: In function 'wine_getdirentries': directory.c:1289: warning: implicit declaration of function 'getdirentries' There's a NetBSD bug here. Their version of getdirentries returns the old 32-bit inode struct dirent, while dirent.h has the new 64-bit inode struct dirent inode since NetBSD version 3.99.8. While it arguably should be fixed on their end, we already have a wrapper in there for an OS X bug... directory.txt fixes it. -- -Austin

3 2

Redirector code in Wine?
by Kai Blin 24 Apr '09

24 Apr '09

Hi folks, I'm trying to figure out where the wine server actually decides if a file actually is a file on disk, a local or a remote pipe. Any pointers? Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

2 1

Re: [1/5] WineD3D: Support the full amount of constants in GLSL
by Alexandre Julliard 23 Apr '09

23 Apr '09

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Am Mittwoch, 22. April 2009 21:03:41 schrieb Stefan Dösinger: > Use this patch instead. Henri spotted some missing parentheses in the code It doesn't work here: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:8782: Tests skipped: D3DFMT_G16R16F textures not supported visual.c:8782: Tests skipped: D3DFMT_G32R32F textures not supported visual.c:7572: Tests skipped: Card has unconditional pow2 support, skipping conditional NP2 tests fixme:d3d_shader:print_glsl_info_log Error received from GLSL shader #4: "Vertex info\n-----------\nInternal error: assembly compile error for vertex shader at offset 42905:\n-- error message --\nline 1063, column 1: error: too many program parameters\n-- internal assembly text --\n!!NVvp4.0\n# cgc version 2.1.0000, build date Nov 4 2008\n# command line args: \n#vendor N"... fixme:d3d_shader:set_glsl_shader_program >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Find glsl program uniform locations @ glsl_shader.c / 3613 fixme:d3d_shader:set_glsl_shader_program >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB(programId) @ glsl_shader.c / 3627 fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 00ffff00, got 00000000 (for input -2.400000, instruction mova) fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 00ffff00, got 00000000 (for input -1.600000, instruction mova) fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 0000ffff, got 00000000 (for input -0.400000, instruction mova) fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 0000ffff, got 00000000 (for input 0.400000, instruction mova) fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 00ff00ff, got 00000000 (for input 1.600000, instruction mova) fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758 fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574 visual.c:744: Test failed: Expected color 00ff00ff, got 00000000 (for input 2.400000, instruction mova) visual.c:8643: Tests skipped: Only 1 simultaneous render target supported, skipping MRT test make[2]: *** [visual.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: ole32: CoGetTreatAsClass should return S_FALSE if it cannot even find the key for the requested CLSID
by Paul Vriens 23 Apr '09

23 Apr '09

Aric Stewart wrote: > > Fixes issues with IE7 involving constant prompting to click to run > ActiveX controls when none are present > Includes test > --- > dlls/ole32/compobj.c | 3 +++ > dlls/ole32/tests/compobj.c | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+), 0 deletions(-) > > > > ------------------------------------------------------------------------ > > Wouldn't it be better to use some other GUID here: + hr = pCoGetTreatAsClass(&GUID_NULL,&out); + ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); + ok (IsEqualGUID(&out,&GUID_NULL), "expected to get same clsid back\n"); That way we would know if Windows indeed leaves the clsid alone or returns the NULL GUID? Something like: static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; -- Cheers, Paul.

2 1

Re: wined3d: Avoid using an implicit value to set fogcoord to 0.0.
by Stefan Dösinger 23 Apr '09

23 Apr '09

This patch looks ok. I have the same patch in my send queue, but it seems Francois was quicker with sending it

1 0

Re: [PATCH 1/2] ole32: Register the clipboard formats at load time.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Huw Davies <huw(a)codeweavers.com> writes: > --- > dlls/ole32/clipboard.c | 54 +++++++++++++++++++++++++++++------------ > dlls/ole32/compobj.c | 2 + > dlls/ole32/compobj_private.h | 14 +++++++++++ > 3 files changed, 54 insertions(+), 16 deletions(-) It would be nicer to do this when needed, so that we don't have to initialize the graphics driver just because ole32 was imported. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH 1/2] comctl32/tests: test toolbar separator with uninitialized iString
by Giuseppe Bilotta 23 Apr '09

23 Apr '09

Trying to add a separator with an invalid pointer in iString to a toolbar works in Windows, showing that the field is ignored. --- dlls/comctl32/tests/toolbar.c | 51 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1946095..91a72e0 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1300,6 +1300,56 @@ static void test_getstring(void) DestroyWindow(hToolbar); } +static void test_deadbeef(void) +{ + HWND hToolbar = NULL; + TBBUTTON buttons[2]; + INT r; + + rebuild_toolbar_with_buttons(&hToolbar); + + ZeroMemory(&buttons, sizeof(buttons)); + + /* Some programs (e.g. Graphmatica 2.0f) forget to initialize the iString + * field for separators. If the random bit pattern of this field looks like + * a pointer, trying to follow it casues a crash (pagefault). This does not + * happen in Windows XP, 2008 or Vista, suggesting that this field is + * ignored in Windows in this case. */ + buttons[0].idCommand = 0; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = 0xdeadbeef; + +#if 0 + /* It is also possible that a poorly written program doesn't initialize the + * iString field of an actual button. Different versions of Windows seem to + * operate differently in this case. + * + Windows XP doesn't seem to be bothered in the least + * + Windows 2008 crashes + * + Windows Vista does not crash, but the subsequent TB_ADDBUTTONS + * call fails + * Since I know of no program that suffers from this particular issue, I'm + * commenting out this part of the test for the time being. If it gets + * uncommented, the subsequent TB_ADDBUTTONS should be adjusted + * appropriately. */ + + buttons[1].idCommand = 1; + buttons[1].fsStyle = BTNS_BUTTON; + buttons[1].fsState = 0; + buttons[1].iString = 0xdeadbeef; +#endif + + r = SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)buttons); + expect(1, r); + + /* TODO: another test that might be worth doing, to get more insight on how + * Windows handles things, would be to introduce a separator with + * 0xdeadbeef as iString, and then change its style to make into a real + * button. */ + + DestroyWindow(hToolbar); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1336,6 +1386,7 @@ START_TEST(toolbar) test_dispinfo(); test_setrows(); test_getstring(); + test_deadbeef(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { -- 1.6.2.254.g84bde

3 8

Re: [mshtml] Fix the size passed to MultiByteToWideChar for real
by Dmitry Timoshkov 23 Apr '09

23 Apr '09

"Colin Finck" <mail(a)colinfinck.de> wrote: wrote: > @@ -425,6 +425,7 @@ static LPWSTR get_url(void) > HKEY hkey; > DWORD res, type; > DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); > + DWORD returned_size; > LPWSTR url; > > static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; > @@ -438,14 +439,14 @@ static LPWSTR get_url(void) > > > url = heap_alloc(size); > > - res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &size); > + res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); returned_size must be intialized first. -- Dmitry.

2 1

Re: kernel32/tests: Added last error tests for GetPrivateProfileString
by Paul Vriens 23 Apr '09

23 Apr '09

Dmitry Kislyuk wrote: > > Any particular reason for adding these tests? Is there an app depending on the last error? -- Cheers, Paul.

1 0

[7/7] [wined3d] correct now faulty comment (review)
by Tobias Jakobi 22 Apr '09

22 Apr '09

-- Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger01

1 0