wine-devel

wine-devel@winehq.org

2 participants
84470 discussions

Re: msvcrt: Printf Integer Conversion try 2
by Jesse Allen 19 Dec '05

19 Dec '05

On 12/16/05, Jesse Allen <the3dfxdude(a)gmail.com> wrote: > Hi Alexandre, > > This patch is much improved. It passes all tests this time including > additional ones you will see in the new tests patch. > > Changes: > Add pf_is_integer_format to detect integer formats > Add pf_integer_conv for I64 types > Foward I32 and I to libc's printf > Correctly handle long long > Update pf_fill to handle the sign for signed integers > Fix pf_fill to ignore flags->PadZero for printing zeroes when > flags->LeftAlign is set > Fix existing pf_is_*_format to require explicit upper and lower case formats > Still tolower( flags.Format ) before we use libc's printf (to avoid > regressions?) > Allow flags.Sign to be ' ' (space) for the sign place holder, also > make sure '+' overrides it. > > >

1 0

Create new mailing list wine-isv?
by Dan Kegel 19 Dec '05

19 Dec '05

I used to hate the term ISV (Independent Software Vendor) since it sounded so acronymy compared to 'developer', but it's very commonly used in the industry to refer to outfits which are trying to write and sell off-the-shelf software -- and as monkey-boy said, Microsoft is where it is partly because it worked hard to attract and support those guys. So I've been thinking about how to attract more Windows ISVs to test, support, and promote their apps on Linux with Wine. Part of the problem is a lack of high-level documentation specifically aimed at the ISV. Another is ISVs getting lost in the shuffle on wine-users or wine-devel. I've made a start at the documentation (http://kegel.com/wine/isv), and hope to move that to winehq at some point. Now I'd like to create a discussion forum for ISVs where they will feel more comfortable; the level of discussion would be halfway between that in wine-users and wine-devel, but aimed more at Windows developers than people who are familiar with Linux. How about we create a new mailing list, wine-isv, aimed squarely at ISVs and the Wine community members who want to help them? Thanks, Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

15 27

Re: Alexandre Julliard : Take advantage of the __EXCEPT_PAGE_FAULT macro.
by Robert Shearman 19 Dec '05

19 Dec '05

Alexandre Julliard wrote: >Module: wine >Branch: refs/heads/master >Commit: ae964ac801b3077f5361559abd6645d21fc35d1f >URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae964ac801b3077f5361559… > >Author: Alexandre Julliard <julliard(a)winehq.org> >Date: Fri Dec 16 17:17:57 2005 +0100 > >Take advantage of the __EXCEPT_PAGE_FAULT macro. > > This change is wrong: > --- dlls/ole32/rpc.c > +++ dlls/ole32/rpc.c > @@ -110,13 +110,6 @@ struct dispatch_params > HRESULT hr; /* hresult (out) */ > }; > -static WINE_EXCEPTION_FILTER(ole_filter) > -{ > - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) > - return EXCEPTION_CONTINUE_SEARCH; > - return EXCEPTION_EXECUTE_HANDLER; > -} > - > static HRESULT WINAPI > RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, > LPVOID *ppv) > { > *ppv = NULL; > @@ -453,7 +446,7 @@ void RPC_ExecuteCall(struct dispatch_par > { > params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, > params->chan); > } > - __EXCEPT(ole_filter) > + __EXCEPT_PAGE_FAULT > { > params->hr = GetExceptionCode(); > } The idea is that the ole_filter will catch all exceptions other than page faults so that we don't hide obvious programmer errors. However, there obviously should be cases for some other exceptions that we don't want to handle. -- Rob Shearman

2 2

Outreach to windows ISVs
by Dan Kegel 19 Dec '05

19 Dec '05

At the Desktop Architects Meeting at OSDL, one of the big topics was how to make life easier for ISVs that want to start supporting Linux. So I put together a little page aimed at Windows ISVs who are interested in supporting the Linux market using Wine, but aren't quite sure how to go about it. The page is at http://kegel.com/wine/isv/ Comments, anyone? Thanks, Dan -- Why won't Johnny run Linux? See http://kegel.com/linux/comfort

4 7

binary only dll , resolving links through winebuild
by Ananth M 19 Dec '05

19 Dec '05

Binary Only Dll (test.dll) with the header file (test.h) ------------------------------------------------------------------------- - I have a binary only dll (test.dll) that was created in windows which exports to functions - int Add (int, int) - int Subtract (int, int) - I want to use this dll in Linux from an application mydlltest.cpp. - In that process, I have tried the following: - Generated the .spec file using winedump - winedump spec test - This created the .spec file with stub functions 1 stub add 2 stub Subtract - Installed this dll as builtin dll in my wine directory (This is my testing purpose) - chmod a+x testdll_install - ./testdll_install <wine_path> - cd <wine_path> - autoconf - ./configure - make depend && make - Now I am able to see this dll in dlls directory of winepath I am not finding any README on Winebuild and I am getting problem from this step onwards, - NOW do I need to generate the .def for the spec file of the dll?? - NOW do I need to change any settings like DllOverrides to access this dll from my test application?? - Now I have a win32 application (mydlltest.cpp) that was using this dll in windows. - How can I link the (test.dll) from the application (mydlltest.cpp) ? - I use the LoadLibrary("test") in the test application ( mydlltest.cpp), the dll was loaded - I got the GetProcAddress() for the function "Add", the function pointer is obtained - *But when I call the function "add" from the application, I was getting exception*. - Then I define the stub function in the test_dll_main.c, to print a trace message. - Compiled the dll again to create the test.dll.so - Now, when I call the function "add" from the application, the trace message is printed, BUT THE ACTUAL FUNCTION IN THE TEST.DLL is not called. * (I Created the .def file from the .spec file of the dll and tried the same. Still I am getting the same problem)* ** * How I can use winebuild after creating the .spec file using winedump, so that I can link that dll using the Application.??* * Any detailed steps that can help in using a third party binary dll in Linux using the Test Applciation ??* Thank you AJ <wine-devel-bounces(a)winehq.org>

1 0

vbrun60sp6.exe doesn't work in Wine
by Dan Kegel 19 Dec '05

19 Dec '05

Wine-0.9.3 can install vbrun60sp5.exe and earlier just fine, but for some reason vbrun6sp6.exe silently exits without installing anything. Anyone know why? You can download it from http://support.microsoft.com/default.aspx?scid=kb;en-us;290887 -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 1

ReactOS has game I see......
by Tom Wickline 19 Dec '05

19 Dec '05

Hello, http://vogons.zetafleet.com/viewtopic.php?t=10750 :D Cheers, Tom

1 0

Switching from INI-Files (win9x) to Registry (NT)?
by Detlef Riekenberg 18 Dec '05

18 Dec '05

Hi. With NT, Windows did a Switch from INI-Files to the Registry and use "IniFileMapping" for compatibility with win9x-Apps. (see http://bugs.winehq.org/show_bug.cgi?id=4096) Wine is using both Methods when settings are changed (more code), and this introduce bugs if a Setting-Target is missing: (Example: http://bugs.winehq.org/show_bug.cgi?id=4097) Should we follow the Path of NT and implement the things around IniFileMapping to be compatible with every App that uses the API for INI-Files? We already do caching for INI-Files, so there is no additional incompatibility for very ugly Applications that modify INI-Files manual (open, read/write, close). -- By By ... ... Detlef

1 0

Re: DirectDraw over Direct3D
by Roderick Colenbrander 18 Dec '05

18 Dec '05

> > Second the required 3d functionality is VERY limited. Basicly the only > > thing the videocard needs support is texturing which all cards do. > > But that's obviously wrong - the video *driver* also needs to support it. > And the current 3D video driver situation in Linux is horrible. > Yeah linux drivers are crap for videocards from companies like S3/Via, XGI/Sis and also Intel. Most cards have some basic 3d driver support (the newer S3 ones not yet) but this basic support is enough. Texturing is something that is supported by all those basic drivers and cards. If your card can play Quake I it can also be used for the ddraw over direct3d renderer. A simple voodoo1 would even be fast enough (although this card can't do more than 16bit). The card also doesn't have to be fast. For instance your 2d game works at 800x600 and you use double buffering. You need to process half a million pixels for a single frame. That voodoo1 about which I talked already has a fillrate of 60MPixels so it can already do it fast enough. (one of the bottlenecks is the uploading of textures which happens through PCI / AGP / PCI-Express but this bottleneck appears for all drawing operations) Roderick -- Telefonieren Sie schon oder sparen Sie noch? NEU: GMX Phone_Flat http://www.gmx.net/de/go/telefonie

2 1

Comparing a complicated program startup to windows
by Corey McClymonds 18 Dec '05

18 Dec '05

There is a game, known as Continuum, that has a very complicated setup before it actually starts the game, to prevent cheating. Due to this, the relay is very large, about 4MB, before it starts to repeat itself. I have gotten the +loaddll and the +seh logs at the bottom. I was just wondering, would it be possible to do the same startup on a Windows machine, and compare its relay to the relay from Wine. If this is possible, how would I go about this? Corey McClymonds

2 1

[wined3d] Converting Wined3d to use WGL instead of GLX
by Aric Cyr 17 Dec '05

17 Dec '05

Hello all, As I mentinoed in a recent post, I have almost completed the GLX->WGL conversion. Last night I tracked down my last bug that was causing most of my demo apps to fail. It seems that the problem was the conversion from glXGetProcAddress to using wglGetProcAddress. wined3d uses glXGetProcAddress to get the OpenGL extension function pointers, which is what wglGetProcAddress also does. However wglGetProcAddress _first_ checks opengl32.dll for the extension and returns the thunk function pointer if it exists, and only then falls back to libGL.so by calling glXGetProcAddress. So now I am stuck... if I use wglGetProcAddress for OpenGL extensions I get crashes in most D3D9 applications. If I use glXGetProcAddress in wined3d everything works fine, but then wined3d is still dependent on glx. So my questions: 1) should the thunks returned from wglGetProcAddress be causing crashes at all? Note that they don't crash right away, but "eventually" usually during a call to glDrawArrays it seems (after a call to glSecondaryColor3fEXT). 2) what is the reason for wglGetProcAddress to check opengl32.dll before libGL.so? Would the reverse logic still be a resonable solution? Regards, Aric

7 13

Continuum Attached logs
by Corey McClymonds 17 Dec '05

17 Dec '05

Sorry about that, it would appear the logs aren't on the previous email of mine, so here they are. ----------------------------------------------------------- WINEDEBUG=+loaddll wine Continuum.exe trace:loaddll:load_builtin_dll Loaded module L"kernel32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\advapi32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\gdi32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\user32.dll" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "krnl386.exe" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "system.drv" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "gdi.exe" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module "user.exe" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\winex11.drv" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\imm32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\iphlpapi.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\rpcrt4.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\ole32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\shlwapi.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\comctl32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\shell32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\uxtheme.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\ddraw.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\ws2_32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\wsock32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\winmm.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\dsound.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\winealsa.drv" : builtin ALSA lib timer_hw.c:269:(snd_timer_hw_open) extended read is not supported (SNDRV_TIMER_IOCTL_TREAD) ALSA lib timer_hw.c:269:(snd_timer_hw_open) extended read is not supported (SNDRV_TIMER_IOCTL_TREAD) ALSA lib seq_hw.c:455:(snd_seq_hw_open) open /dev/snd/seq failed: No such file or directory trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\msacm32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\msacm.drv" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\midimap.dll" : builtin -------------------------------------------- WINEDEBUG=+seh wine Continuum.exe trace:seh:__regs_RtlRaiseException code=80000003 flags=0 addr=0x7fc1fef0 trace:seh:__regs_RtlRaiseException eax=00000000 ebx=004c4050 ecx=004c4048 edx=004c405a esi=7bef4647 edi=004c4a4d trace:seh:__regs_RtlRaiseException ebp=000c1dd8 esp=7fc1fef0 cs=0073 ds=007b es=007b fs=1007 gs=0033 flags=00200246 trace:seh:__regs_RtlRaiseException code=c000001d flags=0 addr=0x4c40f2 trace:seh:__regs_RtlRaiseException eax=00000000 ebx=7bef01bc ecx=00000000 edx=bec35266 esi=7fc1fef4 edi=005283c2 trace:seh:__regs_RtlRaiseException ebp=000c1dd8 esp=7fc1fef4 cs=0073 ds=007b es=007b fs=1007 gs=0033 flags=00210202 ALSA lib timer_hw.c:269:(snd_timer_hw_open) extended read is not supported (SNDRV_TIMER_IOCTL_TREAD) ALSA lib timer_hw.c:269:(snd_timer_hw_open) extended read is not supported (SNDRV_TIMER_IOCTL_TREAD) ALSA lib seq_hw.c:455:(snd_seq_hw_open) open /dev/snd/seq failed: No such file or directory

2 1

SCREENSHOT: Windows Genuine Advantage 'GenuineCheck.exe' program generating key on Wine!
by Segin 17 Dec '05

17 Dec '05

The attached screenshot (UNMODIFIED) depicts the WGA 'GenuineCheck.exe' program that is used on the microsoft web site to 'validate' Windows so that you can download crap. Normally, it will not generate the needed key under Wine, but I have a screenshot (attached) of it doing so. I don't know is this is worth noting, as i couldn't tell you how I made it work (a LOT of things, too many to even count). However, I thought it might be something of intrest. If this is in any way useful to the development of Wine, please let me know.

2 1

Re: Create new mailing list wine-isv?
by Tony Lambregts 17 Dec '05

17 Dec '05

Jeremy White wrote: >>Not that I mean to sound like a pessimist, but I'm really just calling >>it as I see it. No offense to anyone intended. :) > > > This, in a nutshell, is Wine's greatest challenge > (stepping even outside ISV boundaries for a minute). > > I believe, either because I'm insane (the likely > explanation), or because it's true, that Wine has > progressed remarkably in the past 5 years, and can > no longer be correctly dismissed as unstable or unusable. > > I think the shift from Alpha to Beta status was a > more dramatic signal that anyone really realizes; > I think it marks the point where Wine can reliably > be used for a broad range of purposes. > > But, bluntly, we have to prove it. We have to start > by continuing the drive to a solid 1.0; we have to > continue helping a small number of ISVs really succeed. > > And then of course comes the fun part; we have to hold > that line and not let any regressions in :-/. <Rant> Well that is a real sore spot with me. You know that I am a strong supporter of wine but it really concerns me that we have gone beta and not addressed preventing regessions from getting into our releases in any way. We currently have no freeze or notification of exactly when the next release is going to go out. Sure we had the one big code freeze just before 0.9 but then we went back to releasing without any notification. At his point even if our application maintainers test their app every day there is no way for them to prevent that regression going into the next release. We had at least one known regression creep into 0.9.3. and maybe more that could have been corrected if we had some warning. I think that going to beta without any real attempt to provide even the most basic freeze release cycle is not a good thing. At the very minimum I would think that we should know when the releases are going to happen but we do not even know that. </Rant> > > But I think we can do it; it's why I'm still here. > Ditto. -- Tony Lambregts

5 7

Supporting ISVs (was: Create new mailing list wine-isv?)
by Dan Kegel 17 Dec '05

17 Dec '05

Markus Goemmel wrote: > My partner and I are developing Windows applications > (http://www.emtec.com). Seeing Wine some months ago fascinated > me a lot, so since then I'm spending one or two hours a day > trying to bring our applications to work under Wine, too... > > But it's clear that there are not enough ressources there > to help ISVs like me out of some problems. Sometimes I have > contact with one of the developers after submitting a bug, > or writing something into the wine-devel list, but without > doing a lot of clarification before (like looking into the > Wine sources, close in the problem area, and asking really > specific questions to the corresponding 5 or 10 lines of code > in the Wine sources) nobody really have time to help. Hmm. Guess you're working on zoc: http://appdb.winehq.org/appview.php?versionId=3744 And you've filed ten bugs so far: http://bugs.winehq.org/buglist.cgi?emailreporter2=1&emailtype2=substring&em… only one or two of which have been fixed. I was curious, so I tried running zoc on wine-0.9.3 (compiled myself on FC3). The first time I started it, it exited with an assertion; the log is --- EmTec Application --- 12/17/2005 6:40:02 AM --- Condition: hwndLed Location : status.cpp line 878 Last Err.: 0L () Add. Info: Every time I started it after that, it exits with a dialog "Panic: no fonts!". I'd like to see this work; got any tips? I'm glad you're sticking around even though it's hard to get your questions answered! Hopefully we can improve the ISV experience with your feedback. Are you interested in being interviewed as a case study for my ISV page, http://kegel.com/wine/isv ? Thanks, Dan

1 0

Error at end of app install: can't open builtin library for regsvr32.exe...
by Dan Kegel 17 Dec '05

17 Dec '05

Hrm. Haven't seen this one before. At the end of installation of IBM Homepage Builder 6.0 for Windows, I get wine: cannot open builtin library for L"C:\\windows\\system32\\regsvr32.exe": /home/dank/wine/programs/regsvr32.exe.so: invalid ELF header This is with 0.9.3 built on fc3. Thanks, Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 7

Partial success report: Ability Office 4.14
by Dan Kegel 17 Dec '05

17 Dec '05

Ability Office has a Linux version done with winelib, but I wanted to go whole hog and run the Windows version using wine 0.9.3. There were a few issues along the way. I started by downloading their normal Windows setup program: wget http://www.ability.com/download4/ability4_14/setup.exe wine setup.exe This failed with fixme:urlmon:URLDownloadToCacheFileW ((nil) L"http://www.abilitydownload.com/download4/ability4_14/Ability.MSI" 0x7bc80a88 520 0 0x7b91fb00) Evidently setup.exe is just a little thing that downloads the real thing from their web site, but that doesn't work in Wine yet. So I followed their alternate download procedure: wget http://www.abilitydownload.com/download4/zip/ability4_14.zip unzip ability4_14.zip wine Ability.MSI This failed because Wine doesn't know enough to run msiexec when you do this :-( But running msiexec by hand works: msiexec Ability.MSI I could then run ability write and create documents. Visually, things looked pretty good. Performance-wise, though, it really couldn't keep up with my typing, and took waaaay too long to start up. This is on a 2GHz system with lots of RAM, so it's kind of inexcusable. Gotta go be a dad now, but thought this little bit of data would be interesting to somebody. -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: ScrollDC should not clip output if a clipping rect is not specified
by Rein Klazes 16 Dec '05

16 Dec '05

On Fri, 16 Dec 2005 22:17:29 +0800, you wrote: >Hello, > >here is hopefully a correct version of the patch. > >Changelog: > Rein Klazes <wijn(a)wanadoo.nl> > Add another set of ScrollDC tests. > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Add a ScrollDC test with NULL clipping rect. > ScrollDC should not clip output if a clipping rect is not specified. > >diff -up cvs/hq/wine/dlls/user/tests/win.c wine/dlls/user/tests/win.c >--- cvs/hq/wine/dlls/user/tests/win.c 2005-11-30 23:19:27.000000000 +0800 >+++ wine/dlls/user/tests/win.c 2005-12-16 21:51:28.000000000 +0800 Dmitry, I do not understand: these tests pass here without your two patches. Also visually I do not see the failure that you are supposedly fixing. Rein.

1 1

msi failure
by Bill Medland 16 Dec '05

16 Dec '05

Seeing as how I know nothing much about msi I thought I'd just point out the error and ask someone more knowledgeable to do something about it. Basically on msiexec a VBA6.msi: dialog.c - msi_dialog_oncreate includes dialog->default_font = msi_dup_property (.., "DefaultUIFont"); Later on that default font can be referenced without testing if it is non-null In my particular case it is null (because the property is not found). Presumably if msi_dup_property returns null then some other default should be used, e.g. MS Shell Dlg. Any comments? Anyone volunteering to fix it? -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

1 0

Re: SHFileOperationW split
by Joris Huizer 16 Dec '05

16 Dec '05

Sorry, just got a message of someone (James Hawkins) telling me he's working on the function and it's best not modified before his patches get applied :-) After that, we''ll see whether any of this still finds a need :-)

1 0

Re: msvcrt: Printf Integer Conversions
by Alexandre Julliard 16 Dec '05

16 Dec '05

Jesse Allen <the3dfxdude(a)gmail.com> writes: > Changes: > Add support for I64 integer sizes in printf. Handle I and I32 sizes > using libc's printf. The tests fail: printf.c:45: Test succeeded inside todo block: Problem with long long printf.c:46: Test succeeded inside todo block: return count wrong printf.c:51: Test failed: I0d failed printf.c:63: Test failed: I64D failed: %D printf.c:106: Test failed: #+25.22I64u conversion for -1 failed: got ' 0018446744073709551615', should be ' 18446744073709551615' -- obscure windows msvcrt bug? printf.c:114: Test failed: Problem with "ll" interpretation printf.c:115: Test failed: return count wrong printf.c:369: Test succeeded inside todo block: Problem with long long -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: SHFileOperationW 1 : helper functions
by Mike McCormack 16 Dec '05

16 Dec '05

Joris Huizer wrote: > When this patch is accepted I'll submit the rest (that is, the code > using these functions) I appreciate somebody is spending the time to clean up that function. Unfortunately, a patch adding functions that aren't yet used is not likely to be accepted. Secondly, even if your style is the only true one, please copy the existing style in that file so we don't end up with another mish-mash mess of coding styles. (And sorry, but 2 space indent is not the one true style ;) Mike > +static int shfileops_delete_file(WIN32_FIND_DATAW *wfd,int confirm,LPWSTR pFromFile,LPWSTR pTempFrom) > +{ > + int retCode = 0; > + LPWSTR lpFileName; > + lpFileName = wfd->cAlternateFileName; > + if (!lpFileName[0]) > + lpFileName = wfd->cFileName; >

1 0

SHFileOperationW 1 : helper functions
by Joris Huizer 16 Dec '05

16 Dec '05

This patch adds a simple structure to contain commonly-requested file properties (named `struct fileops_file_data`, wondering whether that name should that change?) Functions added: -void printFileData(): debugging function, printing contents of a `struct fileops_file_data` thing; -int shfileops_delete_file() function to delete given file -- making sure to call the right functions for either a regular file or a directory -int shfileop_unmasked_setup() the extracted code common for move and copy calls -int shfileop_move_unmasked the specific code on moving unmasked -- this one does a lot of recursion on SHFileOperationW -int shfileop_copy_unmasked the specific code on copying unmasked -- this one does some recursion too Further more, I seperated code of deleting, renaming, moving, and copying, and the overall result is that code becomes simpler - though a small amount of code is duplicated (mostly in move/copy operations, that's why I split the largest part of common code in a separate function) When this patch is accepted I'll submit the rest (that is, the code using these functions) Index: shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.56 diff -u -p -r1.56 shlfileop.c --- shlfileop.c 10 Nov 2005 11:15:22 -0000 1.56 +++ shlfileop.c 16 Dec 2005 15:21:05 -0000 @@ -866,9 +866,69 @@ static const char * debug_shfileops_acti return wine_dbg_sprintf("%s", cFO_Name[ op ]); } +struct fileops_file_data +{ + LPCWSTR next; + LPCWSTR name; + LPWSTR temp; + LPWSTR file; + DWORD attr; + DWORD pathAttr; + BOOL multi; + BOOL invalidTail; + BOOL valid; + BOOL tailSlash; +}; + +void printFileData(struct fileops_file_data *field) +{ + + TRACE("data on %p:\n" + "next: %s\n" + "name: %s\n" + "temp: %s\n" + "file: %s\n" + "attr: %lx\n" + "pathAttr: %lx\n" + "multi: %d\n" + "invalidTail: %d\n" + "valid: %d\n" + "tailSlash: %d\n", + field, + debugstr_w(field->next), + debugstr_w(field->name), + debugstr_w(field->temp), + debugstr_w(field->file), + field->attr, + field->pathAttr, + field->multi, + field->invalidTail, + field->valid, + field->tailSlash + ); +} + #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 #define HIGH_ADR (LPWSTR)0xffffffff +static int shfileops_delete_file(WIN32_FIND_DATAW *wfd,int confirm,LPWSTR pFromFile,LPWSTR pTempFrom) +{ + int retCode = 0; + LPWSTR lpFileName; + lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + if (IsAttribFile(wfd->dwFileAttributes)) + { + if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) + retCode = 0x78; /* value unknown */ + } + else if(!SHELL_DeleteDirectoryW(pTempFrom,confirm)) + retCode = 0x79; /* value unknown */ + return retCode; +} + /* handle the complete deletion of `pTempFrom` */ static int shfileops_delete(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW nFileOp, LPWSTR pFromFile,LPWSTR pTempFrom,HANDLE *hFind) @@ -884,20 +944,12 @@ static int shfileops_delete(WIN32_FIND_D if (IsDotDir(lpFileName) || ((b_Mask) && IsAttribDir(wfd->dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) continue; - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */ - if (IsAttribFile(wfd->dwFileAttributes)) - { - if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) - { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x78; /* value unknown */ - } - } - else if(!SHELL_DeleteDirectoryW(pTempFrom, (!(nFileOp.fFlags & FOF_NOCONFIRMATION)))) + + retCode = shfileops_delete_file(wfd,(nFileOp.fFlags & FOF_NOCONFIRMATION) == 0,pFromFile,pTempFrom); + if (retCode) { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x79; /* value unknown */ + nFileOp.fAnyOperationsAborted = TRUE; + break; } } while (!nFileOp.fAnyOperationsAborted && FindNextFileW(*hFind,wfd)); @@ -1001,6 +1053,210 @@ static DWORD shfileops_get_parent_attr(L return PathAttr; } +static int shfileop_unmasked_setup(WIN32_FIND_DATAW wfd, struct fileops_file_data *to,struct fileops_file_data *from,BOOL b_Multi,long FuncSwitch) +{ + int retCode = 0; + + TRACE("b_Multi: %d\n",b_Multi); + TRACE("to:\n"); + printFileData(to); + TRACE("from:\n"); + printFileData(from); + + if (IsAttribDir(wfd.dwFileAttributes) && (to->attr == INVALID_FILE_ATTRIBUTES)) + { + if (to->file) + { + to->pathAttr = shfileops_get_parent_attr2(to->file,to->temp,to->valid,&retCode); + if (retCode) + return retCode; + if (to->invalidTail) + { + retCode = 0x10003; + return retCode; + } + } + } + + /* trailing BackSlash is ever removed and to->file points to BackSlash before */ + if (!to->multi && (from->multi || (!(b_Multi) && IsAttribDir(to->attr)))) + { + if ((FO_MOVE == FuncSwitch) && IsAttribDir(to->attr) && IsAttribDir(wfd.dwFileAttributes)) + { + if (b_Multi) + { + retCode = 0x73; /* !b_Multi = 0x8 ?? */ + return retCode; + } + } + to->file = SHFileStrCpyCatW(to->temp, NULL, wfd.cFileName); + to->attr = GetFileAttributesW(to->temp); + } + + if (IsAttribDir(to->attr)) + { + if (IsAttribFile(wfd.dwFileAttributes)) + { + retCode = (FO_COPY == FuncSwitch) ? 0x75 : 0xb7; + return retCode; + } + } + else + { + to->pathAttr = shfileops_get_parent_attr(to->file,to->temp); + if (IsAttribFile(to->pathAttr)) + { + /* error, is this tested ? */ + retCode = 0x777402; + return retCode; + } + } + + /* singlesource + no mask */ + if (INVALID_FILE_ATTRIBUTES == (to->attr & to->pathAttr)) + { + /* Target-dir does not exist, and cannot be created */ + retCode=0x75; + return retCode; + } + + return retCode; +} + +static int shfileop_move_unmasked( SHFILEOPSTRUCTW nFileOp,WIN32_FIND_DATAW wfd, struct fileops_file_data to, struct fileops_file_data from) +{ + int retCode = 0; + int level = nFileOp.wFunc >> 4; + + BOOL b_SameRoot = (toupperW(from.temp[0]) == toupperW(to.temp[0])); + + to.file = NULL; + if ((to.attr == INVALID_FILE_ATTRIBUTES) && SHFileStrICmpW(from.temp, to.temp, from.file, NULL)) + { + nFileOp.wFunc = ((level+1)<<4) + FO_RENAME; + } + else + { + if (b_SameRoot && IsAttribDir(to.attr) && IsAttribDir(wfd.dwFileAttributes)) + { + /* FIXME: moving directory contents into the other one: + * - path\\ -> path\\* + * MOVE + * - loop over files in path\\*, eg path\\file + * MOVE + * - COPY, DELETE + * + * is this really necessary? why not a dedicated recursive + * (light-weight) function? + */ + /* we need to.file for FO_DELETE after FO_MOVE contence */ + to.file = SHFileStrCpyCatW(from.temp, NULL, wWildcardFile); + } + else + { + nFileOp.wFunc = ((level+1)<<4) + FO_COPY; + } + } + + switch(nFileOp.wFunc & FO_MASK) + { + case FO_MOVE: + retCode = SHFileOperationW(&nFileOp); + break; + case FO_RENAME: + /* + retCode = SHFileOperationW(&nFileOp); + */ + if (SHNotifyMoveFileW(from.temp, to.temp) != ERROR_SUCCESS) + { + /* we need still the value for the returncode, we use the mostly assumed */ + retCode = 0xb7; + nFileOp.fAnyOperationsAborted = TRUE; + } + break; + case FO_COPY: + retCode = SHFileOperationW(&nFileOp); + break; + default: + retCode = SHFileOperationW(&nFileOp); + break; + } + + if (to.file) + ((DWORD*)to.file)[0] = '\0'; + if (!nFileOp.fAnyOperationsAborted && (FO_RENAME != (nFileOp.wFunc & 0xf))) + { + /* + TRACE("preparing for delete\n"); + nFileOp.wFunc = ((level+1)<<4) + FO_DELETE; + TRACE("delete: going to execute: %s: flags (0x%04x) : %s\n", + debug_shfileops_action(nFileOp.wFunc & FO_MASK), nFileOp.fFlags, + debug_shfileops_flags(nFileOp.fFlags) ); + + retCode = SHFileOperationW(&nFileOp); + TRACE("returned: %d\n",retCode); + */ + retCode = shfileops_delete_file(&wfd,(nFileOp.fFlags & FOF_NOCONFIRMATION) == 0,from.file,from.temp); + } + + return retCode; +} + +static int shfileop_copy_unmasked(SHFILEOPSTRUCTW nFileOp,WIN32_FIND_DATAW wfd,struct fileops_file_data to,struct fileops_file_data from) +{ + int retCode = 0; + BOOL not_overwrite = (!(nFileOp.fFlags & FOF_NOCONFIRMATION) || (nFileOp.fFlags & FOF_RENAMEONCOLLISION)); + BOOL ask_overwrite = (!(nFileOp.fFlags & FOF_NOCONFIRMATION) && !(nFileOp.fFlags & FOF_RENAMEONCOLLISION)); + + if (SHFileStrICmpW(from.temp, to.temp, NULL, NULL)) + { /* target is the same as source ? */ + /* we still need the value for the returncode, we assume 0x71 */ + retCode = 0x71; + return retCode; + } + if (IsAttribDir((to.attr & wfd.dwFileAttributes))) + { + if (IsAttribDir(to.attr) || !SHNotifyCreateDirectoryW(to.temp, NULL)) + { + /* FIXME: copying directory contents into the other one: + * - path\\ -> path\\* + * COPY + * - loop over files in path\\*, eg path\\file + * COPY + * + * is this really necessary? why not a dedicated recursive + * (light-weight) function? + */ + + /* ??? nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES); */ + SHFileStrCpyCatW(from.temp, NULL, wWildcardFile); + TRACE("recursive copy\n"); + retCode = SHFileOperationW(&nFileOp); + } + else + { + retCode = 0x750;/* value unknown */ + return retCode; + } + } + else + { + if (!(ask_overwrite && SHELL_ConfirmDialogW(ASK_OVERWRITE_FILE, to.temp)) + && (not_overwrite)) + { + /* we still need the value for the returncode, we use the mostly assumed */ + retCode = 0x73; + return retCode; + } + if (SHNotifyCopyFileW(from.temp, to.temp, TRUE) != ERROR_SUCCESS) + { + retCode = 0x77; /* value unknown */ + return retCode; + } + } + return retCode; +} + /************************************************************************* * SHFileOperationW [SHELL32.@] *

1 0

Re: OLE without TLS libraries
by Cihan Altinay 16 Dec '05

16 Dec '05

Quoting Marcus Meissner <marcus(a)jet.franken.de>: > On Thu, Dec 08, 2005 at 12:35:32PM +1000, Cihan Altinay wrote: > > Hi, > > > > having a Xen system my Linux tls library path is not > > in place (renamed to /lib/tls.disabled). > > When I run a program that uses OLE/DCOM (with native > > ole libraries) it crashes immediately. Using > > LD_LIBRARY_PATH=/lib/tls.disabled wine program > > makes it work again. > > I am not sure if this is true for all OLE apps. > > > > Is this known/expected behaviour or a bug? > > Do you have a backtrace of the crash or similar? Just wanted to create one with the latest CVS but it seems it was fixed some days ago. I investigated a bit and to my surprise the problem was in x11drv which was patched 2005-12-06. We had that problem since weeks and were "happy" with the library path solution until I thought I might ask here. So it was quite a surprise that it was fixed just now :-) Thanks anyway, Cihan

4 8

Re: Wine IE6 and JVM
by "Alexander N. Sørnes" 16 Dec '05

16 Dec '05

Hi! Microsof'ts JVM is not bundled with Internet Explorer; in fact, it is not shipped with newer versions of Windows either, because of an antitrust settlement with Sun. Either download the Sun JVM, or search for the Microsoft JVM in Google (it is not available from Microsoft). Regards, Alexander N. Sørnes Adrian Munteanu skrev: > Hi guys, > > I am trying to use wine with IE 6. > Most of the pages are displaying fine, however the problem is with > pages requesting JVM running. > So could you please help me find away, if available, to make IE use > installed JVM? > > Thanks and best regards > Adrian > > > > >

2 1

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