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

Re: progman: start programs in correct directories
by Alexandre Julliard 19 Oct '06

19 Oct '06

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

[wined3d] fix for BltOverride
by Karsten Elfenbein 19 Oct '06

19 Oct '06

This change for the non scaled BltOverride should allow correct usage of src and dest rect. So the content ends up where it is supposed to be. It is needed for a correct Frontbuffer capture while running in a window. (next mail)

2 1

Re: [Korean] Use the SUBLANG_NEUTRAL in Korean resources.
by Byeong-Sik Jeon 18 Oct '06

18 Oct '06

2006-10-19 (Wed), 07:39 +0900, Byeong-Sik Jeon wrote: > At [use SUBLANG_NEUTRAL in French resources], > 2006-10-18 (Wed), 20:47 +0200, Jonathan Ernst wrote: > > Thanks to Mikolaj Zalewski for spotting it. > > > It's great. > It's important. > This patch solves the some font problem for korean wine beginners. Oops. I'm sorry. This patch don't solve the some font problem. It was my rash testing...

2 1

[wined3d] GetFrontBufferData
by Karsten Elfenbein 18 Oct '06

18 Oct '06

This patch depends on the BltOverride change. It allows the apps to grab the FrontBufferData. (for screen captures) Todo: - implement a windowed mode switch Karsten

1 0

Re: wineconsole[3/6]: remove spaces from the ends of lines while copying to the clipboard
by Eric Pouech 18 Oct '06

18 Oct '06

Mikołaj Zalewski wrote: > This is very practical and matches the Windows behaviour > >------------------------------------------------------------------------ > >diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c >index e1efda2..557ccfc 100644 >--- a/programs/wineconsole/user.c >+++ b/programs/wineconsole/user.c >@@ -689,8 +689,15 @@ static void WCUSER_CopySelectionToClipbo > > for (y = 0; y < h; y++, c.Y++) > { >- ReadConsoleOutputCharacter(data->hConOut, &p[y * w], w - 1, c, NULL); >- p[y * w + w - 1] = (y < h - 1) ? '\n' : '\0'; >+ LPWSTR end; >+ ReadConsoleOutputCharacter(data->hConOut, p, w - 1, c, NULL); >+ >+ /* strip spaces from the end of the line */ >+ end = p + w - 1; >+ while (end > p && *(end - 1) == ' ') >+ end--; >+ *end = (y < h - 1) ? '\n' : '\0'; >+ p = end + 1; > } > GlobalUnlock(hMem); > SetClipboardData(CF_UNICODETEXT, hMem); > > >------------------------------------------------------------------------ > > > > did you check that this behavior is done for every mode of the console ? A+

2 2

Re: wineconsole[5/6]: when selection with the mouse, any key except for Enter should cancel the selection
by Eric Pouech 18 Oct '06

18 Oct '06

Mikołaj Zalewski wrote: > >------------------------------------------------------------------------ > >diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c >index c4250e5..19a1625 100644 >--- a/programs/wineconsole/user.c >+++ b/programs/wineconsole/user.c >@@ -705,6 +705,12 @@ static void WCUSER_CopySelectionToClipbo > CloseClipboard(); > } > >+static void WCUSER_EndSelection(const struct inner_data* data) >+{ >+ PRIVATE(data)->has_selection = FALSE; >+ WCUSER_SetSelection(data, 0); >+} >+ > /****************************************************************** > * WCUSER_PasteFromClipboard > * >@@ -935,15 +941,22 @@ static void WCUSER_HandleSelectionKey(st > > if (!down) return; > >+ if (PRIVATE(data)->mouse_selection) >+ { >+ if (state == 0 && wParam == VK_RETURN) >+ WCUSER_CopySelectionToClipboard(data); >+ WCUSER_EndSelection(data); >+ return; >+ } >+ > switch (state) > { > case 0: > switch (wParam) > { > case VK_RETURN: >- PRIVATE(data)->has_selection = FALSE; >- WCUSER_SetSelection(data, 0); > WCUSER_CopySelectionToClipboard(data); >+ WCUSER_EndSelection(data); > break; > case VK_RIGHT: > c1 = PRIVATE(data)->selectPt1; >@@ -1131,6 +1144,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND > SetCapture(PRIVATE(data)->hWnd); > WCUSER_SetSelection(data, 0); > PRIVATE(data)->has_selection = TRUE; >+ PRIVATE(data)->mouse_selection = TRUE; > } > } > else >@@ -1292,6 +1306,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND > PRIVATE(data)->selectPt2.X = PRIVATE(data)->selectPt2.Y = 0; > WCUSER_SetSelection(data, 0); > PRIVATE(data)->has_selection = TRUE; >+ PRIVATE(data)->mouse_selection = FALSE; > break; > case IDS_COPY: > if (PRIVATE(data)->has_selection) >diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h >index aa86338..1744fcd 100644 >--- a/programs/wineconsole/winecon_user.h >+++ b/programs/wineconsole/winecon_user.h >@@ -37,6 +37,7 @@ struct inner_data_user { > > HBITMAP cursor_bitmap; /* bitmap used for the caret */ > BOOL has_selection; /* an area is being selected (selectPt[12] are edges of the rect) */ >+ BOOL mouse_selection;/* the selection was made with a mouse */ > COORD selectPt1; /* start (and end) point of a mouse selection */ > COORD selectPt2; > }; > > >------------------------------------------------------------------------ > > > > as a principle, why do oppose keyboard selection to mouse selection looks to me you could in principle do both... so any key except return, arrow keys should end the selection and you woun't need the extraneous mouse_selection

2 1

compiling wine for amd64 on ubuntu dapper 6.06
by Gerald Britton 18 Oct '06

18 Oct '06

Hi -- I'm trying to get wine going on my ubuntu dapper installation on an amd 64 box. I have followed the wiki instructions in http://wiki.winehq.org/WineOn64bit for ubuntu and rechecked my work. Two things go wrong: 1. /configure can't find opengl, and produces these messages: configure: WARNING: Wine will be build without OpenGL or Direct3D support configure: WARNING: because something is wrong with the OpenGL setup: configure: WARNING: No OpenGL library found on this system. 2. make depend works, but make all fails with this: LD_LIBRARY_PATH="../../libs/wine:$LD_LIBRARY_PATH" ../../tools/wrc/wrc --nostdinc -I. -I. -I../../include -I../../include -I/usr/include/freetype2 -D__WINESRC__ -D_GDI32_ -foversion.res version.rc ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./gdi32.spec dispdib.spec.o gdi.exe.spec.o wing.spec.o bidi16.o dispdib.o env.o gdi16.o metafile16.o wing.o bidi.o bitblt.o bitmap.o brush.o clipping.o dc.o dib.o driver.o enhmetafile.o enhmfdrv/bitblt.o enhmfdrv/dc.o enhmfdrv/graphics.o enhmfdrv/init.o enhmfdrv/mapping.o enhmfdrv/objects.o font.o freetype.o gdi_main.o gdiobj.o icm.o mapping.o metafile.o mfdrv/bitblt.o mfdrv/dc.o mfdrv/graphics.o mfdrv/init.o mfdrv/mapping.o mfdrv/objects.o mfdrv/text.o painting.o palette.o path.o pen.o printdrv.o region.o version.res -o gdi32.dll.so -ladvapi32 -lkernel32 -lntdll /usr/lib/libsicuuc.a /usr/lib/libsicudata.a -lstdc++ -lgcc_s ../../libs/port/libwine_port.a -L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32 ld: Relocatable linking with relocations from format elf64-x86-64 (/usr/lib/libsicuuc.a(ubidi.ao)) to format elf32-i386 (gdi32.ArPHdq.o) is not supported winebuild: ld -m elf_i386 -r failed with status 256 winegcc: ../../tools/winebuild/winebuild failed. make[2]: *** [gdi32.dll.so] Error 2 make[2]: Leaving directory `/tmp/wine-0.9.22/dlls/gdi' make[1]: *** [gdi] Error 2 make[1]: Leaving directory `/tmp/wine-0.9.22/dlls' make: *** [dlls] Error 2 I'm not sure what to do now. Any feedback/suggestions would be appreciated.

4 6

Re: user [2/2]: add GetRawInputDeviceList stub (try 3)
by Detlef Riekenberg 18 Oct '06

18 Oct '06

On Mi, 2006-10-18 at 10:35 +0000, L. Rahyen wrote: > + > +UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST > pRawInputDeviceList, PUINT puiNumDevices, UINT cbSize) > +{ > + memset(pRawInputDeviceList, 0, sizeof *pRawInputDeviceList); > + *puiNumDevices = 0; > + FIXME("stub\n"); > + return 0; > +} The FIXME should be the first code in the stub and is not informative. I suggest to use: FIXME("(%p, %p, %u) stub\n", pRawInputDeviceList, puiNumDevices, cbSize); When a different App use NULL for pRawInputDeviceList (documented on MSDN as a vaild Parameter) or puiNumDevices, your stub will still crash, but the FIXME give a usable hint, where to look. A small Test will help to make a real Implementation. > -# @ stub GetRawInputDeviceList > +@ stdcall GetRawInputDeviceList(ptr long long) The second Parameter is used as "ptr" -- By by ... Detlef

2 1

d3d8: GetDepthStencilSurface/GetRenderTarget refcount issue
by Markus Amsler 18 Oct '06

18 Oct '06

I'm trying to solve bug 5872 http://bugs.winehq.org/show_bug.cgi?id=5872 BF1942 calls GetDepthStencilSurface/IUnknown_Release and checks the refcount to be 0, but wine returns 1. (test hack attached) I have done some testing: The first call to GetDepthStencilSurface increases the refcount of the device, any subsequent call increases the refcount of the surface. On release calls the refcount of the surface gets decreased. If the refcount is 1 the release call decreases the surface refcount AND the device refcount. The exact same behaviour shows GetRenderTarget. d3d9 does also the same. Any ideas how we should implement this behaviour? Markus diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e735502..3ad8ca0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <d3d8.h> #include <dxerr8.h> #include "wine/test.h" +#include <stdio.h> static IDirect3D8 *(WINAPI *pDirect3DCreate8)(UINT); @@ -183,6 +184,8 @@ static void test_refcount(void) D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm; int refcount = 0, tmp; + IDirect3DSurface8 *pRenderTarget2 = NULL; + IDirect3DSurface8 *pStencilSurface2 = NULL; DWORD decl[] = { @@ -217,6 +220,8 @@ static void test_refcount(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -226,6 +231,41 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + printf("hr=%x refDevice=%d\n\n", hr, refcount); + + hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface2); + printf("hr=%x refSurface=%d\n", hr, get_refcount( (IUnknown *)pStencilSurface2) ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface2); + printf("hr=%x refSurface=%d\n", hr, get_refcount( (IUnknown *)pStencilSurface2) ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget2); + printf("hr=%x refTarget=%d\n", hr, get_refcount( (IUnknown *)pRenderTarget2) ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget2); + printf("hr=%x refTarget=%d\n", hr, get_refcount( (IUnknown *)pRenderTarget2) ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + refcount = IUnknown_Release(pRenderTarget2); + printf("hr=%x refTarget=%d\n", hr, refcount ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + refcount = IUnknown_Release(pRenderTarget2); + printf("hr=%x refTarget=%d\n", hr, refcount ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + refcount = IUnknown_Release(pStencilSurface2); + printf("hr=%x refSurface=%d\n", hr, refcount ); + printf("hr=%x refDevice=%d\n\n", hr, get_refcount( (IUnknown *)pDevice) ); + + refcount = IUnknown_Release(pStencilSurface2); + printf("hr=%x refSurface=%d\n", hr, refcount ); + printf("hr=%x refDevice=%d\n", hr, get_refcount( (IUnknown *)pDevice) ); + return; + /* Buffers */ hr = IDirect3DDevice8_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount ); @@ -316,6 +356,6 @@ START_TEST(device) if (pDirect3DCreate8) { test_refcount(); - test_swapchain(); +// test_swapchain(); } }

3 5

Mouse woes and luck of interest
by Vitaliy Margolen 18 Oct '06

18 Oct '06

As you know Wine has number of problems with it's mouse handling. Just enough to look at the bugzilla to see how many programs affected. After spending several weeks trying to find and fix this problems I in the dead-end now. Most of Wines problems coming from the way Wine receives and handles it's mouse events. On windows mouse events generated by the mouse driver itself and the mouse pointer just another "user" of these events. Wine works backwards - from mouse pointer. In short we have 3 major problems that needs to be fixed: 1. GetCursorPos() have to return old (cached) cursor position inside hook handler. 2. Any changes to the cursor position inside hook handler will be lost after all hooks are handled. 3. Mouse move events generated event when pointer is "stuck" at the edge of the screen. 4. Hook handler can see mouse events that happen anywhere not just in application's window(s). 1) used by number of programs to generate relative mouse movements. Using this might be the only way to fix mouse warping problems in dinput. There is no other way to know if application itself set new cursor position. 2) this is more of the consequence of 1). I have a simple test to prove it. 3) most games don't warp mouse pointer themselves because there is no need for that. We have to do it because of this and next problem. 4) it's a limitation of X that forces us to do mouse warping. That brings lots of other problems that is pretty hard to deal with. Does anyone have any additional ideas suggestions and comments for my patches that I have submitted to fix these problems? Or no one really cares about having working mouse? It's been broken this way for number of years now and the only "fix" people attempted to submit was move of "MOUSE_HACK" from define into registry. Yet I haven't seen a single person commenting on these patches. And as usual I have a misunderstanding with Alexandre about this patches. I can't understand what other testes required to prove that what we have is not correct then attached test? It's simple and straight forward test for 1) and 2). I do understand Alexandre's concern that some parts create a 'race condition' but it is not clear to me how can it happen nor how else to archive the same results. x11drv fixes: [1] http://winehq.org/pipermail/wine-patches/2006-October/031772.html [2] http://winehq.org/pipermail/wine-patches/2006-October/031773.html [3] http://winehq.org/pipermail/wine-patches/2006-October/031774.html x11drv, dinput and wined3d changes [1] http://winehq.org/pipermail/wine-patches/2006-October/031305.html [2] http://winehq.org/pipermail/wine-patches/2006-October/031309.html [3] http://winehq.org/pipermail/wine-patches/2006-October/031306.html [4] http://winehq.org/pipermail/wine-patches/2006-October/031307.html [5] http://winehq.org/pipermail/wine-patches/2006-October/031308.html Vitaliy Margolen. #include <windows.h> #include <stdio.h> static POINT last_hook_pos; LRESULT CALLBACK hook_proc( int code, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; POINT pt; if (code == HC_ACTION) { GetCursorPos(&pt); if (pt.x != last_hook_pos.x || pt.y != last_hook_pos.y) fprintf(stderr, "(%ld %ld) != (%ld %ld)\n", pt.x, pt.y, last_hook_pos.x, last_hook_pos.y); last_hook_pos = hook->pt; SetCursorPos(pt.x+10, pt.y+10); } return CallNextHookEx( 0, code, wparam, lparam ); } static DWORD wnd_proc(void) { MSG msg; while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } return msg.wParam; } LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { POINT pt; switch (message) { case WM_DESTROY: PostQuitMessage(0); return; case WM_MOUSEMOVE: GetCursorPos(&pt); if (pt.x != last_hook_pos.x || pt.y != last_hook_pos.y) fprintf(stderr, "MSG: (%ld %ld) != (%ld %ld)\n", pt.x, pt.y, last_hook_pos.x, last_hook_pos.y); break; } return DefWindowProc(hWnd, message, wParam, lParam); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { WNDCLASSEX wcex; HWND hwnd; HHOOK hook; memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = (WNDPROC)WndProc; wcex.hInstance = hInstance; wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.lpszClassName = "MainWindow"; RegisterClassEx(&wcex); hwnd = CreateWindow("MainWindow", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ShowWindow(hwnd, SW_SHOW); GetCursorPos(&last_hook_pos); hook = SetWindowsHookExA(WH_MOUSE_LL, hook_proc, hInstance, 0); wnd_proc(); UnhookWindowsHookEx(hook); DestroyWindow(hwnd); return 0; }

4 6