October 2006 - Wine-Devel - list.winehq.org

Re: msi [2/2]: Use lstrlenW instead of sizeof to compute the length of local const unicode strings
by Mike McCormack Oct. 20, 2006

Oct. 20, 2006

James Hawkins wrote: > static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; > > - size = sizeof(create_fmt) + lstrlenW(table) - 2; > + size = lstrlenW(create_fmt) + lstrlenW(table) - 1; Since the string is const, and we know it at compile time, using sizeof() is better as unlike lstrlenW() it has no runtime cost. How about doing something like? #define CONST_STRLENW(X) (sizeof (X)/ sizeof((X)[0]) - 1) size = CONST_STRLENW(create_fmt) + strlenW(table) - 1; Mike

1 0

Re: usp10: resend - tests for ScriptStringAnalyse and ScriptStringFree
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Jeff Latimer <lats(a)yless4u.com.au> writes: > This patch starts to add the Uniscribe string functionality again in a > set of smaller patches starting with tests that work in Windows. It > is should be simpler to understand. > > Changelog: > Add tests for ScriptStringAnalyse and ScriptStringFree It fails for me: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:679: Test succeeded inside todo block: ScriptStringAnalyse Stub should return E_PENDING not 8000000a make: *** [usp10.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

d3d/dx8 GLSL-patch shader question: access on VC constants out of bounds
by Christoph Frick Oct. 20, 2006

Oct. 20, 2006

hiho the game LFS[1] uses in its shaders constants with "high" numbers (c10-c17,c90-c95); so in sum no problem. but due to check against the OpenGL implemented maximum (in my case VC[31]) the shaders wont work anymore (array out of bounds). is this due to recently discussed "max/4 is correct but old nvidia driver reports wrong numers"-problem or is this something new? would it be possible to map the constants from the shader into the vertex program using a look-up-table so we just need to allocate a VC-array there with the actualy used size and so the check against the maximum of uniforms would make sense again? [1] http://www.liveforspeed.net/?page=downloads -- cu

2 1

Re: fix for the winemp3 module
by Daniel Remenak Oct. 19, 2006

Oct. 19, 2006

> I thought at first you just diff:ed the file against mplayer's code > however, as mplayer's uses the old mpglib code, one could also ask > mplayer's team to release the diffs they made to mpglib as LGPL (which > they have to...) They don't have to (although it would certainly be kind of them to do so, particularly in this case). Section 3 of the LGPL states: "3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. "Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy." --Daniel Remenak

1 0

Re: wineconsole[4/6]: allow making selections with a mouse also when not in the QuickEdit mode
by Eric Pouech Oct. 19, 2006

Oct. 19, 2006

Mikołaj Zalewski wrote: > The user may start the selection from the popup menu. The mouse should > work then > >------------------------------------------------------------------------ > >diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c >index 557ccfc..c4250e5 100644 >--- a/programs/wineconsole/user.c >+++ b/programs/wineconsole/user.c >@@ -1116,12 +1116,14 @@ static LRESULT CALLBACK WCUSER_Proc(HWND > WCUSER_GenerateKeyInputRecord(data, uMsg == WM_SYSKEYDOWN, wParam, lParam, TRUE); > break; > case WM_LBUTTONDOWN: >- if (data->curcfg.quick_edit) >+ if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) > { > if (PRIVATE(data)->has_selection) >+ WCUSER_SetSelection(data, 0); >+ >+ if (data->curcfg.quick_edit && PRIVATE(data)->has_selection) > { > PRIVATE(data)->has_selection = FALSE; >- WCUSER_SetSelection(data, 0); > } > else > { >@@ -1137,7 +1139,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND > } > break; > case WM_MOUSEMOVE: >- if (data->curcfg.quick_edit) >+ if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) > { > if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection && > (wParam & MK_LBUTTON)) >@@ -1151,14 +1153,13 @@ static LRESULT CALLBACK WCUSER_Proc(HWND > } > break; > case WM_LBUTTONUP: >- if (data->curcfg.quick_edit) >+ if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) > { > if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection && > (wParam& MK_LBUTTON)) > { > WCUSER_MoveSelection(data, PRIVATE(data)->selectPt1, WCUSER_GetCell(data, lParam)); > ReleaseCapture(); >- PRIVATE(data)->has_selection = FALSE; > > this looks suspicious to me ? how to do end the selection ? the only time you do it is when a second button down :-/ > } > } > else > > >------------------------------------------------------------------------ > > > >

2 5

Re: fix for the winemp3 module
by Mike McCormack Oct. 19, 2006

Oct. 19, 2006

Deun wrote: > Changelog by Denis Huguet (deun76(a)yahoo.com) > > * 2006/10/17 : > Major diff between winemp3's layer3.c file and the one from > MPlayer-1.0pre7try2/mp3lib/layer3.c for fixing decoding > glitches found out when opening mp3 file with GoldWave 4.21 > with wine-0.9.22 (same with 0.9.23) Hi Denis, That's a big change. It would be nicer to submit it piece by piece, fix by fix, clarifying which bug you are fixing and to get rid of the extraneous #if 0's and C++ comments. That would make regression analysis easier in case the patch introduces a bug. thanks, Mike

3 3

Bug #6439: requesting explanation of GDI_CheckNotLock in order to fix
by Alex Villacís Lasso Oct. 19, 2006

Oct. 19, 2006

I would like to draw attention to bug #6439 (http://bugs.winehq.org/show_bug.cgi?id=6439) in which Enterprise Architect 6.5 (trial version at http://www.sparxsystems.com.au/bin/easetup.exe) crashes with a debug assertion on _CheckNotSysLevel, as detailed in the bug report. From the winedbg trace, the inmediate cause of this debug assertion is the call of GDI_CheckNotLock() at the very start of CreateCompatibleDC(), when the stack of callers in the same thread have already taken references to GDI objects via GDI_GetObjPtr(). The basic question is: why is _CheckNotSysLevel required at CreateCompatibleDC()? What kind of damage might be caused by the removal of the check (in CreateCompatibleDC() and DeleteDC())? On Enterprise Architect, the removal of the assertions allow the app to load the sample file (EAExample.eap) correctly without crashing, and everything appears to work normally. -- The following cryptic message was allegedly found in the inner edge of a Windows XP installation CD: 4F6E65204F5320746F2072756C65207468656D20616C6C2C204F6E65204F5320746F2066696E6420 7468656D2C0D0A4F6E65204F5320746F206272696E67207468656D20616C6C20616E6420696E2074 6865206461726B6E6573732062696E64207468656D2E0A It is rumored that only a true Unix Wizard can decypher this mysterious message, which supposedly encodes the true nature and purpose of the software.

4 4

Re: [PATCH 11/31] oledlg: Initial management of private structure fordialog box control.
by Dmitry Timoshkov Oct. 19, 2006

Oct. 19, 2006

"Huw Davies" <huw(a)codeweavers.com> wrote: > case WM_COMMAND: > switch(LOWORD(wp)) > { > case IDOK: > case IDCANCEL: > + if(wp == IDOK) > + update_structure(hdlg, ps_struct); > EndDialog(hdlg, wp); > + free_structure(ps_struct); > return TRUE; > } Probably moving update_structure(hdlg, ps_struct); under case IDOK: with falling through then could help with avoiding not entirely correct 'if(wp == IDOK)' since it doesn't ignore high word of wp. -- Dmitry.

2 1

Re: [wined3d] windowed mode software cursor position (try 3)
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

"Karsten Elfenbein" <kelfe(a)gmx.de> writes: > @@ -175,6 +175,17 @@ static HRESULT WINAPI IWineD3DSwapChainI > /* DDBLT_KEYSRC will cause BltOverride to enable the alpha test with GL_NOTEQUAL, 0.0, > * which is exactly what we want :-) > */ > + if (This->presentParms.Windowed) { > + WINDOWPLACEMENT wpl; > + if (GetWindowPlacement(This->win_handle,&wpl)) { > + destRect.left -= wpl.rcNormalPosition.left; > + destRect.right -= wpl.rcNormalPosition.left; > + destRect.top -= wpl.rcNormalPosition.top; > + destRect.bottom -= wpl.rcNormalPosition.top; > + } else { > + FIXME("could not get window position for cursor position correction\n"); > + } GetWindowPlacement is not the right function to use. You probably want MapWindowPoints. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: progman: start programs in correct directories
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > @@ -274,11 +274,17 @@ VOID PROGRAM_ExecuteProgram(HLOCAL hProg > LPSTR lpszCmdLine = LocalLock(program->hCmdLine); > LPSTR lpszWorkDir = LocalLock(program->hWorkDir); > > - /* FIXME set working directory */ > - lpszWorkDir = lpszWorkDir; > + if (!SetCurrentDirectory(lpszWorkDir)) > + { > + MAIN_MessageBoxIDS_s(IDS_CHDIR_ERROR_s, lpszWorkDir, IDS_ERROR, > + MB_ICONEXCLAMATION | MB_OK); > + return; > + } > > WinExec(lpszCmdLine, program->nCmdShow); > - if (Globals.bMinOnRun) CloseWindow(Globals.hMainWnd); > + SetCurrentDirectory(Globals.szWindowsDirectory); > + if (Globals.bMinOnRun) > + CloseWindow(Globals.hMainWnd); It would be nicer to call CreateProcess with the correct directory argument instead of changing the current dir in the parent. -- Alexandre Julliard julliard(a)winehq.org

1 0