April 2008 - Wine-commits - list.winehq.org

Vitaly Perov : cabinet: Added a test for FDICopy with an empty cabinet file .
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 1077238143911d10650eb6ee9f0fa3e269ae7eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1077238143911d10650eb6ee9… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Apr 24 18:13:32 2008 +0400 cabinet: Added a test for FDICopy with an empty cabinet file. --- dlls/cabinet/tests/fdi.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 18745f2..bedcfa6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -593,9 +593,54 @@ static void test_FDIIsCabinet(void) delete_test_files(); } + +INT_PTR __cdecl CopyProgress (FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +{ + return 0; +} + +static void test_FDICopy(void) +{ + CCAB cabParams; + HFDI hfdi; + HFCI hfci; + ERF erf; + BOOL ret; + char name[] = "extract.cab"; + char path[MAX_PATH + 1]; + + GetCurrentDirectoryA(MAX_PATH, path); + + set_cab_parameters(&cabParams); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, + fci_delete, get_temp_file, &cabParams, NULL); + + ret = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(ret, "Failed to flush the cabinet\n"); + + FCIDestroy(hfci); + + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, + fdi_write, fdi_close, fdi_seek, + cpuUNKNOWN, &erf); + + ret=FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); + todo_wine + { + ok(ret, "Expected FDICopy to succeed\n"); + } + + FDIDestroy(hfdi); + DeleteFileA(name); +} + + START_TEST(fdi) { test_FDICreate(); test_FDIDestroy(); test_FDIIsCabinet(); + test_FDICopy(); }

1 0

Vitaliy Margolen : dinput: Limit number of supported axis and buttons.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: f51e0e2d26eb7909137c7c4b20a71a1993a81138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51e0e2d26eb7909137c7c4b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Apr 24 09:04:11 2008 -0600 dinput: Limit number of supported axis and buttons. --- dlls/dinput/joystick_linux.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5e87a02..46ce4ce 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -422,6 +422,19 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } #endif + if (newDevice->axes > 16) + { + /* There are 24 more axes for velocity that we can use */ + FIXME("Can't support %d axes. Clamping down to 16\n", newDevice->axes); + newDevice->axes = 16; + } + + if (newDevice->buttons > 128) + { + WARN("Can't support %d buttons. Clamping down to 128\n", newDevice->buttons); + newDevice->buttons = 128; + } + newDevice->base.lpVtbl = jvt; newDevice->base.ref = 1; newDevice->base.dinput = dinput;

1 0

Kusanagi Kouichi : imm32: Fix typos.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 9b560b5de8c28d63df5814e6716747e4146cc8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b560b5de8c28d63df5814e67… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 25 16:14:59 2008 +0900 imm32: Fix typos. --- dlls/imm32/imm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1f20e42..f89dd2a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -818,7 +818,7 @@ LONG WINAPI ImmGetCompositionStringA( { LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - TRACE("GSC_RESULTSTR %p %i\n",ResultStr, + TRACE("GCS_RESULTSTR %p %i\n",ResultStr, compstr->dwResultStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwResultStrLen * 3 ); @@ -835,7 +835,7 @@ LONG WINAPI ImmGetCompositionStringA( { LPWSTR CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - TRACE("GSC_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); + TRACE("GCS_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwCompStrLen * 3 ); rc = WideCharToMultiByte(CP_ACP, 0, CompString, @@ -849,7 +849,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwCompAttrOffset > 0) { LPWSTR Compattr = (LPWSTR)(compdata + compstr->dwCompAttrOffset); - TRACE("GSC_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); + TRACE("GCS_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); rc = compstr->dwCompAttrLen; if (dwBufLen >= rc) @@ -859,7 +859,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwCompClauseOffset > 0) { LPWSTR Compclause = (LPWSTR)(compdata + compstr->dwCompClauseOffset); - TRACE("GSC_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); + TRACE("GCS_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); rc = compstr->dwCompClauseLen; if (dwBufLen >= compstr->dwCompClauseLen) @@ -869,7 +869,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwResultClauseOffset > 0) { LPWSTR Resultclause = (LPWSTR)(compdata + compstr->dwResultClauseOffset); - TRACE("GSC_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); + TRACE("GCS_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); rc = compstr->dwResultClauseLen; if (dwBufLen >= compstr->dwResultClauseLen) @@ -877,7 +877,7 @@ LONG WINAPI ImmGetCompositionStringA( } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GSC_CURSORPOS\n"); + TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART) @@ -975,7 +975,7 @@ LONG WINAPI ImmGetCompositionStringW( } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GSC_CURSORPOS\n"); + TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART)

1 0

Lei Zhang : user32: Edit controls should ignore WM_KEYDOWN on control + enter.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ae1b735547857fd8473b7d01c6be1ee586807e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1b735547857fd8473b7d01c… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 24 22:17:38 2008 -0700 user32: Edit controls should ignore WM_KEYDOWN on control + enter. --- dlls/user32/edit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4c0342b..b58dc96 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4606,6 +4606,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) DWORD dw; if (!EDIT_IsInsideDialog(es)) return 1; + if (control) break; hwndParent = GetParent(es->hwndSelf); dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); if (HIWORD(dw) == DC_HASDEFID)

1 0

Kusanagi Kouichi : winex11: Destroy the handle to the composition string after it is cancelled.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 4f2330ac0c951ec5fb05e2fb152c59723c3af336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2330ac0c951ec5fb05e2fb1… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 25 12:08:24 2008 +0900 winex11: Destroy the handle to the composition string after it is cancelled. --- dlls/winex11.drv/ime.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 6614213..f50549f 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -775,6 +775,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) X11DRV_ForceXIMReset(lpIMC->hWnd); + if (lpIMC->hCompStr) + { + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = NULL; + } + myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition) {

1 0

James Hawkins : kernel32: Fix a test that fails in win2k3.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ed714d09b70f3945386e3cb3118add0874fe2b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed714d09b70f3945386e3cb31… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 22:50:45 2008 -0500 kernel32: Fix a test that fails in win2k3. --- dlls/kernel32/tests/sync.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 61b8521..b5778fc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -370,11 +370,17 @@ static void test_iocp_callback(void) ret = DeleteFileA(filename); ok( ret, "DeleteFileA: error %d\n", GetLastError()); + /* win2k3 requires the Flags parameter to be zero */ + SetLastError(0xdeadbeef); hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); retb = p_BindIoCompletionCallback(hFile, iocp_callback, 12345); - ok(retb == TRUE, "BindIoCompletionCallback failed with Flags != 0\n"); + if (!retb) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + else + ok(retb == TRUE, "BindIoCompletionCallback failed with Flags != 0\n"); ret = CloseHandle(hFile); ok( ret, "CloseHandle: error %d\n", GetLastError()); ret = DeleteFileA(filename);

1 0

James Hawkins : ddraw: Fix tests that fail with the reference rasterizer.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 2f97a71e36cb62f035415a44da7f5311a6903bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f97a71e36cb62f035415a44d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 22:38:40 2008 -0500 ddraw: Fix tests that fail with the reference rasterizer. --- dlls/ddraw/tests/dsurface.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index dded991..42c23a4 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1218,6 +1218,7 @@ static void AttachmentTest(void) IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; DDSURFACEDESC ddsd; DDSCAPS caps = {DDSCAPS_TEXTURE}; + BOOL refrast = FALSE; HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); memset(&ddsd, 0, sizeof(ddsd)); @@ -1269,21 +1270,41 @@ static void AttachmentTest(void) hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &surface4, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + if (SUCCEEDED(IDirectDrawSurface7_AddAttachedSurface(surface1, surface4))) + refrast = TRUE; + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface1); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface1); + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface3, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface3); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 32x32 texture mip level to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface3); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface2, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface2); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 64x64 texture sublevel to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface2);

1 0

Alistair Leslie-Hughes : msxml3: Corrected transformNode.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 42db8b439fcd75d53fbd06f170e460dae92e1461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db8b439fcd75d53fbd06f17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 24 22:22:14 2008 +1000 msxml3: Corrected transformNode. --- dlls/msxml3/node.c | 44 +++++++++++++++++++++++++++++++++----------- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++++++----- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 246598d..f67a9f9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -44,6 +44,10 @@ # include <libxslt/xsltInternals.h> #endif +#ifdef HAVE_LIBXML2 +# include <libxml/HTMLtree.h> +#endif + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1065,21 +1069,39 @@ static HRESULT WINAPI xmlnode_transformNode( result = xsltApplyStylesheet(xsltSS, This->node->doc, NULL); if(result) { - xmlBufferPtr pXmlBuf; - int nSize; + const xmlChar *pContent; - pXmlBuf = xmlBufferCreate(); - if(pXmlBuf) + if(result->type == XML_HTML_DOCUMENT_NODE) { - nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); - if(nSize > 0) + xmlOutputBufferPtr pOutput = xmlAllocOutputBuffer(NULL); + if(pOutput) { - const xmlChar *pContent; - - pContent = xmlBufferContent(pXmlBuf); - *xmlString = bstr_from_xmlChar(pContent); + htmlDocContentDumpOutput(pOutput, result->doc, NULL); + if(pOutput) + { + pContent = xmlBufferContent(pOutput->buffer); + *xmlString = bstr_from_xmlChar(pContent); + } + + xmlOutputBufferClose(pOutput); + } + } + else + { + xmlBufferPtr pXmlBuf; + int nSize; - xmlBufferFree(pXmlBuf); + pXmlBuf = xmlBufferCreate(); + if(pXmlBuf) + { + nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); + if(nSize > 0) + { + pContent = xmlBufferContent(pXmlBuf); + *xmlString = bstr_from_xmlChar(pContent); + + xmlBufferFree(pXmlBuf); + } } } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9d84435..072ed2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -143,10 +143,9 @@ static const CHAR szTransformSSXML[] = "</xsl:stylesheet>"; static const CHAR szTransformOutput[] = -"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" -"<html><body><h1>\n" -"Hello World\n" -"</h1></body></html>\n"; +"<html><body><h1>" +"Hello World" +"</h1></body></html>"; static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 @@ -242,6 +241,19 @@ static VARIANT _variantbstr_(const char *str) return v; } +static BOOL compareIgnoreReturns(BSTR sLeft, BSTR sRight) +{ + for (;;) + { + while (*sLeft == '\r' || *sLeft == '\n') sLeft++; + while (*sRight == '\r' || *sRight == '\n') sRight++; + if (*sLeft != *sRight) return FALSE; + if (!*sLeft) return TRUE; + sLeft++; + sRight++; + } +} + static void get_str_for_type(DOMNodeType type, char *buf) { switch (type) @@ -3193,7 +3205,7 @@ static void test_testTransforms(void) hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( bOut, _bstr_(szTransformOutput) ), "Stylesheet output not correct\n"); + ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); IXMLDOMNode_Release(pNode); }

1 0

Jeff Zaroyko : msadp32.acm: Use the same szShortName value as windows.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 9c8c33006e53ecd3e7bfb1932313a1f7c9f13999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c33006e53ecd3e7bfb1932… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Apr 25 15:22:17 2008 +1000 msadp32.acm: Use the same szShortName value as windows. --- dlls/msadp32.acm/msadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 4918836..5a0a964 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -326,7 +326,7 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 2; /* PCM, MS ADPCM */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-MS ADPCM", -1, + MultiByteToWideChar( CP_ACP, 0, "MS-ADPCM", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine MS ADPCM converter", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );

1 0

Alexandre Julliard : winecfg: Allow to configure the desktop separately for each application.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: f0bd1ee70b3affcc822f1d508f5c602040b63f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bd1ee70b3affcc822f1d508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:36:45 2008 +0200 winecfg: Allow to configure the desktop separately for each application. --- programs/winecfg/x11drvdlg.c | 119 ++++++++++++++++++++++------------------- 1 files changed, 64 insertions(+), 55 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index c0ec058..ce54924 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <windows.h> +#include <wine/unicode.h> #include <wine/debug.h> #include "resource.h" @@ -45,6 +46,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; +static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; +static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; +static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; +static const WCHAR explorer_desktopsW[] = {'E','x','p','l','o','r','e','r','\\', + 'D','e','s','k','t','o','p','s',0}; +static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0}; +static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0}; + + static struct SHADERMODE { UINT displayStrID; @@ -58,64 +68,55 @@ static struct SHADERMODE int updating_ui; -static void update_gui_for_desktop_mode(HWND dialog) { - int desktopenabled = FALSE; +/* convert the x11 desktop key to the new explorer config */ +static void convert_x11_desktop_key(void) +{ + char *buf; + + if (!(buf = get_reg_key(config_key, "X11 Driver", "Desktop", NULL))) return; + set_reg_key(config_key, "Explorer\\Desktops", "Default", buf); + set_reg_key(config_key, "Explorer", "Desktop", "Default"); + set_reg_key(config_key, "X11 Driver", "Desktop", NULL); + HeapFree(GetProcessHeap(), 0, buf); +} + +static void update_gui_for_desktop_mode(HWND dialog) +{ + WCHAR *buf, *bufindex; + const WCHAR *desktop_name = current_app ? current_app : defaultW; WINE_TRACE("\n"); updating_ui = TRUE; - if (current_app) + buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); + if (buf && (bufindex = strchrW(buf, 'x'))) { - disable(IDC_ENABLE_DESKTOP); - disable(IDC_DESKTOP_WIDTH); - disable(IDC_DESKTOP_HEIGHT); - disable(IDC_DESKTOP_SIZE); - disable(IDC_DESKTOP_BY); - return; + *bufindex = 0; + ++bufindex; + SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); + SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); + } else { + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); } - enable(IDC_ENABLE_DESKTOP); + HeapFree(GetProcessHeap(), 0, buf); /* do we have desktop mode enabled? */ - if (reg_key_exists(config_key, keypath("X11 Driver"), "Desktop")) + if (reg_key_exists(config_key, keypath("Explorer"), "Desktop")) { - char* buf, *bufindex; CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED); - - buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "800x600"); - /* note: this test must match the one in x11drv */ - if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f' - && buf[0] != '0') { - desktopenabled = TRUE; - enable(IDC_DESKTOP_WIDTH); - enable(IDC_DESKTOP_HEIGHT); - enable(IDC_DESKTOP_SIZE); - enable(IDC_DESKTOP_BY); - - bufindex = strchr(buf, 'x'); - if (bufindex) { - *bufindex = 0; - ++bufindex; - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); - } else { - WINE_TRACE("Desktop registry entry is malformed\n"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); - } - } - HeapFree(GetProcessHeap(), 0, buf); + enable(IDC_DESKTOP_WIDTH); + enable(IDC_DESKTOP_HEIGHT); + enable(IDC_DESKTOP_SIZE); + enable(IDC_DESKTOP_BY); } - if (!desktopenabled) + else { CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_UNCHECKED); - disable(IDC_DESKTOP_WIDTH); disable(IDC_DESKTOP_HEIGHT); disable(IDC_DESKTOP_SIZE); disable(IDC_DESKTOP_BY); - - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), ""); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), ""); } updating_ui = FALSE; @@ -126,6 +127,7 @@ static void init_dialog(HWND dialog) unsigned int it; char* buf; + convert_x11_desktop_key(); update_gui_for_desktop_mode(dialog); updating_ui = TRUE; @@ -182,30 +184,37 @@ static void init_dialog(HWND dialog) updating_ui = FALSE; } -static void set_from_desktop_edits(HWND dialog) { - char *width, *height, *new; +static void set_from_desktop_edits(HWND dialog) +{ + static const WCHAR x[] = {'x',0}; + static const WCHAR def_width[] = {'8','0','0',0}; + static const WCHAR def_height[] = {'6','0','0',0}; + WCHAR *width, *height, *new; + const WCHAR *desktop_name = current_app ? current_app : defaultW; if (updating_ui) return; WINE_TRACE("\n"); - width = get_text(dialog, IDC_DESKTOP_WIDTH); - height = get_text(dialog, IDC_DESKTOP_HEIGHT); + width = get_textW(dialog, IDC_DESKTOP_WIDTH); + height = get_textW(dialog, IDC_DESKTOP_HEIGHT); - if (width == NULL || strcmp(width, "") == 0) { + if (!width || !width[0]) { HeapFree(GetProcessHeap(), 0, width); - width = strdupA("800"); + width = strdupW(def_width); } - - if (height == NULL || strcmp(height, "") == 0) { + if (!height || !height[0]) { HeapFree(GetProcessHeap(), 0, height); - height = strdupA("600"); + height = strdupW(def_height); } - new = HeapAlloc(GetProcessHeap(), 0, strlen(width) + strlen(height) + 2 /* x + terminator */); - sprintf(new, "%sx%s", width, height); - set_reg_key(config_key, keypath("X11 Driver"), "Desktop", new); - + new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); + strcpyW( new, width ); + strcatW( new, x ); + strcatW( new, height ); + set_reg_keyW(config_key, explorer_desktopsW, desktop_name, new); + set_reg_keyW(config_key, keypathW(explorerW), desktopW, desktop_name); + HeapFree(GetProcessHeap(), 0, width); HeapFree(GetProcessHeap(), 0, height); HeapFree(GetProcessHeap(), 0, new); @@ -217,7 +226,7 @@ static void on_enable_desktop_clicked(HWND dialog) { if (IsDlgButtonChecked(dialog, IDC_ENABLE_DESKTOP) == BST_CHECKED) { set_from_desktop_edits(dialog); } else { - set_reg_key(config_key, keypath("X11 Driver"), "Desktop", NULL); + set_reg_key(config_key, keypath("Explorer"), "Desktop", NULL); } update_gui_for_desktop_mode(dialog);

1 0