August 2005 - Wine-Devel - list.winehq.org

CodeWeavers Installer Challenge - XMLSpy Enterprise Suite
by Vijay Kiran Kamuju Aug. 17, 2005

Aug. 17, 2005

Hi, I was trying to install Altova XMLSpy Enterprise demo version, on linux with wine-20050725 version. It is hanging and it seems that in the begining there are some stream errors, fixeme: AppSearch must be implemented in ACTION_AppsearchComponents for CmpLocator tab (some thing like it). I wanted to test current msxml implementation as it might use msxml3 parser internally (i dunno really). Thanks, Vijay

1 0

Re: Lostwages: acknowledgement take two.......
by Jonathan Ernst Aug. 17, 2005

Aug. 17, 2005

I have sent about 310 patches since december 2004, mostly for AppDB, some for lostwages and bugzilla and quite a few translating resources files in french and reimplementing the uninstaller, I really don't know if it makes it worth inclusion and won't be angry if I'm not included. Le mardi 16 août 2005 à 05:50 -0400, Tom Wickline a écrit : > Hello All, > > If your aware of someone missing from this list that should have > inclusion please let me know and ill happily include them in a future > update. > > Also: If I left someone at 2004 and they should be at 2005 let me > know! I updated all the folks that I remember sending in a number of > patches.... > > This patch includes Paul Vriens to the acknowledgment and who pages. > > Tom > > Changelog: > minor fixes, update to 2005 -- Jonathan Ernst <Jonathan(a)ErnstFamily.ch>

2 2

Re: KERNEL/tests: test WideCharToMultiByte
by Alexandre Julliard Aug. 17, 2005

Aug. 17, 2005

Saulius Krasuckas <saulius2(a)ar.fi.lt> writes: > Log message: > Saulius Krasuckas <saulius.krasuckas(a)ieee.org> > Add a test for WideCharToMultiByte. This should go in codepage.c. -- Alexandre Julliard julliard(a)winehq.org

1 0

WineHQ: Default font
by Christian Britz Aug. 17, 2005

Aug. 17, 2005

Hi all, I noticed a little possibility to improve www.winehq.org with very little effort: I am talking about the default font for the website. if you look at http://www.winehq.org/winehq_styles.css you will easily see that the default font is "bitstream vera sans", followed by "verdana" and "arial" if vera is not available. Despite the fact that MS might be considered evil by some kids, Verdana and Arial look _much_ better and professional than Vera. I even removed Vera from my system just tomake the homepage look better and mor profesional. I would suggest that the responsible people switch the default font to Arial, which is also available on most Unix systems. No Offence meant! Regards, Christian

2 1

Future Acknowledgement & Who's Who updates
by Tom Wickline Aug. 16, 2005

Aug. 16, 2005

Hello, I am in the process of updating our "Acknowledgement" & "Who's Who" pages and if anyone here wants to be included and your currently not just send me a mail and ask for inclusion. If you want inclusion on the "Acknowledgement" page let me know what aerie's you have worked on and you will be added in on my next patch. If you believe you will be around for some time to come (a year) and want to be included to the "Who's Who" page let me know this as well. For the "Who's Who" I will need a short description of who you are, where your from, when you started working on wine, and what aerie's you work on. You can look at other entries for a good example.. http://www.winehq.org/site/who http://www.winehq.org/site/acknowledgement This is what I have thus far for my next update. ADD - Jonathan Ernst (Acknowledgement page) ADD - Krzysztof Foltman (Acknowledgement page) ADD - Phil Krylov (Acknowledgement page) Update - Gerald Pfeifer to (2005) Update - Michael Jung to (2005) Update - James Hawkins to (2005) Update - Vitaliy Margolen to (2005) Update - Mike Hearn to (2005) Tom

1 0

Re: Lostwages: developer-cheatsheet.template.diff
by Andreas Mohr Aug. 16, 2005

Aug. 16, 2005

Hi, On Tue, Aug 16, 2005 at 06:17:27PM +0200, Francois Gouget wrote: > Actually 'dereference' is correct here, although I have no doubt that it > is not in any dictionary. Huh, why? http://dictionary.reference.com/search?q=dereference But OTOH it does mention "well established in jargon", so you might have a point here. Andreas

3 2

Re: DINPUT: Generic FF effect implementation (FF #4)
by Daniel Remenak Aug. 16, 2005

Aug. 16, 2005

Could I get some feedback on why this has not been applied? I've got several additional patches prepared already that depend on it and if something needs to be changed I'd like to know before I get even more that do. It still applies cleanly to CVS. If it's just not being applied because it's considered dead code I can submit the other patches that actually use it. Thanks, Daniel Remenak On 8/6/05, Daniel Remenak <dtremenak(a)gmail.com> wrote: > The fourth in a series of patches to enable force feedback through > DirectInput on linux event devices. > > Changelog: > Add a generic force feedback effect implementation > > This patch includes a bunch of support code for all DirectInput FF > effects, and adds stubs for a generic FF effect interface. > > Details: > 1. Stubs for a generic implementation of the IDirectInputEvent interface > 2. Debug utility functions to dump common structures > 3. Implementations of necessary object functions (e.g. AddRef, > Release, QueryInterface) > 4. Complete implementations of system-independent SetParameters and > GetParameters > > This patch adds two files, effect.c and effect_private.h, in the > dlls/dinput directory. This patch depends on FF #3 in order to > compile. > > --Daniel Remenak > > <Attachment: ff-4-effect.diff, 20K> >

2 3

Re: Get shlfolder test running with shell32 4.0
by Alexandre Julliard Aug. 16, 2005

Aug. 16, 2005

Francois Gouget <fgouget(a)codeweavers.com> writes: > Version 4.0 of the shell32 dll does not export StrRetToBufW(). Other shell32 versions don't either, since StrRetToBufW is in shlwapi ;-) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Report swap file total/free sizes to be the same as physical memory
by Andreas Mohr Aug. 16, 2005

Aug. 16, 2005

Hi, On Tue, Aug 16, 2005 at 11:49:34PM +0900, Dmitry Timoshkov wrote: + /* Project2k refuses to start if it sees less than 1Mb of free swap */ + if (lpmemex->ullTotalPageFile < lpmemex->ullTotalPhys) + lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys; + if (lpmemex->ullAvailPageFile < lpmemex->ullAvailPhys) + lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; 1 mega*bit* sounds a "bit" small... Andreas Mohr

1 0

Re: Winecfg and port access
by Christian Schmitz Aug. 16, 2005

Aug. 16, 2005

HI: Thanks for you answer but i dont know how program these lines for control ioperm(). Yes my system is Suse Linux 9.3 with kde upgraded 3.4.1 I solve the problem (in old wine) of this way: In the old file config i write [ppdev] "378" = "/dev/parport0" [ports] "read" = "0x779,0x378-0x37f,0x280-0x2a0" "write" = "0x779,0x378-0x37f,0x280-0x2a0" I set the attributes crw-rw-rw- 1 me root 99, 0 2005-03-19 16:36 /dev/parport0 crw-rw-rw- 1 lp lp 6, 0 2005-03-19 16:36 /dev/lp0 and add Myuser to the lp group. With all this i get the right of access. Maybe if you sendme a clue maybe i can make the wrapper. Thanks Christian >> I am using TopMax software (a chip programmer) with old wine version (with >> config file). >> >> I try the new wine but i not find where grant the FULL parallel port >> access to the TopMax program >> >> Where is the new config file for touch manually? or >> How i can make for grant port access (standard 378-37f) >If you're using linux, you will most likely have to use a suid-root wrapper >that calls ioperm() and subsequently drops privileges and invokes wine. >That's about 10 lines of C and should be a good exercise ;] I don't know >offhand how portable ioperm() is, and if there is something in /proc that >would be more portable, etc. > >I don't see anything suid-root that comes with wine, so probably wine itself >doesn't have anything of the sort. And I don't know either how wine managed >to pull it off before w/o using suid root executable, unless it did it via >signal catching and some manual forwarding to /dev/lp#. With right ioperms in >place the program should be able to run at full speed. -- En un mundo sin fronteras.... ¿Quién necesita Puertas y Ventanas? EN INGLES: In a world without frontiers, who needs Gates and Windows

1 0

Re: MSHMTL: Added QueryStatus implementation
by Saulius Krasuckas Aug. 16, 2005

Aug. 16, 2005

* On Tue, 2 Aug 2005, Jacek Caban wrote: > > --- dlls/mshtml/tests/htmldoc.c 26 Jul 2005 10:31:23 -0000 1.5 > +++ dlls/mshtml/tests/htmldoc.c 1 Aug 2005 22:33:37 -0000 > @@ -806,12 +806,76 @@ static void test_Persist() > } > } > > +static OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { > + 0, > + OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ > + OLECMDF_SUPPORTED, /* OLECMDID_NEW */ > + OLECMDF_SUPPORTED, /* OLECMDID_SAVE */ ... > + OLECMD cmd[2] = { > + {OLECMDID_OPEN, 0xf0f0}, > + {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} > + }; > + > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); > + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); > + > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); > + ok(hres == OLECMDERR_E_NOTSUPPORTED, > + "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); Jacek, OLECMDID_OPEN (equally as OLECMDID_NEW) isn't supported here on winME, AFAICT. Moreover, calls to IOleCommandTarget_QueryStatus throws an exception of Accesss Violation here. I tested this with OLECMDID_SAVE and it works OK. And we have a typo next, right? > + ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); > + ok(cmd[0].cmdf == OLECMDF_SUPPORTED, > + "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); Hence, there goes my try: Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Fix typo in a two checks. WinME fixes: - OLECMDID_OPEN and OLECMDID_NEW aren't supported. - Ignore unsupported OLECMDs as they throws exceptions. Index: dlls/mshtml/tests/htmldoc.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/tests/htmldoc.c,v retrieving revision 1.7 diff -p -u -r1.7 htmldoc.c --- dlls/mshtml/tests/htmldoc.c 3 Aug 2005 21:26:40 -0000 1.7 +++ dlls/mshtml/tests/htmldoc.c 13 Aug 2005 16:09:15 -0000 @@ -808,8 +808,8 @@ static void test_Persist() static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { 0, - OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ - OLECMDF_SUPPORTED, /* OLECMDID_NEW */ + 0, /* OLECMDID_OPEN */ + 0, /* OLECMDID_NEW */ OLECMDF_SUPPORTED, /* OLECMDID_SAVE */ OLECMDF_SUPPORTED|OLECMDF_ENABLED, /* OLECMDID_SAVEAS */ OLECMDF_SUPPORTED, /* OLECMDID_SAVECOPYAS */ @@ -842,7 +842,7 @@ static const OLECMDF expect_cmds[OLECMDI OLECMDF_SUPPORTED, /* OLECMDID_SHOWPAGESETUP */ OLECMDF_SUPPORTED, /* OLECMDID_SHOWPRINT */ 0,0, - OLECMDF_SUPPORTED, /* OLECMDID_CLOSE */ + OLECMDF_SUPPORTED, /* OLECMDID_DONTDOWNLOADCSS */ 0,0,0, OLECMDF_SUPPORTED, /* OLECMDID_SETPRINTTEMPLATE */ OLECMDF_SUPPORTED /* OLECMDID_GETPRINTTEMPLATE */ @@ -854,7 +854,10 @@ static void test_OleCommandTarget(IOleCo int i; HRESULT hres; + ZeroMemory(cmds, sizeof(cmds)); + for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + if(!expect_cmds[i+1]) continue; cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; } @@ -863,6 +866,7 @@ static void test_OleCommandTarget(IOleCo ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + if(!expect_cmds[i+1]) continue; ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %lx\n", i, cmds[i].cmdID); ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%lx, expected %x\n", i+1, cmds[i].cmdf, expect_cmds[i+1]); @@ -961,7 +965,7 @@ static void test_HTMLDocument(void) int i; OLECMD cmd[2] = { - {OLECMDID_OPEN, 0xf0f0}, + {OLECMDID_SAVE, 0xf0f0}, {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} }; @@ -973,9 +977,9 @@ static void test_HTMLDocument(void) "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); ok(cmd[1].cmdID == OLECMDID_GETPRINTTEMPLATE+1, "cmd[0].cmdID=%ld, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); - ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); + ok(cmd[1].cmdf == 0, "cmd[1].cmdf=%lx, expected 0\n", cmd[1].cmdf); ok(cmd[0].cmdf == OLECMDF_SUPPORTED, - "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); + "cmd[0].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[0].cmdf); hres = IOleCommandTarget_QueryStatus(cmdtrg, &IID_IHTMLDocument2, 2, cmd, NULL); ok(hres == OLECMDERR_E_UNKNOWNGROUP,

2 9

want to change the behaviour of wine when minimising in kde?
by Fabio Duarte Vilas Boas Aug. 16, 2005

Aug. 16, 2005

When minimizing, I dont like the icon and would like to know how to change it? __________________________________________________ Converse com seus amigos em tempo real com o Yahoo! Messenger http://br.download.yahoo.com/messenger/

2 1

Lines of code in Wine?
by Tom Wickline Aug. 16, 2005

Aug. 16, 2005

Hello, I was looking at our line count so I could update the history page and the FAQ with new up to date numbers. And my numbers come no where close to what has been reported in the past. anyone care to generate the current line count ? Here is the numbers I get if anyone is interested. Wine: ansic: 1025534 (96.99%) perl: 18339 (1.73%) yacc: 6503 (0.61%) sh: 4064 (0.38%) lex: 2916 (0.28%) awk: 54 (0.01%) Total = 1,057,410 Lostwages: php: 1469 (100.00%) Total = 1,469 AppDB: php: 9034 (97.78%) perl: 185 (2.00%) sh: 20 (0.22%) Total = 9,239 Tools: perl: 3725 (81.71%) python: 572 (12.55%) exp: 140 (3.07%) php: 115 (2.52%) sh: 7 (0.15%) Total = 4,559 kernel-win32: ansic: 6269 (100.00%) Total = 6,269 Grand Total = 1,078,946 Tom

3 4

Re: [MSXML]xmlnode_get_nodeName Implementation
by Mike McCormack Aug. 16, 2005

Aug. 16, 2005

Hi Vijay, Vijay Kiran Kamuju wrote: > i think it would be better if we put bstr_from_xmlChar in msxml_private.h > need directions how to implement domdoc_get_nodeName I'll post a patch to move bstr_from_xmlChar and other utility functions somewhere else in the code later. > please comment on the patch For now the basics of msxml3 aren't really decided (eg. how to map xmlNodePtr to IXMLDOMNode, etc), and how to manage the relationship between nodes. The way I'm managing node pointers will probably change again. What I really need is more test cases, so if you have any msxml test cases lying around, then let me know. Mike

2 4

Proposed interface for file operations by the file dialog code (dlls\commdlg\filedlg*.c)
by Troy Rollo Aug. 16, 2005

Aug. 16, 2005

References: <http://www.winehq.org/hypermail/wine-patches/2005/08/0265.html> <http://www.winehq.org/hypermail/wine-devel/2005/08/0286.html> Background: Work is currently proceeding on a branched version to create additional APIs for WINE that use UNIX path names rather than Windows ones. This is useful for Winelib apps and seeks to make them look more like they are native apps, thereby addressing some of the complaints that Winelib apps are somehow of lesser status than ports using other APIs. After some discussion, it was decided that this would remain a branch until at least such time as the implementation was proven to work in real-world situations. Part of this involves producing file dialog APIs that operate appropriately in this context. That includes taking UNIX path names on input, producing UNIX path names on output and in callbacks to the application, and browsing a heirarchy that does not include windows-isms such as drive letters. To make modifications directly in the existing code would result in a set of differences that would result in significant headaches for branch maintenance and any future merge-back to WineHQ. The objective is to reduce the differences so as to improve compatibility between the branches. The patch referenced above took a minimal-change approach to this problem by implementing an interface that mostly implemented the small operations made by the existing code, without even putting in local stubs (hence the inconsistent calling conventions in the interface). The general principle I have used is that path names should, as far as possible, be opaque so that the file dialog code itself never examines their contents directly, but rather calls functions in the interface to extract or locate particular portions of the path, to modify or concatenate paths or to make use of the paths. The minimalist interface: typedef struct { UINT code_page; WCHAR sep_char; HRESULT WINAPI (*get_top_folder) (IShellFolder **); LPITEMIDLIST (*get_pidl_from_name)(IShellFolder *, LPWSTR); BOOL (*get_display_name) (LPCITEMIDLIST, LPWSTR); IShellFolder* (*get_folder_from_pidl)(LPITEMIDLIST); BOOL WINAPI (*change_directory) (LPCWSTR); UINT WINAPI (*get_directory) (UINT, LPWSTR); void (*qualify_path) (LPWSTR, LPCWSTR); void (*complete_path) (LPWSTR); BOOL (*has_invalid_char) (LPCWSTR); LPWSTR WINAPI (*find_next_component) (LPCWSTR); LPWSTR WINAPI (*find_file_name) (LPCWSTR); LPWSTR WINAPI (*find_extension) (LPCWSTR); BOOL WINAPI (*file_exists) (LPCWSTR); BOOL WINAPI (*is_directory) (LPCWSTR); LPWSTR WINAPI (*add_dir_sep) (LPWSTR); DWORD WINAPI (*get_full_path) (LPCWSTR, DWORD, LPWSTR, LPWSTR*); } FileDlgFileOps; Minimalist interface vs ideal interface: On IRC this morning Alexandre said he would prefer a well-designed interface to the minimalist approach, hence this discussion. Since the interface is entirely internal to commdlg, I will use cdecl calling conventions. Detailed discussion follows. The code_page member was put there because the UNIX file name APIs may not use the same code page as other A entry points. WINE uses CP_ACP (as does Windows - although CP_THREAD_ACP is subject to further investigation) for most purposes, but CP_UNIXCP for UNIX path names when translating them to UTF16. Often CP_UNIXCP will be something like UTF8, or it may be ISO8859-1 in situations where Windows would use CP1252. It may be that a Winelib application should have CP_ACP set to be the UNIX code page, but they may not (and unless they do something special will not. So places where A->W or W->A conversions happen on path names need to make sure they use the right code page in the context. The minimalist approach was to make this a data member, but the ideal approach would be to have functions which performed the appropriate conversions. Looking through the existing code, the conversions are performed in some contexts where the output is allocated, and others where the output is a fixed size buffer. If we want to have just one conversion function for each direction, this would give us: CHAR *filename_wtoa(WCHAR const *in, CHAR *out, int bufrange); WCHAR *filename_atow(CHAR const *in, WCHAR *out, int bufrange); "in" is the input buffer. "out" is the output buffer (NULL if we want the method to allocate). "bufrange" is the number of elements pointed to by "out". The return value is a pointer to the file name on success, and is either the value of "out", or an allocated buffer where "out" is NULL. On failure the return value is NULL. The sep_char is perhaps the rudest part of the minimalist interface since it does not treat the path names as opaque. It is used in the following contexts: The handling of CDM_GETFILEPATH, where it is used to paste the file name and directory name together; and in FILEDLG95_InitControls, where it is used to determine if the input file name has a path component. With an ideal interface the CDM_GETFILEPATH handling would be changed to use a general path qualification function. Determining if the input file name has a path component could be handled in one of two ways: with a method for querying this; or by searching for the start of the file name component and testing if that is the start of the string [ie. find_file_name(input) != input]. I prefer the latter method since it means one less entry in the interface, but if the boolean function were preferred it might appear as: BOOL has_path(char const *filename); get_top_folder exists because the Windows path versions of the dialog use the Desktop folder as their top level, but a UNIX path version should arguably use the UNIX root as its top level. Operations retrieving the top level folder (SHGetDesktopFolder) appear in many places. I would prefer to return the pointer though, hence: IShellFolder *get_top_folder(void); The next three functions in the minimal interface (get_pidl_from_name; get_display_name; and get_folder_from_pidl) are functions that are already implemented for Windows path names and are used to handle conversions between item ID lists and path names. Unless somebody thinks the existing implementations are in need of reworking, I don't see any reason not to include them as is in the interface. The next two functions (change_directory; and get_directory) are currently direct calls to SetCurrentDirectoryW and GetCurrentDirectoryW in the default implementation of the interface. In the UNIX path versions there is some difficulty in how these should be handled for reasons that are too complex to go into here, but by having the interface at least a start can be made on figuring out how to deal with these. GetCurrentDirectoryW is usually called in contexts where the buffer is allocated (albeit wastefully), but in one case is called on a stack buffer. I am inclined to have the stack buffer replaced by an allocated one, hence: BOOL set_directory(WCHAR const *dir); WCHAR *get_directory(void); Next comes qualify_path, which is used to generate a fully qualified and canonical (no '/../' sequences) path name given a directory name and a (possibly already fully qualified) path name. The minimalist declaration is based on the way this operation was implemented in FILEDLG95_OnOpen, but in accordance with my preference for allocating string buffers I would prefer: WCHAR *qualify_path(WCHAR const *path, WCHAR const *dir); It may be that if dir == NULL the function would use the current directory. complete_path is only used in one place - in FILEDLG95_OnOpen where the routine walks through its path elements, and tacks on a trailing backslash to paths like "c:" (which will be the first component of the path for "c: \windows\system.ini"). find_next_component (currently set to PathFindNextComponentW) is only used in that same context, so perhaps the better solution is to combine these two with: WCHAR *next_component(WCHAR const *path, WCHAR const *last); "last" is the most recent return value (or NULL for the first call). "path" is the input path. The return value is an allocated string containing the next path component, so you would get "c:\", "windows", "system.ini" as return values. has_invalid_char is used to test if the path name contains any invalid characters. The current default implementation is wrong, but reflects what was already there. The general rule is that Win32 paths (at least in the file dialog) should not contain '/', ':' (except as a drive letter (*)), '<'. '>', and '|'. IIRC, wild cards are forbidden in file names, but the filedlg code does not treat them as invalid because they are valid for entry into the edit box of the file dialog. Under UNIX, there are no invalid file name characters - any string is a valid file name although it may be a relative file name. I would keep this function but rename it: BOOL *valid_file_name(WCHAR const *filename); (*) can the file dialogs address stream names under NT? Is it meaningful to do the same under Wine since UNIX has no concept of file sub-streams? find_file_name and find_extension find the final path component, and the extension (if any) in the file name. These are fairly pure functions for handling otherwise opaque path names, so they would remain as is but without the WINAPI calling convention: WCHAR *find_file_name(WCHAR *filename); WCHAR *find_extension(WCHAR *filename); Next come file_exists and is_directory. These could be replaced by a single routine that requests the type of the file and returns -1 if the file does not exist: int get_file_type(WCHAR const *filename); Returns (with optional symbolic constants): -1: no such file 0: ordinary file 1: directory This would also simplify some other code where is_directory is called immediately after file_exists. add_dir_sep is used when pasting a path name and a wildcard string. If there are no objections, qualify_path could be used for such situations, thereby avoiding the need for a separate add_dir_sep. get_full_path is currently a call to GetFullPathNameW. It is used in 3 places in FILEDLG95_InitControls. Each time it is used to do three things: 1. Convert any 8.3 filenames to the long path name version, then extract the file name portion (if any) and directory name portion of the resulting long path, storing them in separate locations. I would simplify the call, allocating the result: WCHAR *get_full_path(WCHAR const *path); The file name component would then be discovered by a call to find_file_name. Obvious candidates for changes: 1. find_extension could be implemented using find_file_name in a way that obviates the need for a separate find_extension. 2. Might find_file_name be implemented in terms of next_component? This likely depends on the behaviour or next_component with a path like "f:\windows\" - if it only returns "f:\" and "windows" then it would not be suitable, but if it returns "f:\", "windows" and "" then it would. Proposed interface: typedef struct { CHAR *(*filename_wtoa)(WCHAR const *in, CHAR *out, int bufrange); WCHAR *(*filename_atow)(CHAR const *in, WCHAR *out, int bufrange); IShellFolder *(*get_top_folder)(void); LPITEMIDLIST (*get_pidl_from_name)(IShellFolder *, LPWSTR); BOOL (*get_display_name)(LPCITEMIDLIST, LPWSTR); IShellFolder* (*get_folder_from_pidl)(LPITEMIDLIST); BOOL (*set_directory)(WCHAR const *dir); WCHAR *(*get_directory)(void); int (*get_file_type)(WCHAR const *filename); WCHAR *(*qualify_path)(WCHAR const *path, WCHAR const *dir); WCHAR *(*get_full_path)(WCHAR const *filename); WCHAR *(*next_component)(WCHAR const *path, WCHAR const *last); WCHAR *(*find_file_name)(WCHAR *filename); WCHAR *(*find_extension)(WCHAR *filename); BOOL *(*valid_file_name)(WCHAR const *filename); } FileDlgFileOps;

1 0

Re: [Bug 3220] New: PowerFinder now braindead checking for msvcrt.dll
by Scott Edwards Aug. 16, 2005

Aug. 16, 2005

I have narrowed this bug down to local configuration options for PowerFinder.exe. When msvcrt and msvcrt40 are both set to 'native' *or* 'native' then 'builtin', the application functions as expected. If there's any way I can help narrow this down for you, please let me know. Thanks.

1 0

Re: Lostwages: howto.diff #2
by Lionel Ulmer Aug. 15, 2005

Aug. 15, 2005

On Mon, Aug 15, 2005 at 05:14:27PM -0400, Tom Wickline wrote: > Changelog: > Spelling fix and doc update Note that the 'if your running' typo is still here. Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

How dumb icone of wine in kde? I want to place my image when to minimize it
by Fabio Duarte Vilas Boas Aug. 15, 2005

Aug. 15, 2005

How dumb icone of wine in kde? I want to place my image when to minimize it _______________________________________________________ Yahoo! Acesso Grátis - Internet rápida e grátis. Instale o discador agora! http://br.acesso.yahoo.com/

1 0

Re: lostwages/templates/en howto.template
by Lionel Ulmer Aug. 15, 2005

Aug. 15, 2005

> Log message: > Tom Wickline <twickline(a)gmail.com> > spelling fix, doc update +<p>If your using an old version of Wine we recommend that you use a handy program called ^^^^ Sorry to spot this once it has been committed :-) Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

Re: MSHTML: test cleanup
by Jacek Caban Aug. 15, 2005

Aug. 15, 2005

This time with the patch. Changelog: - Code cleanup - Dissable tests after UIActivate failes (fixes tests win 9x) Index: dlls/mshtml/tests/htmldoc.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/tests/htmldoc.c,v retrieving revision 1.8 diff -u -p -r1.8 htmldoc.c --- dlls/mshtml/tests/htmldoc.c 15 Aug 2005 09:41:30 -0000 1.8 +++ dlls/mshtml/tests/htmldoc.c 15 Aug 2005 16:48:51 -0000 @@ -43,7 +43,6 @@ ok(called_ ## func, "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE -static IUnknown *htmldoc_unk = NULL; static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -469,7 +468,7 @@ static HRESULT WINAPI DocumentSite_Activ CHECK_EXPECT(ActivateMe); ok(pViewToActivate != NULL, "pViewToActivate = NULL\n"); - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IOleDocument, (void**)&document); + hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); if(SUCCEEDED(hres)) { @@ -513,8 +512,15 @@ static HRESULT WINAPI DocumentSite_Activ SET_EXPECT(SetActiveObject); SET_EXPECT(ShowUI); expect_SetActiveObject_active = TRUE; + hres = IOleDocumentView_UIActivate(view, TRUE); + + if(FAILED(hres)) { + trace("UIActivate failed: %08lx\n", hres); + return hres; + } ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); + CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(GetWindowContext); CHECK_CALLED(GetWindow); @@ -796,14 +802,14 @@ static LRESULT WINAPI wnd_proc(HWND hwnd return DefWindowProc(hwnd, msg, wParam, lParam); } -static void test_Persist() +static void test_Persist(IUnknown *unk) { IPersistMoniker *persist_mon; IPersistFile *persist_file; GUID guid; HRESULT hres; - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IPersistFile, (void**)&persist_file); + hres = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&persist_file); ok(hres == S_OK, "QueryInterface(IID_IPersist) failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersist_GetClassID(persist_file, NULL); @@ -816,7 +822,7 @@ static void test_Persist() IPersist_Release(persist_file); } - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IPersistMoniker, (void**)&persist_mon); + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&persist_mon); ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistMoniker_GetClassID(persist_mon, NULL); @@ -872,12 +878,18 @@ static const OLECMDF expect_cmds[OLECMDI OLECMDF_SUPPORTED /* OLECMDID_GETPRINTTEMPLATE */ }; -static void test_OleCommandTarget(IOleCommandTarget *cmdtrg) +static void test_OleCommandTarget(IUnknown *unk) { + IOleCommandTarget *cmdtrg; OLECMD cmds[OLECMDID_GETPRINTTEMPLATE]; int i; HRESULT hres; + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08lx\n", hres); + if(FAILED(hres)) + return; + for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; @@ -891,20 +903,63 @@ static void test_OleCommandTarget(IOleCo ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%lx, expected %x\n", i+1, cmds[i].cmdf, expect_cmds[i+1]); } + + IOleCommandTarget_Release(cmdtrg); } -static void test_HTMLDocument(void) +static void test_OleCommandTarget_fail(IUnknown *unk) { - IOleObject *oleobj = NULL; - IOleClientSite *clientsite = (LPVOID)0xdeadbeef; - IOleInPlaceObjectWindowless *windowlessobj = NULL; - IOleInPlaceActiveObject *activeobject = NULL; - IOleCommandTarget *cmdtrg = NULL; - GUID guid; - RECT rect = {0,0,500,500}; + IOleCommandTarget *cmdtrg; + int i; HRESULT hres; - ULONG ref; + OLECMD cmd[2] = { + {OLECMDID_OPEN, 0xf0f0}, + {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} + }; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + + + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); + + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); + ok(hres == OLECMDERR_E_NOTSUPPORTED, + "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + ok(cmd[1].cmdID == OLECMDID_GETPRINTTEMPLATE+1, + "cmd[0].cmdID=%ld, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); + ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); + ok(cmd[0].cmdf == OLECMDF_SUPPORTED, + "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); + + hres = IOleCommandTarget_QueryStatus(cmdtrg, &IID_IHTMLDocument2, 2, cmd, NULL); + ok(hres == OLECMDERR_E_UNKNOWNGROUP, + "QueryStatus failed: %08lx, expected OLECMDERR_E_UNKNOWNGROUP\n", hres); + + for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + if(!expect_cmds[i]) { + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_UPDATECOMMANDS, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == OLECMDERR_E_NOTSUPPORTED, + "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + } + } + + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_GETPRINTTEMPLATE+1, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == OLECMDERR_E_NOTSUPPORTED, + "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + + IOleCommandTarget_Release(cmdtrg); +} + +static HWND create_container_window(void) +{ static const WCHAR wszHTMLDocumentTest[] = {'H','T','M','L','D','o','c','u','m','e','n','t','T','e','s','t',0}; static WNDCLASSEXW wndclass = { @@ -916,402 +971,307 @@ static void test_HTMLDocument(void) NULL }; - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)&htmldoc_unk); - ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); - if(FAILED(hres)) - return; - RegisterClassExW(&wndclass); - container_hwnd = CreateWindowW(wszHTMLDocumentTest, wszHTMLDocumentTest, + return CreateWindowW(wszHTMLDocumentTest, wszHTMLDocumentTest, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); +} - test_Persist(); +static HRESULT test_DoVerb(IOleObject *oleobj) +{ + RECT rect = {0,0,500,500}; + HRESULT hres; - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IOleInPlaceObjectWindowless, - (void**)&windowlessobj); - ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless interface: %08lx\n", hres); + SET_EXPECT(GetContainer); + SET_EXPECT(LockContainer); + SET_EXPECT(ActivateMe); + expect_LockContainer_fLock = TRUE; + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "could not get IOleCommandTarget: %08lx\n", hres); + if(FAILED(hres)) + return hres; - hres = IUnknown_QueryInterface(htmldoc_unk, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); - if(oleobj) { - hres = IOleObject_GetUserClassID(oleobj, NULL); - ok(hres == E_INVALIDARG, "GetUserClassID returned: %08lx, expected E_INVALIDARG\n", hres); - - hres = IOleObject_GetUserClassID(oleobj, &guid); - ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres); - ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); + CHECK_CALLED(GetContainer); + CHECK_CALLED(LockContainer); + CHECK_CALLED(ActivateMe); - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); - ok(clientsite == NULL, "GetClientSite() = %p, expected NULL\n", clientsite); + return hres; +} - SET_EXPECT(GetHostInfo); - SET_EXPECT(GetOptionKeyPath); - SET_EXPECT(GetOverrideKeyPath); - SET_EXPECT(GetWindow); - hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); - CHECK_CALLED(GetHostInfo); - CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED(GetOverrideKeyPath); - CHECK_CALLED(GetWindow); +#define CLIENTSITE_EXPECTPATH 0x00000001 +#define CLIENTSITE_SETNULL 0x00000002 +#define CLIENTSITE_DONTSET 0x00000004 - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); - ok(clientsite == &ClientSite, "GetClientSite() = %p, expected %p\n", clientsite, &ClientSite); +static void test_ClientSite(IOleObject *oleobj, DWORD flags) +{ + IOleClientSite *clientsite; + HRESULT hres; - if(windowlessobj) { - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - } + if(flags & CLIENTSITE_SETNULL) { + hres = IOleObject_GetClientSite(oleobj, &clientsite); + ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - SET_EXPECT(ActivateMe); - expect_LockContainer_fLock = TRUE; - hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); - CHECK_CALLED(ActivateMe); + hres = IOleObject_SetClientSite(oleobj, NULL); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); } - if(cmdtrg) { - int i; - - OLECMD cmd[2] = { - {OLECMDID_OPEN, 0xf0f0}, - {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} - }; - - hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); - ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); - - hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); - ok(hres == OLECMDERR_E_NOTSUPPORTED, - "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); - ok(cmd[1].cmdID == OLECMDID_GETPRINTTEMPLATE+1, - "cmd[0].cmdID=%ld, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); - ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); - ok(cmd[0].cmdf == OLECMDF_SUPPORTED, - "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); - - hres = IOleCommandTarget_QueryStatus(cmdtrg, &IID_IHTMLDocument2, 2, cmd, NULL); - ok(hres == OLECMDERR_E_UNKNOWNGROUP, - "QueryStatus failed: %08lx, expected OLECMDERR_E_UNKNOWNGROUP\n", hres); - - for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { - if(!expect_cmds[i]) { - hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_UPDATECOMMANDS, - OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == OLECMDERR_E_NOTSUPPORTED, - "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); - } - } + if(flags & CLIENTSITE_DONTSET) + return; - hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_GETPRINTTEMPLATE+1, - OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == OLECMDERR_E_NOTSUPPORTED, - "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + hres = IOleObject_GetClientSite(oleobj, &clientsite); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); + ok(clientsite == NULL, "GetClientSite() = %p, expected NULL\n", clientsite); - test_OleCommandTarget(cmdtrg); + SET_EXPECT(GetHostInfo); + if(flags & CLIENTSITE_EXPECTPATH) { + SET_EXPECT(GetOptionKeyPath); + SET_EXPECT(GetOverrideKeyPath); } + SET_EXPECT(GetWindow); + hres = IOleObject_SetClientSite(oleobj, &ClientSite); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); + CHECK_CALLED(GetHostInfo); + if(flags & CLIENTSITE_EXPECTPATH) { + CHECK_CALLED(GetOptionKeyPath); + CHECK_CALLED(GetOverrideKeyPath); + } + CHECK_CALLED(GetWindow); - hres = IOleDocumentView_QueryInterface(view, &IID_IOleInPlaceActiveObject, (void**)&activeobject); - ok(hres == S_OK, "Could not get IOleInPlaceActiveObject interface: %08lx\n", hres); + hres = IOleObject_GetClientSite(oleobj, &clientsite); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); + ok(clientsite == &ClientSite, "GetClientSite() = %p, expected %p\n", clientsite, &ClientSite); +} - if(activeobject) { - HWND tmp_hwnd; - hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); - ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); - } +static void test_Close(IUnknown *unk, BOOL set_client) +{ + IOleObject *oleobj = NULL; + HRESULT hres; - if(view) { - SET_EXPECT(SetActiveObject); - SET_EXPECT(HideUI); - SET_EXPECT(OnUIDeactivate); - expect_SetActiveObject_active = FALSE; - hres = IOleDocumentView_UIActivate(view, FALSE); - ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); - CHECK_CALLED(SetActiveObject); - CHECK_CALLED(HideUI); - CHECK_CALLED(OnUIDeactivate); - } + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); + if(FAILED(hres)) + return; - if(cmdtrg) - test_OleCommandTarget(cmdtrg); + SET_EXPECT(GetContainer); + SET_EXPECT(LockContainer); + expect_LockContainer_fLock = FALSE; + hres = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); + ok(hres == S_OK, "Close failed: %08lx\n", hres); + CHECK_CALLED(GetContainer); + CHECK_CALLED(LockContainer); - if(activeobject) { - HWND tmp_hwnd; - hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); - ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); - } - - if(windowlessobj) { - SET_EXPECT(OnInPlaceDeactivate); - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - CHECK_CALLED(OnInPlaceDeactivate); - } + if(set_client) + test_ClientSite(oleobj, CLIENTSITE_SETNULL|CLIENTSITE_DONTSET); - /* Calling test_OleCommandTarget here couses Segmentation Fault with native - * MSHTML. It doesn't with Wine. */ + IOleObject_Release(oleobj); +} - if(activeobject) { - HWND tmp_hwnd; - hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); - ok(hres == E_FAIL, "GetWindow returned %08lx, expected E_FAIL\n", hres); - ok(IsWindow(hwnd), "hwnd is destroyed\n"); - } +static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) +{ + IOleInPlaceObjectWindowless *windowlessobj = NULL; + HRESULT hres; - if(view) { - hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08lx\n", hres); - } - if(windowlessobj) { - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - } + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, + (void**)&windowlessobj); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08lx\n", hres); + if(FAILED(hres)) + return; - if(view) { - IOleInPlaceSite *inplacesite = (IOleInPlaceSite*)0xff00ff00; + if(expect_call) SET_EXPECT(OnInPlaceDeactivate); + hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); + ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); + if(expect_call) CHECK_CALLED(OnInPlaceDeactivate); - hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08lx\n", hres); + IOleInPlaceObjectWindowless_Release(windowlessobj); +} - hres = IOleDocumentView_CloseView(view, 0); - ok(hres == S_OK, "CloseVire failed: %08lx\n", hres); +static HRESULT test_Activate(IUnknown *unk, DWORD flags) +{ + IOleObject *oleobj = NULL; + GUID guid; + HRESULT hres; - hres = IOleDocumentView_SetInPlaceSite(view, NULL); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); + last_hwnd = hwnd; - hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); - ok(inplacesite == NULL, "inplacesite=%p, expected NULL\n", inplacesite); - } + if(view) + IOleDocumentView_Release(view); + view = NULL; - if(oleobj) { - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - expect_LockContainer_fLock = FALSE; - hres = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - ok(hres == S_OK, "Close failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); + if(FAILED(hres)) + return hres; - if(view) - IOleDocumentView_Release(view); + hres = IOleObject_GetUserClassID(oleobj, NULL); + ok(hres == E_INVALIDARG, "GetUserClassID returned: %08lx, expected E_INVALIDARG\n", hres); - /* Activate HTMLDocument again */ - last_hwnd = hwnd; + hres = IOleObject_GetUserClassID(oleobj, &guid); + ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres); + ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); + test_ClientSite(oleobj, flags); + test_InPlaceDeactivate(unk, FALSE); - hres = IOleObject_SetClientSite(oleobj, NULL); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); + hres = test_DoVerb(oleobj); - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); - ok(clientsite == NULL, "GetClientSite() = %p, expected NULL\n", clientsite); + IOleObject_Release(oleobj); + return hres; +} - SET_EXPECT(GetHostInfo); - SET_EXPECT(GetWindow); - hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); - CHECK_CALLED(GetHostInfo); - CHECK_CALLED(GetWindow); +static void test_Window(IUnknown *unk, BOOL expect_success) +{ + IOleInPlaceActiveObject *activeobject = NULL; + HWND tmp_hwnd; + HRESULT hres; - if(windowlessobj) { - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - } + hres = IOleDocumentView_QueryInterface(view, &IID_IOleInPlaceActiveObject, (void**)&activeobject); + ok(hres == S_OK, "Could not get IOleInPlaceActiveObject interface: %08lx\n", hres); + if(FAILED(hres)) + return; - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - SET_EXPECT(ActivateMe); - expect_LockContainer_fLock = TRUE; - hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); - CHECK_CALLED(ActivateMe); - } + hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); - if(activeobject) { - HWND tmp_hwnd; - hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); + if(expect_success) { ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + }else { + ok(hres == E_FAIL, "GetWindow returned %08lx, expected E_FAIL\n", hres); + ok(IsWindow(hwnd), "hwnd is destroyed\n"); } - if(cmdtrg) - test_OleCommandTarget(cmdtrg); - - if(view) { - SET_EXPECT(SetActiveObject); - SET_EXPECT(HideUI); - SET_EXPECT(OnUIDeactivate); - expect_SetActiveObject_active = FALSE; - hres = IOleDocumentView_UIActivate(view, FALSE); - ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); - CHECK_CALLED(SetActiveObject); - CHECK_CALLED(HideUI); - CHECK_CALLED(OnUIDeactivate); - } - - if(windowlessobj) { - SET_EXPECT(OnInPlaceDeactivate); - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - CHECK_CALLED(OnInPlaceDeactivate); - } + IOleInPlaceActiveObject_Release(activeobject); +} - if(oleobj) { - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - expect_LockContainer_fLock = FALSE; - hres = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - ok(hres == S_OK, "Close failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); +static void test_CloseView(void) +{ + IOleInPlaceSite *inplacesite = (IOleInPlaceSite*)0xff00ff00; + HRESULT hres; - if(view) - IOleDocumentView_Release(view); + if(!view) + return; - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); + hres = IOleDocumentView_Show(view, FALSE); + ok(hres == S_OK, "Show failed: %08lx\n", hres); - hres = IOleObject_SetClientSite(oleobj, NULL); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); + hres = IOleDocumentView_CloseView(view, 0); + ok(hres == S_OK, "CloseView failed: %08lx\n", hres); - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); - ok(clientsite == NULL, "GetClientSite() = %p, expected NULL\n", clientsite); + hres = IOleDocumentView_SetInPlaceSite(view, NULL); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); - SET_EXPECT(GetHostInfo); - SET_EXPECT(GetWindow); - hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); - CHECK_CALLED(GetHostInfo); - CHECK_CALLED(GetWindow); + hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); + ok(inplacesite == NULL, "inplacesite=%p, expected NULL\n", inplacesite); +} - /* Activate HTMLDocument again, this time without UIActivate */ - last_hwnd = hwnd; - call_UIActivate = FALSE; - - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - SET_EXPECT(ActivateMe); - expect_LockContainer_fLock = TRUE; - hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); - CHECK_CALLED(ActivateMe); - } +static void test_UIDeactivate(void) +{ + HRESULT hres; - if(activeobject) { - HWND tmp_hwnd; - hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); - ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + if(call_UIActivate) { + SET_EXPECT(SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(OnUIDeactivate); } - if(view) { - expect_SetActiveObject_active = FALSE; - hres = IOleDocumentView_UIActivate(view, FALSE); - ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); - } + expect_SetActiveObject_active = FALSE; + hres = IOleDocumentView_UIActivate(view, FALSE); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); - if(windowlessobj) { - SET_EXPECT(OnInPlaceDeactivate); - hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); - CHECK_CALLED(OnInPlaceDeactivate); + if(call_UIActivate) { + CHECK_CALLED(SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(OnUIDeactivate); } +} - if(view) { - IOleInPlaceSite *inplacesite = (IOleInPlaceSite*)0xff00ff00; - - hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08lx\n", hres); +static void test_Hide(void) +{ + HRESULT hres; - hres = IOleDocumentView_CloseView(view, 0); - ok(hres == S_OK, "CloseView failed: %08lx\n", hres); + if(!view) + return; - hres = IOleDocumentView_SetInPlaceSite(view, NULL); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); + hres = IOleDocumentView_Show(view, FALSE); + ok(hres == S_OK, "Show failed: %08lx\n", hres); +} - hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); - ok(inplacesite == NULL, "inplacesite=%p, expected NULL\n", inplacesite); - } +static void test_HTMLDocument(void) +{ + IUnknown *unk; + HRESULT hres; + ULONG ref; - if(view) { - IOleInPlaceSite *inplacesite = (IOleInPlaceSite*)0xff00ff00; + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); + if(FAILED(hres)) + return; - hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08lx\n", hres); + test_Persist(unk); - hres = IOleDocumentView_CloseView(view, 0); - ok(hres == S_OK, "CloseVire failed: %08lx\n", hres); + hres = test_Activate(unk, CLIENTSITE_EXPECTPATH); + if(FAILED(hres)) { + IUnknown_Release(unk); + return; + } - hres = IOleDocumentView_SetInPlaceSite(view, NULL); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); - - hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); - ok(inplacesite == NULL, "inplacesite=%p, expected NULL\n", inplacesite); - - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); - expect_LockContainer_fLock = FALSE; - hres = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - ok(hres == S_OK, "Close failed: %08lx\n", hres); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); + test_OleCommandTarget_fail(unk); + test_OleCommandTarget(unk); + test_Window(unk, TRUE); + test_UIDeactivate(); + test_OleCommandTarget(unk); + test_Window(unk, TRUE); + test_InPlaceDeactivate(unk, TRUE); - hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); + /* Calling test_OleCommandTarget here couses Segmentation Fault with native + * MSHTML. It doesn't with Wine. */ - hres = IOleObject_SetClientSite(oleobj, NULL); - ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); - } + test_Window(unk, FALSE); + test_Hide(); + test_InPlaceDeactivate(unk, FALSE); + test_CloseView(); + test_Close(unk, FALSE); + + /* Activate HTMLDocument again */ + test_Activate(unk, CLIENTSITE_SETNULL); + test_Window(unk, TRUE); + test_OleCommandTarget(unk); + test_UIDeactivate(); + test_InPlaceDeactivate(unk, TRUE); + test_Close(unk, FALSE); + + /* Activate HTMLDocument again, this time without UIActivate */ + call_UIActivate = FALSE; + test_Activate(unk, CLIENTSITE_SETNULL); + test_Window(unk, TRUE); + test_UIDeactivate(); + test_InPlaceDeactivate(unk, TRUE); + test_CloseView(); + test_CloseView(); + test_Close(unk, TRUE); - if(cmdtrg) - IOleCommandTarget_Release(cmdtrg); - if(windowlessobj) - IOleInPlaceObjectWindowless_Release(windowlessobj); - if(oleobj) - IOleObject_Release(oleobj); if(view) IOleDocumentView_Release(view); - if(activeobject) - IOleInPlaceActiveObject_Release(activeobject); + view = NULL; ok(IsWindow(hwnd), "hwnd is destroyed\n"); - ref = IUnknown_Release(htmldoc_unk); + ref = IUnknown_Release(unk); ok(ref == 0, "ref=%ld, expected 0\n", ref); ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); - DestroyWindow(container_hwnd); } START_TEST(htmldoc) { CoInitialize(NULL); + container_hwnd = create_container_window(); test_HTMLDocument(); + DestroyWindow(container_hwnd); CoUninitialize(); }

1 0

Re: WLDAP32: implement ldap_result
by Vitaliy Margolen Aug. 15, 2005

Aug. 15, 2005

Monday, August 15, 2005, 5:19:10, Hans Leidekker wrote: > -Hans > Changelog > Implement ldap_result. This patch brakes cvs build: misc.c:58: error: `LDAP_NOT_SUPPORTED' undeclared (first use in this function) misc.c:58: error: (Each undeclared identifier is reported only once misc.c:58: error: for each function it appears in.) Vitaliy Margolen

1 0

Error on clean .wine for theming
by Paul Vriens Aug. 15, 2005

Aug. 15, 2005

Hi, just updated to current cvs and removed .wine: [paul(a)penguin paul]$ rm -rf .wine [paul(a)penguin paul]$ winecfg wine: creating configuration directory '/home/paul/.wine'... err:theming:THEMING_Initialize Could not re-register class L"Edit": 582 wine: '/home/paul/.wine' created successfully. Error 582 (1410) is "ERROR_CLASS_ALREADY_EXISTS". Is this really an ERR or should error 582 be ignored ? Cheers, Paul.

1 0

calling *W functions in wt (Was: dlls/shell32/shfldr_desktop.c)
by Saulius Krasuckas Aug. 15, 2005

Aug. 15, 2005

Hello Ge and especially unicoders: Alexandre, Dimi, Dmitry, Rob, Shachar, Troy and others. I am not sure of how should be file operations implemented in winetest: * On Sat, 13 Aug 2005, Ge van Geldorp wrote: > > --- dlls/shell32/tests/shlfolder.c 12 Aug 2005 10:33:37 -0000 1.29 > +++ dlls/shell32/tests/shlfolder.c 13 Aug 2005 18:49:59 -0000 ... > + PathAddBackslashW(wszFileName); > + lstrcatW(wszFileName, wszTestFile); > + hTestFile = CreateFileW(wszFileName, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); > + ok(hTestFile != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: %08lx\n", GetLastError()); > + if (hTestFile == INVALID_HANDLE_VALUE) { > + IShellFolder_Release(psfDesktop); > + return; > + } > + CloseHandle(hTestFile); > + > + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszTestFile, NULL, &pidlTestFile, NULL); > + ok (SUCCEEDED(hr), "Desktop's ParseDisplayName failed to parse filename hr = %08lx\n", hr); > + if (FAILED(hr)) { > + IShellFolder_Release(psfDesktop); > + DeleteFileW(wszFileName); > + IMalloc_Free(ppM, pidlTestFile); > + return; > + } *FileW and *DirectoryW functions fail on every win9x box as they are unimplemented here. They succeed only when app is linked to MS Layer for Unicode (MSLU) and MSLU is installed. [1] I was trying to replace every failing unicode function with its ascii counterpart in one of the wt files [2], but that looked ugly to me. Maybe it would be really nice and possible to link wt to unicows.lib on windows. In this case we need a corresponding static lib in Wine too, right? It probably will be "empty" because UNICOWS.DLL shouldn't be loaded as Wine doesn't lack implementation of mentioned functions. Though, I have no guess if this could be done easily. What could be a clean and acceptable solution? Your comments, please. [1] http://msdn.microsoft.com/msdnmag/issues/01/10/MSLU/default.aspx [2] http://www.winehq.org/hypermail/wine-patches/2005/08/0267.html

3 2

Re: dlls/shell32/pidl.c
by Michael Jung Aug. 15, 2005

Aug. 15, 2005

Hi Ge, On Saturday 13 August 2005 20:55, Ge van Geldorp wrote: > dwAttributes = SFGAO_FILESYSTEM; > hr = IShellFolder_GetAttributesOf(psfFolder, 1, &pidlLast, > &dwAttributes); - if (FAILED(hr) || !(dwAttributes & SFGAO_FILESYSTEM)) > return FALSE; + if (FAILED(hr) || !(dwAttributes & SFGAO_FILESYSTEM)) { > + IShellFolder_Release(psfFolder); > + ILFree((LPITEMIDLIST) pidlLast); > + return FALSE; > + } > I had another look at this after realising that Alexandre did'nt apply the patch. SHBindToParent does not allocate a new PIDL for pidlLast, but returns a pointer to right location in pidl. This means you should not free it. There's still the problem that the shell folder isn't released in failure cases. Sorry, I didn't realize this. Once again I'm impressed that Alexandre always catches those things. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

2 1

Re: Lostwages: howto.diff
by Paul Vriens Aug. 15, 2005

Aug. 15, 2005

On Mon, 2005-08-15 at 08:44, Tom Wickline wrote: > Hello All, > > We have moved to winecfg...... > > Tom > > Changelog: > spelling fix, doc update Hi Tom, you're patch shows: -<p>Wine is currently in a transitionary phase. We are working on replacing the -cryptic configuration file with an easy to use graphical utility called winecfg. -In the meantime, however, we recommend that you use a handy program called +<p>If your using an old version of Wine we recommend that you use a handy program called As winecfg is currently THE tool why not refer to this (and maybe also to Winetools) this way more and more people will use it (and make it better?). Cheers, Paul.

3 2