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

Stefan Dösinger : wined3d: Store the private data in IWineD3DResource::SetPrivateData.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: edfe5d68eea3cf04f58674c1af631d2a502359de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edfe5d68eea3cf04f58674c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 12 00:09:13 2006 +0200 wined3d: Store the private data in IWineD3DResource::SetPrivateData. --- dlls/wined3d/resource.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 78537e8..be43046 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -126,6 +126,8 @@ HRESULT WINAPI IWineD3DResourceImpl_SetP HeapFree(GetProcessHeap(), 0, *data); return E_OUTOFMEMORY; } + (*data)->size = SizeOfData; + memcpy((*data)->ptr.data, pData, SizeOfData); } /* link it in */ (*data)->next = This->resource.privateData;

1 0

Peter Oberndorfer : shlwapi: Add tests for PathMatchSpec.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 759324a20c97066397345e94f9816ee7a486a1d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=759324a20c97066397345e9… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Apr 11 18:55:25 2006 +0000 shlwapi: Add tests for PathMatchSpec. --- dlls/shlwapi/tests/path.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index aa0a519..d7c7e00 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -829,6 +829,39 @@ static void test_PathMakePretty(void) ok (strcmp(buff, "Test") == 0, "PathMakePretty: 1st char lowercased %s\n", buff); } +static void test_PathMatchSpec(void) +{ + static const char file[] = "c:\\foo\\bar\\filename.ext"; + static const char spec1[] = ".ext"; + static const char spec2[] = "*.ext"; + static const char spec3[] = "*.ext "; + static const char spec4[] = " *.ext"; + static const char spec5[] = "* .ext"; + static const char spec6[] = "*. ext"; + static const char spec7[] = "* . ext"; + static const char spec8[] = "*.e?t"; + static const char spec9[] = "filename.ext"; + static const char spec10[] = "*bar\\filename.ext"; + static const char spec11[] = " foo; *.ext"; + static const char spec12[] = "*.ext;*.bar"; + static const char spec13[] = "*bar*"; + + ok (PathMatchSpecA(file, spec1) == FALSE, "PathMatchSpec: Spec1 failed\n"); + ok (PathMatchSpecA(file, spec2) == TRUE, "PathMatchSpec: Spec2 failed\n"); + ok (PathMatchSpecA(file, spec3) == FALSE, "PathMatchSpec: Spec3 failed\n"); + todo_wine ok (PathMatchSpecA(file, spec4) == TRUE, "PathMatchSpec: Spec4 failed\n"); + todo_wine ok (PathMatchSpecA(file, spec5) == TRUE, "PathMatchSpec: Spec5 failed\n"); + todo_wine ok (PathMatchSpecA(file, spec6) == TRUE, "PathMatchSpec: Spec6 failed\n"); + ok (PathMatchSpecA(file, spec7) == FALSE, "PathMatchSpec: Spec7 failed\n"); + ok (PathMatchSpecA(file, spec8) == TRUE, "PathMatchSpec: Spec8 failed\n"); + ok (PathMatchSpecA(file, spec9) == FALSE, "PathMatchSpec: Spec9 failed\n"); + ok (PathMatchSpecA(file, spec10) == TRUE, "PathMatchSpec: Spec10 failed\n"); + ok (PathMatchSpecA(file, spec11) == TRUE, "PathMatchSpec: Spec11 failed\n"); + ok (PathMatchSpecA(file, spec12) == TRUE, "PathMatchSpec: Spec12 failed\n"); + ok (PathMatchSpecA(file, spec13) == TRUE, "PathMatchSpec: Spec13 failed\n"); +} + + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -846,8 +879,9 @@ START_TEST(path) test_PathSearchAndQualify(); test_PathCreateFromUrl(); test_PathIsUrl(); - + test_PathMakePretty(); + test_PathMatchSpec(); /* For whatever reason, PathIsValidCharA and PathAppendA share the same * ordinal number in some native versions. Check this to prevent a crash.

1 0

Peter Oberndorfer : shlwapi: Ignore leading spaces in PathMatchSpec.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: ac0bee4bf21debd8ef31f8a576b2cac1f6ccf22d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac0bee4bf21debd8ef31f8a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Apr 11 19:17:52 2006 +0000 shlwapi: Ignore leading spaces in PathMatchSpec. --- dlls/shlwapi/path.c | 18 ++++++++---------- dlls/shlwapi/tests/path.c | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 2ce3445..76e3c6a 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1869,18 +1869,17 @@ BOOL WINAPI PathMatchSpecA(LPCSTR lpszPa while (*lpszMask) { + while (*lpszMask == ' ') + lpszMask++; /* Eat leading spaces */ + if (PathMatchSingleMaskA(lpszPath, lpszMask)) return TRUE; /* Matches the current mask */ while (*lpszMask && *lpszMask != ';') - lpszMask = CharNextA(lpszMask); + lpszMask = CharNextA(lpszMask); /* masks separated by ';' */ if (*lpszMask == ';') - { lpszMask++; - while (*lpszMask == ' ') - lpszMask++; /* masks may be separated by "; " */ - } } return FALSE; } @@ -1901,18 +1900,17 @@ BOOL WINAPI PathMatchSpecW(LPCWSTR lpszP while (*lpszMask) { + while (*lpszMask == ' ') + lpszMask++; /* Eat leading spaces */ + if (PathMatchSingleMaskW(lpszPath, lpszMask)) return TRUE; /* Matches the current path */ while (*lpszMask && *lpszMask != ';') - lpszMask++; + lpszMask++; /* masks separated by ';' */ if (*lpszMask == ';') - { lpszMask++; - while (*lpszMask == ' ') - lpszMask++; /* Masks may be separated by "; " */ - } } return FALSE; } diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index d7c7e00..2a89618 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -849,7 +849,7 @@ static void test_PathMatchSpec(void) ok (PathMatchSpecA(file, spec1) == FALSE, "PathMatchSpec: Spec1 failed\n"); ok (PathMatchSpecA(file, spec2) == TRUE, "PathMatchSpec: Spec2 failed\n"); ok (PathMatchSpecA(file, spec3) == FALSE, "PathMatchSpec: Spec3 failed\n"); - todo_wine ok (PathMatchSpecA(file, spec4) == TRUE, "PathMatchSpec: Spec4 failed\n"); + ok (PathMatchSpecA(file, spec4) == TRUE, "PathMatchSpec: Spec4 failed\n"); todo_wine ok (PathMatchSpecA(file, spec5) == TRUE, "PathMatchSpec: Spec5 failed\n"); todo_wine ok (PathMatchSpecA(file, spec6) == TRUE, "PathMatchSpec: Spec6 failed\n"); ok (PathMatchSpecA(file, spec7) == FALSE, "PathMatchSpec: Spec7 failed\n");

1 0

Phil Krylov : riched20: Allow inheriting table cell definitions from previous table row.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 4e796854afd374833a232bc68a45ca1a89a2c119 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e796854afd374833a232bc… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Wed Apr 12 02:00:01 2006 +0400 riched20: Allow inheriting table cell definitions from previous table row. Allow inheriting of table cell definitions from a previous table row when the current table row does not contain a \trowd, only an \intbl. --- dlls/riched20/editor.c | 3 +++ dlls/riched20/para.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bcb2a5c..3bc27a4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -488,6 +488,9 @@ static void ME_RTFTblAttrHook(RTF_Info * RTFFlushOutputBuffer(info); para = ME_GetParagraph(info->editor->pCursors[0].pRun); + /* Release possibly inherited cell definitions */ + ME_DestroyTableCellList(para); + para->member.para.pCells = ALLOC_OBJ(ME_TableCell); para->member.para.pCells->nRightBoundary = 0; para->member.para.pCells->next = NULL; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 174514e..d08bb80 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -136,8 +136,26 @@ ME_DisplayItem *ME_SplitParagraph(ME_Tex new_para->member.para.nFirstMargin = run_para->member.para.nFirstMargin; new_para->member.para.bTable = run_para->member.para.bTable; + + /* Inherit previous cell definitions if any */ new_para->member.para.pCells = NULL; + if (run_para->member.para.pCells) + { + ME_TableCell *pCell, *pNewCell; + for (pCell = run_para->member.para.pCells; pCell; pCell = pCell->next) + { + pNewCell = ALLOC_OBJ(ME_TableCell); + pNewCell->nRightBoundary = pCell->nRightBoundary; + pNewCell->next = NULL; + if (new_para->member.para.pCells) + new_para->member.para.pLastCell->next = pNewCell; + else + new_para->member.para.pCells = pNewCell; + new_para->member.para.pLastCell = pNewCell; + } + } + /* fix paragraph properties. FIXME only needed when called from RTF reader */ if (run_para->member.para.pCells && !run_para->member.para.bTable) {

1 0

Peter Oberndorfer : gdi: Write out glyph count correctly in GetCharacterPlacementA.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: e1f74ad5c7a7ca61c04e12272d32530391844d98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1f74ad5c7a7ca61c04e122… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Apr 11 19:25:44 2006 +0000 gdi: Write out glyph count correctly in GetCharacterPlacementA. --- dlls/gdi/font.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 1e17d5a..31825e4 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2673,6 +2673,9 @@ GetCharacterPlacementA(HDC hdc, LPCSTR l ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); + lpResults->nGlyphs = resultsW.nGlyphs; + lpResults->nMaxFit = resultsW.nMaxFit; + if(lpResults->lpOutString) { WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, lpResults->lpOutString, uCount, NULL, NULL );

1 0

Peter Oberndorfer : gdi: Do not convert string paramter when rendering glyph indexes.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 1ed3382438de2d77cf1b66c05e550375506d0b87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ed3382438de2d77cf1b66c… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Apr 11 19:20:52 2006 +0000 gdi: Do not convert string paramter when rendering glyph indexes. --- dlls/gdi/font.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 31825e4..adc7e97 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1676,10 +1676,15 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, { INT wlen; UINT codepage; - LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, &codepage); + LPWSTR p; BOOL ret; LPINT lpDxW = NULL; + if (flags & ETO_GLYPH_INDEX) + return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); + + p = FONT_mbtowc(hdc, str, count, &wlen, &codepage); + if (lpDx) { unsigned int i = 0, j = 0;

1 0

lostwages/wwn wn20060324_309.xml wn20060402_31 ...
by Jeremy Newman 11 Apr '06

11 Apr '06

ChangeSet ID: 24168 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/11 09:20:43 Modified files: wwn : wn20060324_309.xml wn20060402_310.xml Log message: Francois Gouget <fgouget(a)free.fr> Spelling fixes Patch: http://cvs.winehq.org/patch.py?id=24168 Old revision New revision Changes Path 1.2 1.3 +10 -11 lostwages/wwn/wn20060324_309.xml 1.2 1.3 +7 -7 lostwages/wwn/wn20060402_310.xml Index: lostwages/wwn/wn20060324_309.xml diff -u -p lostwages/wwn/wn20060324_309.xml:1.2 lostwages/wwn/wn20060324_309.xml:1.3 --- lostwages/wwn/wn20060324_309.xml:1.2 11 Apr 2006 14:20:43 -0000 +++ lostwages/wwn/wn20060324_309.xml 11 Apr 2006 14:20:43 -0000 @@ -206,7 +206,7 @@ it won't for quite some time. It will b software specifically targets Vista, although it's likely Microsoft Office will lead the way. It's only been within the last year or so we've seen Windows 98 begin to be unsupported. So it'll be a while before -we have to worry Vista (especially now that the release has been pushed +we have to worry about Vista (especially now that the release has been pushed out until 2007.) Mike Hearn shared some info this week about some of the API changes @@ -217,7 +217,7 @@ Potentially this is old news, but via Ra <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnlong/htm…"> http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnlong/htm…</a></ul> -Which talks about Vistas application compatibility. Interesting points +Which talks about Vista's application compatibility. Interesting points that stand out: <ul> <li> They are dropping WinHelp and CHM support. You'll have to install it @@ -232,7 +232,7 @@ that stand out: error is suppressed to stop installers tripping up).</li> <li> They dropped D3D RM. Not many apps use this but I think at least my - fathers sailing game does.</li> + father's sailing game does.</li> </ul> So there we have it - this appears to be the first release in which they simply started dropping APIs. @@ -282,10 +282,10 @@ It's actually defined as: Not so pretty, eh? It also generates GCC warnings due to the casts, which is generally considered a bad thing. Mike McCormack sent a series of patches -last week to replace code like that. It sparked some controversy whether his +last week to replace code like that. It sparked some controversy over whether his patches were actually better or not. Rob Shearman fired the first shot: <quote who="Rob Shearman"> -Why don't we fix the macros as suggested by Francois, rather than +Why don't we fix the macros as suggested by François, rather than preventing its use? It seems like a big waste of time to have submitted all of the patches to the files using windowsx.h when fixing the macros is necessary for Winelib anyway.</quote> @@ -296,15 +296,15 @@ No, it's not a waste of time. Having wa far more important than any warnings that might be in 3rd party winelib code. -Francois' solution is still not perfect, as it requires use of a +François' solution is still not perfect, as it requires use of a non-portable C construct. </quote> -Rob didn't think that was an issue and reminded everyone of Francois' +Rob didn't think that was an issue and reminded everyone of François' original idea: <quote who="Rob Shearman"> We're trying to work around GCC warnings that probably aren't generated using any other compiler so using non-portable C constructs is perfectly -fine. Here is Francois' solution again: +fine. Here is François' solution again: <ul><code> #ifndef WINE_CAST # if __GNUC__ @@ -315,8 +315,7 @@ fine. Here is Francois' solution again: #endif #define Header_SetImageList(hwnd,himl) - (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) - WINE_CAST(HIMAGELIST, SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl)) +   WINE_CAST(HIMAGELIST, SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl)) </code></ul> It seemed to be ignored by both you and Alexandre last time it was sent, @@ -358,7 +357,7 @@ typesafe, it just looks like it is.< within applications: <quote who="Rauschi"> -I think it would be very useful to disallow an application started with wine i +I think it would be very useful to disallow an application started with wine to connect to the network/internet by an options flag.</quote> That's a valid question - a lot of apps like to "phone home" and that's Index: lostwages/wwn/wn20060402_310.xml diff -u -p lostwages/wwn/wn20060402_310.xml:1.2 lostwages/wwn/wn20060402_310.xml:1.3 --- lostwages/wwn/wn20060402_310.xml:1.2 11 Apr 2006 14:20:43 -0000 +++ lostwages/wwn/wn20060402_310.xml 11 Apr 2006 14:20:43 -0000 @@ -285,7 +285,7 @@ wasn't much discussion other than a bunc <topic>Integration</topic> Some rumblings began a few weeks ago about work to support Photoshop plugins in Gimp using Wine. Well, that's now a reality. Dan Kegel -forwarded a message to wine-devel wit a link to the PSPI project: +forwarded a message to wine-devel with a link to the PSPI project: <quote who="Dan Kegel"> I've been hearing rumblings about people using Wine to run windows photoshop plugins on Linux Gimp, @@ -310,7 +310,7 @@ Unlike GIMP plug-ins, 3rd-party Photosho interface library. (GIMP plug-ins use GTK+, obviously.) This is because 3rd-party Photoshop plug-ins are usually available both for the Windows and Macintosh versions of Photoshop. Typically each company uses some homegrown -widget library, with a look and feel that is widely different than the normal +widget library, with a look and feel that is widely different from the normal Windows common control look and feel, or the GTK+ look and feel. </quote> Ironically, we covered this topic about 2 and a half years ago in @@ -492,7 +492,7 @@ desktop mode: Tony Lambregts thought of some of the problems with it: <quote who="Tony Lambregts"> -So if I understand this correctly all programs will share the same +So if I understand this correctly, all programs will share the same desktop. Is it also true that I cannot specify in winecfg that one program can run full screen and another in a desktop window. @@ -501,17 +501,17 @@ If this is the case we will have a fair Vitaliy Margolen cited a specific example that could be a problem: <quote who="Vitaliy Margolen"> -Ok so now say with Steam and all of it's games - it will be almost 100% -unusable! Because we still haven't fixes managed/unmamaged windows. And +Ok so now say with Steam and all of its games - it will be almost 100% +unusable! Because we still haven't fixed managed/unmamaged windows. And Steam itself would be on top of everything. So the way people were able -to work-around this is by putting Steam into virtual desktop. Now that +to work-around this is by putting Steam into a virtual desktop. Now that means their game will run in the same desktop as well. We really really really have to fix managed/unmanaged mode then. I can't even imagine how many people will stay with current or older Wine because of this patch. -Also I remember some users were using other two parameters of the desktop +Also I remember some users were using the other two parameters of the desktop (top left corner - changing manually in the registry). I didn't seen anything that indicates they are still supported with this patch. </quote>

1 0

Alexandre Julliard : Makefile: There are currently no tests in the programs directory.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 15c52a751ae083fc50be37993401772f6fb058c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15c52a751ae083fc50be379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 11 14:41:39 2006 +0200 Makefile: There are currently no tests in the programs directory. --- Makefile.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7c1a02b..2bcd50d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,9 +55,7 @@ INSTALLBOTHSUBDIRS = dlls libs tools INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS) # Sub-directories to run make test into -TESTSUBDIRS = \ - dlls \ - programs +TESTSUBDIRS = dlls all: Make.rules wine @echo "Wine build complete."

1 0

Ivan Gyurdiev : wined3d: Remove bogus address register warning for pixel shaders.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 12be14b6cc9b883f8cf235c5f39197418e85ec69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12be14b6cc9b883f8cf235c… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Apr 11 06:18:59 2006 -0400 wined3d: Remove bogus address register warning for pixel shaders. Pixel shaders don't have an address register, this warning is bogus. D3DSPR_ADDR is interpreted as D3DSPR_TEXTURE for pixel shaders. --- dlls/wined3d/pixelshader.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 2f898e3..8e80c89 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -965,7 +965,6 @@ inline static VOID IWineD3DPixelShaderIm unsigned lineNum = 0; /* The line number of the generated program (for loging)*/ char *pgmStr = NULL; /* A pointer to the program data generated by this function */ char tmpLine[255]; - DWORD nUseAddressRegister = 0; #if 0 /* TODO: loop register (just another address register ) */ BOOL hasLoops = FALSE; #endif @@ -1112,15 +1111,6 @@ inline static VOID IWineD3DPixelShaderIm case D3DSIO_PHASE: continue; case D3DSIO_MOV: - /* Address registers must be loaded with the ARL instruction */ - if ((((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) == D3DSPR_ADDR) { - if (((*pToken) & REGMASK) < nUseAddressRegister) { - strcpy(tmpLine, "ARL"); - break; - } else - FIXME("(%p) Try to load A%ld an undeclared address register!\n", This, ((*pToken) & REGMASK)); - } - /* fall through */ case D3DSIO_CND: case D3DSIO_CMP: case D3DSIO_ADD:

1 0

Dan Kegel : x11drv: Fix two clipboard bugs.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: d5292cb3f43c882d46e8a83475b047edec0ea633 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5292cb3f43c882d46e8a83… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Apr 9 14:47:21 2006 -0700 x11drv: Fix two clipboard bugs. Fix two clipboard problems that caused BadAtom crashes and caused some clipboard formats to not be exported properly. --- dlls/x11drv/clipboard.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c index 567edd9..49a7ccc 100644 --- a/dlls/x11drv/clipboard.c +++ b/dlls/x11drv/clipboard.c @@ -1784,6 +1784,10 @@ static VOID X11DRV_CLIPBOARD_InsertSelec if (names) { wine_tsx11_lock(); + /* FIXME: we're at the mercy of the app sending the event here. + * Currently if they send a bogus atom, we will crash. + * We should handle BadAtom errors gracefully in this call. + */ XGetAtomNames( display, atoms, nb_atoms, names ); wine_tsx11_unlock(); for (i = 0; i < nb_atoms; i++) @@ -2790,6 +2794,13 @@ static Atom X11DRV_SelectionRequest_TARG LPWINE_CLIPFORMAT lpFormats; LPWINE_CLIPDATA lpData; + /* Create X atoms for any clipboard types which don't have atoms yet. + * This avoids sending bogus zero atoms. + * Without this, copying might not have access to all clipboard types. + * FIXME: is it safe to call this here? + */ + intern_atoms(); + /* * Count the number of items we wish to expose as selection targets. */ @@ -2804,7 +2815,7 @@ static Atom X11DRV_SelectionRequest_TARG while (lpFormats) { if ((lpFormats->wFormatID == lpData->wFormatID) && - lpFormats->lpDrvExportFunc) + lpFormats->lpDrvExportFunc && lpFormats->drvData) cTargets++; lpFormats = lpFormats->NextFormat; @@ -2832,7 +2843,7 @@ static Atom X11DRV_SelectionRequest_TARG while (lpFormats) { if ((lpFormats->wFormatID == lpData->wFormatID) && - lpFormats->lpDrvExportFunc) + lpFormats->lpDrvExportFunc && lpFormats->drvData) targets[i++] = lpFormats->drvData; lpFormats = lpFormats->NextFormat; @@ -2849,12 +2860,9 @@ static Atom X11DRV_SelectionRequest_TARG unsigned int i; for ( i = 0; i < cTargets; i++) { - if (targets[i]) - { - char *itemFmtName = XGetAtomName(display, targets[i]); - TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName); - XFree(itemFmtName); - } + char *itemFmtName = XGetAtomName(display, targets[i]); + TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName); + XFree(itemFmtName); } }

1 0