wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: Fwd: Re: Wine builtin mscms.dll
by Hans Leidekker 20 Jan '05

20 Jan '05

On Thursday 20 January 2005 08:04, you wrote: > I got your name from Mike. I was wondering if you could give me a pointer or a > hint on how to use wine's builtin mscms.dll. A simple DLL override in > .wine/config does not seem to do the job (using wine-20041210). Well, you have to realize that development on mscms in Wine has only been started a couple of months ago. My estimate is that it's now about 20% done and still missing basic functionality. And I have only weekends to spend time on it ;( So your best bet at this time is a native mscms. > (It works with a native mscms.dll file copied to the windows/system directory, > but with a specific application, makes it 5 times slower). The 5 times slow down you're seeing is not normal. Maybe you can investigate the problem a little more and report to the Wine development list at wine-devel(a)winehq.org? -Hans

1 0

Re: [LOSTWAGES] update the non-standard include files task (RESEND)
by Rémi Assailly 20 Jan '05

20 Jan '05

Selon "Dimitrie O. Paun" <dpaun(a)rogers.com>: > On Thu, Jan 20, 2005 at 02:58:22PM +0900, Mike McCormack wrote: > > > > So did you ;) Here's a merge of both. > > I don't do this on purpose, but you missed win.h again :) > Again, with feeling... > > -- > Dimi. > win.h still exists...

2 1

RpcImpersonateClient (and ImpersonateNamedPipeClient)
by Luke Kenneth Casson Leighton 20 Jan '05

20 Jan '05

1 0

Native comctl32.dll and native commctrl.dll
by Dripple 20 Jan '05

20 Jan '05

Hi all, I'm a newbie in wine using and wine developpement. I just need information about comctl32.dll and commctrl.dll. I'm trying to have this app (http://appdb.winehq.org/appview.php?appId=1485&versionId=2451) working. In fact, it works. But only using native comctl32.dll, which requires native commctrl.dll. Can anybody explain me what's missing in buitlin comctl32.dll and/or commctrl.dll ? Is it planned to fix commctrl.dll, to avoid piracy ? Thanks. Dripple

2 3

Re: [AppDB] new screenshot and image classes
by Jonathan Ernst 20 Jan '05

20 Jan '05

*This script uses GD 1 instead of GD 2 functions so that it'll work on the live server* Here is a script that will recreate missing thumbnails and apply the watermarking. Please configure the script by modifying the first lines and don't forget to create the thumbnail directories. Other than that everything should be fine. Usage: 1)chmod u+x ./thumbs.php 2)edit clean.php to set up the database connection and other settings (first lines) 3)./thumbs.php

1 0

Re: [wined3d] more vertex declaration work
by Paul Vriens 20 Jan '05

20 Jan '05

On Thu, 2005-01-20 at 00:58, Raphael wrote: > Hi, > > Changelog: > - VertexDeclaration device APIs > - D3D9 declarations parsing > - a little better APIs (trying to avoid compil problems) > > Todo: > - D3D8 declarations parsing (converting to d3d9 compatible using code in > d3d8) > - find a more cleaner prototype for CreateVertexDeclaration/GetDeclaration > APIs > - Use on drawing paths (implement StriddedFillFromDeclaration) > - use on d3d9 code > > Regards, > Raphael +/***** + * Vertex Declaration + *****/ +extern HRESULT IWineD3DVextexDeclarationImpl_ParseDeclaration9(IWineD3DDeviceImpl* ^ looks like a typo? (there are 3 occurrences of Vextex, so it could be deliberate, or copy/paste). Cheers, Paul.

1 0

Re: [LOSTWAGES] update the non-standard include files task
by Dimitrie O. Paun 20 Jan '05

20 Jan '05

Actually, you missed a few things. ChangeLog A few non-standard include files are gone. -- Dimi.

1 0

Re: wined3d updates
by Oliver Stieber 20 Jan '05

20 Jan '05

> > You forgot the patch....... > > Tom > I resent the email with the patches about 10 minutes ago so it should get through soon. ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

1 0

Re: wined3d updates
by Ivan Leo Puoti 20 Jan '05

20 Jan '05

Oliver Stieber wrote: > Hi, > The attached patches: You didn't attach any patches. Ivan.

1 0

Re: WineTools
by Vincent Béron 20 Jan '05

20 Jan '05

Le lun 17/01/2005 à 04:40, Joachim von Thadden a écrit : > Hi, > > I am maintainer of the new WineTools package. As it is related on > http://www.winehq.org/site/download under "3rd Party Tools" I want you > do know that the text has to be changed, as Frank discontinued > development for WineTools since a long time. > > The text should be now: > > WineTools is a menu driven installer for installing Windows programs > under Linux written by Joachim von Thadden. This software lets you > install the following Windows software: DCOM98, IE6, Windows Core Fonts, > Windows System Software, Office & Office Viewer, Adobe Photoshop 7, > Illustrator 9 and many other programs. "Written by" or "maintained by"? I thought Frank wrote it in the beginning... > > You can download WineTools here: http://www.von-thadden.de/Joachim/WineTools/ Some of the config files included in the "wt210jo" release look somewhat out of date. The definition of drives in config has been dropped since a couple of months, as well as the definition for the System, Temp, Path and Profile environment variables, the ShellLinker key, the Resolution key (in [fonts]), the serial and parallel ports keys, the {Load,Write}HomeRegistryFiles keys, the WineLook key, and the ClearAllSelections and PersistentSelection keys (in [Clipboard]). Some of it is now handled in the registry, some in the .wine/dosdevices dir. Providing outdated stuff doesn't help Wine or it's users. Work on Wine or winecfg (for easier configuration) would be preferred (I know this is Free Software, so you work on what you like). I'm not trying to dismiss WineTools, it's just that I'd much prefer people working on improving the "real" thing rather than distribute workarounds for a specific combination of Windows software and Wine release. Vincent

4 7

more on pirates
by Oliver Stieber 20 Jan '05

20 Jan '05

I've just sent some patches to patches that are enough to get Pirates running. Installing pirates... Pirates uses a MSI installer, I had to Set winver to win98. When prompted about directX 9 say no. (or yes if you really want to). If you get an OLE error make a note and try again, I managed to install on the forth attempt. Then to run Pirates you need to... Turn pixel shaders off Turn shadows off. or you get missing textures. I'd also suggest turning down the detail (just incase), but it doesn't seem to matter that much. The problems I've come across so far are: Memory issues: Unknown cause as yet. When visiting the Governor only a section of the screen fades in and out, this is caused by a viewport larger than the window not being handled correctly. Sometimes textures on models like the docks don't render properly. Sometimes the textures are the wrong way around or wrapped incorrectly, this may be the same problem as above. I get 7-12 FPS in sailing, everything else is a lot quicker (upto 70fps). AMD 2000+ 512MB Ram ATI-9600. I've tried a few other Direct x 9 games but I generally can't get passed the installer (using wine or cegeda). ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

1 0

Re: DCE 1.2.2 released under LGPL license (strategically important for Wine)
by Luke Kenneth Casson Leighton 20 Jan '05

20 Jan '05

http://cvs.sourceforge.net/viewcvs.py/freedce/freedce/dcom/dcom.h?rev=1.1&v… dear ivan, re the header stuff: yes it looks like it is. do you know where the thingy. mingw dcom headers can be found? homepage for mingw? hints appreciated. would like to hook up the right people involved: introductions also appreciated. l. -- -- <a href="http://lkcl.net">http://lkcl.net</a> --

7 38

Re: wine/ include/wine/wined3d_interface.h dlls/wi ...
by Michael Stefaniuc 20 Jan '05

20 Jan '05

Hello, On Wed, Jan 19, 2005 at 01:34:49PM -0600, Alexandre Julliard wrote: > ChangeSet ID: 15555 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2005/01/19 13:34:49 > > Modified files: > include/wine : wined3d_interface.h > dlls/wined3d : wined3d_private.h Makefile.in > Added files: > dlls/wined3d : vertexdeclaration.c > > Log message: > Raphael Junqueira <fenix(a)club-internet.fr> > Begin support of VertexDeclaration on wined3d using d3d8 code base > (handling d3d8 and d3d9 specs). This patch broke the compilation of dlls/d3d8/basetexture.c In file included from /home/michi/work/wine/dlls/d3d8/d3d8_private.h:69, from /home/michi/work/wine/dlls/d3d8/basetexture.c:31: /home/michi/work/wine/include/wine/wined3d_interface.h:877: error: syntax error before "D3DVERTEXELEMENT9" D3DVERTEXELEMENT9 isn't defined in D3D8 and trying to include any D3D9 header was futil, introduced more problems that it solved. Attached is a quick hack to make it compile again. bye michael > > Patch: http://cvs.winehq.org/patch.py?id=15555 > > Old revision New revision Changes Path > 1.23 1.24 +38 -9 wine/include/wine/wined3d_interface.h > 1.22 1.23 +29 -18 wine/dlls/wined3d/wined3d_private.h > 1.12 1.13 +1 -0 wine/dlls/wined3d/Makefile.in > Added 1.1 +0 -0 wine/dlls/wined3d/vertexdeclaration.c > > -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

RtlQueryRegistryValues
by Ivan Leo Puoti 19 Jan '05

19 Jan '05

Hello Alexandre, I don't know if you missed this patch, http://www.winehq.com/hypermail/wine-patches/2005/01/0502.html if you think something in it is wrong, or if you haven't got to it yet. If this isn't the case please let me know. Ivan.

1 0

CreateProcess
by Ivan Leo Puoti 19 Jan '05

19 Jan '05

Today Raymond Chen posted an article about CreateProcess(), I haven't looked at our implementation but if it works differently from his description someone may want to to fix it. http://blogs.msdn.com/oldnewthing Ivan.

1 0

uses for transmit_as in NT interoperability services
by Luke Kenneth Casson Leighton 19 Jan '05

19 Jan '05

it's odd, innit? you start to explore and go "uh, duh, _that's_ what that's for". there are a number of places in the NT services that i network-reverse-engineered six years ago where i was thinking, "hm, that's not NDR-formatted..." and had to continue anyway bumbling along. the areas i encountered which were most definitely _not_ NDR-formatted, despite appearances, were: 1) Security Descriptors 2) Spoolss (spoolss.idl) Data Structures (usually in case statements with horribly large unions) 3) Service Control Manager (svcctl.idl) security descriptors that i encountered contained relative offsets of members in the structure where it _mattered_ what the offset value was, and the same thing i encountered in spoolss data. unlike NDR, pointers are tokens: if it's non-zero, it's a pointer, and the data can be "expected" at a known point because the order in which structures are added is well-defined. [no i know i haven't mentioned the difference between ptr and unique] what i believe may be being used is "transmit_as" - see an example code from entegrity.com at: http://support.entegrity.com/private/doclib/docs/osfhtm/develop/apgstyle/Ap… so, to follow the guidance and examples at the above link, to send a Security Descriptor you would create this: typedef struct { int size; [ptr, size_is(size)] *security_descriptor_blob; } SECURITY_DESCRIPTOR_BLOB; then you would do this typedef [transmit_as(SECURITY_DESCRIPTOR_BLOB)] PSECURITY_DESCRIPTOR; and then, magically, you can do THIS: NTSTATUS SamrGetSecurityDescriptor(handle_t *hnd, [in, ref] PSECURITY_DESCRIPTOR); and in the server-side thing you'd define: void PSECURITY_DESCRIPTOR_to_xmit(PSECURITY_DESCRIPTOR *sec_des, SECURITY_DESCRIPTOR_BLOB *blob) { blob->size = get_security_descriptor_actual_size(sec_des); blob->data = malloc(blob_size); memcpy(blob->data, get_security_descriptor_blob(sec_des), blob->size); } not forgetting to do this! void PSECURITY_DESCRIPTOR_free_xmit( SECURITY_DESCRIPTOR_BLOB *blob) { free(blob->data); } and i think that's just _so_ cool. only took six years to realise it's possible. ... and i'd be fascinated to know if it's _right_ :) l. -- -- <a href="http://lkcl.net">http://lkcl.net</a> --

1 0

DCE happily supports transmit_as. cool!
by Luke Kenneth Casson Leighton 19 Jan '05

19 Jan '05

http://support.entegrity.com/private/doclib/docs/osfhtm/develop/apgstyle/Ap… cool!

1 0

Re: winecfg todo's
by Mike Hearn 19 Jan '05

19 Jan '05

On Tue, 2005-01-18 at 20:59 -0500, Tom wrote: > Hello Mike, > > I am working on a update to the Known ToDo's page > and was wondering if you could provide a current > list of ToDo's ? Hi Tom, As of Jan 19th 2005 the remaining work is basically to make Wine use winecfg as well as lots of testing. Writing a patch that Alexandre is happy with to kill the config file and move it all into the registry might be tricky, especially as the tree is so unstable right now (do we really want to make it worse?) ... but that's what needs to be done. There are plenty of other things that need to be done too but they can wait until people are actually *using* the damn thing thanks -mike

1 0

Re: [OLE #45] Proxy Manager Fixes
by Bill Medland 19 Jan '05

19 Jan '05

On January 18, 2005 02:04 pm, Robert Shearman wrote: > Hi, > > I have also fixed (kinda) the issue Bill > Medland was reporting where doing a CreateInstance for an IUnknown > interface was a bit messed up (this is bad programming anyway as it > doubles the number of RPC calls required). Maybe. (After all, Microsoft aren't perfect). However since it is in the ATL code we can expect it to occur from time to time, surely. > > Rob >

2 1

Re; cleanup shlfileop.c: why does this fail?
by Rolf Kalbermatter 18 Jan '05

18 Jan '05

Joris Huizer wrote: >That line can be removed as >nFileOp = *(lpFileOp) >on the first line - the variable is never changed after that (yeah, if >we really like, we could get rid of it) >I hadn't removed it just like that, yet - but as it is useless, it can >be removed. I wouldn't do that! This first line does not just copy a pointer but the ENTIRE structure. And those parameters are sometimes overwritten inside the function. So this last line also does do something, namely copying the aborted state back into the main structure for reference by the caller. Rolf Kalbermatter

1 0

Re: Ukrainian support
by Juan Lang 18 Jan '05

18 Jan '05

Hi Oleh, > --- wine-20050111/libs/unicode/cpmap.pl.orig 2004-01-21 00:39:06.000000000 +0200 > +++ wine-20050111/libs/unicode/cpmap.pl 2005-01-14 15:22:12.000000000 +0200 > @@ -82,6 +82,7 @@ > [ 10081, "VENDORS/MICSFT/MAC/TURKISH.TXT", "Mac Turkish" ], > [ 20866, "VENDORS/MISC/KOI8-R.TXT", "Russian KOI8" ], > [ 20932, "OBSOLETE/EASTASIA/JIS/JIS0208.TXT", "EUC-JP" ], > + [ 21866, "VENDORS/MISC/KOI8-R.TXT", "Ukrainian KOI8" ], > [ 28591, "ISO8859/8859-1.TXT", "ISO 8859-1 Latin 1" ], > [ 28592, "ISO8859/8859-2.TXT", "ISO 8859-2 Latin 2 (East European)" ], > [ 28593, "ISO8859/8859-3.TXT", "ISO 8859-3 Latin 3 (South European)" ], I may be missing something, but don't you mean "VENDORS/MISC/KOI8-U.TXT"? --Juan __________________________________ Do you Yahoo!? Take Yahoo! Mail with you! Get it on your mobile phone. http://mobile.yahoo.com/maildemo

1 0

Question about testing SHQueryValueExA in shlwapi/tests/shreg.c
by Paul Vriens 18 Jan '05

18 Jan '05

Hi, I'm trying to fix the tests in shlwapi/tests/shreg.c (or Wine for that matter). One thing that puzzles me in the current code is the checks done after we receive a ERROR_MORE_DATA when we pass a size smaller than the actual data. MSDN states: If the buffer specified by pvData parameter is not large enough to hold the data, the function returns ERROR_MORE_DATA and stores the required buffer size in the variable pointed to by pcbData. In this case, the contents of the pvData buffer are undefined. If that's the case, what's the use of checking the returned buffer with something? Wine and Win98 leave the buffer intact (the contents and thus size differ however) WinXPProf and W2KProf clear (so it seems) the buffer. Cheers, Paul Vriens.

2 2

Re; cleanup shlfileop.c: why does this fail?
by Juan Lang 18 Jan '05

18 Jan '05

Hi Joris, pFromFile and pToFile are treated oddly. Pass them as WCHAR pointers to file_operation_on_data, not as pointers to WCHAR pointers. The implementation of file_operation_on_data does not behave the same way as the code it replaced. You want something like: +static int file_operation_on_data(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW *nFileOp, LPWSTR pFromFile,LPWSTR pToFile) +{ + LPWSTR lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + (IsAttribDir(wfd->dwFileAttributes) && (nFileOp->fFlags & FOF_FILESONLY))) + { + return 0; /* next name in pTempFrom(dir) */ + } + SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + return SHFileOperationW (nFileOp); +} One other difference that jumps out at me: - lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; + /*lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted;*/ Why this change? --Juan __________________________________ Do you Yahoo!? Yahoo! Mail - Find what you need with new enhanced search. http://info.mail.yahoo.com/mail_250

2 1

Re: [LOSTWAGES] Add Alexandre's comment about the strncpy janitorial project
by Jeremy Newman 18 Jan '05

18 Jan '05

Crap, I thought I queued up these downloads a week or so ago. Someone must have rebooted taz and killed my downloads. Argh, if it didn't take so long to dl these ISO's. Anyway, I restarted the downloads again, I hopefully should have them by the end of today. I'll move them into /home/public/iso when done. The CD keys are already in the cd keys txt file. On Tue, 2005-01-18 at 11:26 +0900, Mike McCormack wrote: > ChangeLog: > * Add Alexandre's comment about the strncpy janitorial project > plain text document attachment (janitorial-strncpy-update.diff) > Index: templates/en/janitorial.template > =================================================================== > RCS file: /home/wine/lostwages/templates/en/janitorial.template,v > retrieving revision 1.63 > diff -u -r1.63 janitorial.template > --- templates/en/janitorial.template 13 Jan 2005 19:35:16 -0000 1.63 > +++ templates/en/janitorial.template 18 Jan 2005 02:23:57 -0000 > @@ -25,6 +25,13 @@ > the <i>dst</i> buffer, and always nul terminate the buffer when we > intended to.<p> > > + Julliard > + <a href="http://www.winehq.org/hypermail/wine-devel/2005/01/0390.html">says</a>: > + "A careful review of the code to ensure that lstrcpyn semantics are really what > + we want. In several cases we know that we are copying less than the full string, > + and in that case we have to use memcpy instead, lstrcpyn won't do the right > + thing."<p> > + > <h2>Regedit fixes</h2> > > Regedit lacks a few features. We need to improve regedit to:

1 1

cleanup shlfileop.c: why does this fail?
by Joris Huizer 18 Jan '05

18 Jan '05

Hi, As you can see in the attached patch file, I wrote a function file_operation_on_data() which uses a WIN32_FIND_DATAW to do a file operation; however, for some reason, tests start to fire when using the function: ../../../tools/runtest -q -P wine -M shell32.dll -T ../../.. -p shell32_test.exe.so shellpath.c && touch shellpath.ok fixme:shell:_SHGetUserProfilePath unsupported for user other than current or default fixme:shell:_SHGetUserProfilePath unsupported for user other than current or default ../../../tools/runtest -q -P wine -M shell32.dll -T ../../.. -p shell32_test.exe.so shlfileop.c && touch shlfileop.ok shlfileop.c:276: Test failed: Files and directories are copied to directory shlfileop.c:277: Test failed: The file is copied shlfileop.c:278: Test failed: The directory is copied shlfileop.c:279: Test failed: The file in subdirectory is copied shlfileop.c:287: Test failed: The file is copied shlfileop.c:345: Test failed: Files and directories are moved to directory shlfileop.c:346: Test failed: The file is moved shlfileop.c:347: Test failed: The directory is moved shlfileop.c:348: Test failed: The file in subdirectory is moved make[1]: *** [shlfileop.ok] Error 9 How can I find out where the problem is? Nothing *should* have changed by inserting that function I think, but I must be missing something here regards, Joris Index: dlls/shell32/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.51 diff -u -r1.51 shlfileop.c --- dlls/shell32/shlfileop.c 14 Jan 2005 16:51:14 -0000 1.51 +++ dlls/shell32/shlfileop.c 18 Jan 2005 16:23:43 -0000 @@ -945,6 +945,40 @@ return 0; } +static int file_operation_invalid_handle(long FuncSwitch, LPWSTR pFromFile, DWORD ToPathAttr, LPWSTR pTempFrom) +{ + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + if ((FO_DELETE == FuncSwitch) && (b_Mask)) + { + DWORD FromPathAttr; + pFromFile[0] = '\0'; + FromPathAttr = GetFileAttributesW(pTempFrom); + pFromFile[0] = '\\'; + if (IsAttribDir(FromPathAttr)) + { + /* FO_DELETE with mask and without found is valid */ + return 0; + } + } + /* root (without mask) is also not allowed as source, tested in W98 */ + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; +} + +static int file_operation_on_data(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW *nFileOp, LPWSTR *pFromFile,LPWSTR *pToFile) +{ + LPWSTR lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + (IsAttribDir(wfd->dwFileAttributes) && (nFileOp->fFlags & FOF_FILESONLY))) + { + return 0; /* next name in pTempFrom(dir) */ + } + SHFileStrCpyCatW(&(*pToFile[1]), lpFileName, NULL); + SHFileStrCpyCatW(&(*pFromFile[1]), lpFileName, NULL); + return SHFileOperationW (nFileOp); +} + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -964,7 +998,6 @@ LPWSTR pTempTo = NULL; LPWSTR pFromFile; LPWSTR pToFile = NULL; - LPWSTR lpFileName; int retCode = 0; DWORD ToAttr; DWORD ToPathAttr; @@ -986,8 +1019,6 @@ long FuncSwitch = (nFileOp.wFunc & FO_MASK); long level= nFileOp.wFunc>>4; - int ret; - /* default no error */ nFileOp.fAnyOperationsAborted = FALSE; @@ -1016,10 +1047,9 @@ * create dir 0 0 0 0 0 0 1 0 */ - ret = file_operation_checkFlags(nFileOp); - if (ret != 0) + retCode = file_operation_checkFlags(nFileOp); + if (retCode) { - retCode = ret; goto shfileop_end; } @@ -1108,20 +1138,7 @@ hFind = FindFirstFileW(pFrom, &wfd); if (INVALID_HANDLE_VALUE == hFind) { - if ((FO_DELETE == FuncSwitch) && (b_Mask)) - { - DWORD FromPathAttr; - pFromFile[0] = '\0'; - FromPathAttr = GetFileAttributesW(pTempFrom); - pFromFile[0] = '\\'; - if (IsAttribDir(FromPathAttr)) - { - /* FO_DELETE with mask and without found is valid */ - goto shfileop_end; - } - } - /* root (without mask) is also not allowed as source, tested in W98 */ - retCode = ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + retCode = file_operation_invalid_handle(FuncSwitch,pFromFile,ToPathAttr,pTempFrom); goto shfileop_end; } @@ -1130,11 +1147,10 @@ /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); - /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */ - if (ret != 0) + retCode = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); + /* if retCode is not 0, nFileOp.fAnyOperationsAborted is TRUE */ + if (retCode) { - retCode = ret; goto shfileop_end; } continue; @@ -1202,15 +1218,7 @@ nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES); do { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - (IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; /* next name in pTempFrom(dir) */ - SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - retCode = SHFileOperationW (&nFileOp); + retCode = file_operation_on_data(&wfd,&nFileOp,&pFromFile,&pToFile); } while(!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); } FindClose(hFind); @@ -1369,7 +1377,7 @@ nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE", retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo)); - lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; + /*lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted;*/ return retCode; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel