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

Re: cleanup a->w cross calls in advapi32/crypt.c

by Jeroen Janssen

James Hawkins wrote: > I'm wasn't exactly sure on this one so it would be great if you could > help me on this one. When using pointer arithmetic, do the operations > such as --, ++... increment or decrement by the size of the pointer > type? Yes, if you have a char (1byte) pointer and you ++, you'll get one byte further. If you have a short (2byte) you'll get two bytes further in memory. If you have a long (4byte) pointer, you'll get 4 bytes further in memory if you ++. It is simular to dealing with arrays (looking at the memory layout) If you have an array of structs and need to get to the next struct in the array then you will need to look sizeof(struct) further in memory to find the next item in the array. --- Jeroen

Aug. 2, 2004

Re: Dynamic memory management in CryptAcquireContext

by Alexandre Julliard

Michael Jung <mjung(a)iss.tu-darmstadt.de> writes: > If the CSP's CPAcquireContext function fails, which is quite common (e.g. > because the user specified key container does not exist), the "temp" variable > is still free'd twice. Yes, the free needs to be moved inside the if, sorry about that. > I'm aware that my original patch was pretty ugly, due to a lot of redundancy, > but I think this is due to fact that the CryptAcquireContext function seems > not to be very well structured. I've submitted a patch two weeks ago, which > basically was a reimplementation of CryptAcquireContext, but which was not > committed (http://www.winehq.org/hypermail/wine-patches/2004/07/0213.html) > Rob Shearman commented on this patch and felt that it is overkill to add both > a helper function and a new struct type. Is this the reason the patch was not > applied? It's overkill and it's ugly. If a function needs such elaborate cleanup it's probably because it's trying to do too many things, and that needs to be fixed; splitting the cleanup part into a separate function only makes things even more confusing. -- Alexandre Julliard julliard(a)winehq.org

Aug. 2, 2004

Re: list view completely mangled in WINE

by Filip Navara

Tobias Burnus wrote: > The patch improves the situation a lot! Even Save List works now! > Thanks! Great! [snip] > Now, I click on the scrollbar to scroll to the rightmost columns; > while the header is correct, the list itself contains the FIRST > columns not the columns which belong to the column headers > http://www.physik.fu-berlin.de/~tburnus/wine/diamond_list_wine3b.png Should be fixed in the attached patch, but there is still one problem with refreshing of the list view after shrinking the column headers. Unfortunetly I don't have time to fix that. Regards, Filip

Aug. 2, 2004

Re: RESEND: Try to avoid loading 16-bit DLLs into memory for accessing version info

by Alexandre Julliard

"Dmitry Timoshkov" <dmitry(a)baikal.ru> writes: > "Alexandre Julliard" <julliard(a)winehq.org> wrote: >> I think it would >> be better to try to take loadorder into account, though I admit it's >> not trivial to do. > > Any idea how to do it without breaking DLL separation? A possibility would be to use wine_dll_get_owner; if the dll doesn't have an owner then you know it's native only and you can access the file directly. This way you only do the LoadLibrary16 for dlls that have a builtin implementation, it's not perfect but probably good enough. -- Alexandre Julliard julliard(a)winehq.org

Aug. 2, 2004

Re: cleanup a->w cross calls in advapi32/crypt.c

by James Hawkins

> - strcpy(keyname + strlen(KEYSTR), pProvName); I changed that line to strcatW(keyname, pProvName). That makes a lot more sense Mike, thanks for the tip. I'm wasn't exactly sure on this one so it would be great if you could help me on this one. When using pointer arithmetic, do the operations such as --, ++... increment or decrement by the size of the pointer type? For example, *(ptr - sizeof(WCHAR)) = (dwType % 10) + '0'; *(ptr - sizeof(WCHAR) * 2) = ((dwType / 10) % 10) + '0'; *(ptr - sizeof(WCHAR) * 3) = (dwType / 100) + '0'; Is the sizeof(WCHAR) multiplication redundant because --ptr actually moves ptr down one WCHAR? I understand that if that's the case, but what about when the pointer is first initialized? ptr = keyname + strlenW(keyname); I guess it holds true here as well because keyname is a pointer and we're adding ot it. If that is the case, the included patch fixes the two things mentioned. On Mon, 02 Aug 2004 19:55:12 +0900, Mike McCormack <mike(a)codeweavers.com> wrote: > > James Hawkins wrote: > > > + PWSTR keyname; > > > > - keyname = CRYPT_Alloc(strlen(KEYSTR) + strlen(pProvName) +1); > > + keyname = CRYPT_Alloc((strlenW(KEYSTR) + strlenW(pProvName) + 1) * sizeof(WCHAR)); > > if (keyname) > > { > > - strcpy(keyname, KEYSTR); > > - strcpy(keyname + strlen(KEYSTR), pProvName); > > + strcpyW(keyname, KEYSTR); > > + strcpyW(keyname + strlenW(KEYSTR) * sizeof(WCHAR), pProvName); > > } else > > SetLastError(ERROR_NOT_ENOUGH_MEMORY); > > return keyname; > > } > > This doesn't look right.... when using pointer arithmetic, you do so in > increments of the pointer's type (eg. WCHAR). The following two lines > are the same, and are both wrong: > > strcpyW(keyname + strlenW(KEYSTR) * sizeof(WCHAR), pProvName); > strcpyW(&keyname[strlenW(KEYSTR) * sizeof(WCHAR)], pProvName); > > The right version would be: > > strcpyW(&keyname[strlenW(KEYSTR)], pProvName); > > but how about just using: > > strcatW( keyname, pProvname ); > > Mike > -- James Hawkins

Aug. 2, 2004

Re: Anyone writing COM tests?

by Duane Clark

Jeroen Janssen wrote: > > I think writing (COM) tests is a great idea. > I have 'hit' a few bumps in the road of wine & COM in the past few weeks > and I would appreciate it if I can help with writing (specific) > testscenarios. > > It would be great to have a small 'com test framework' & sample code to > base specific tests upon. I'm wondering though if all can be build > without problems : I'm used to VC6, but it would be better if things can > be (cross) build with mingw and/or gcc + with winelib. I would be using mingw and gcc, since I don't have VC. It would certainly help to have someone else compiling on VC to make sure the code works there. > > Also generating proxy/stub code (without using midl) might be a problem > at this point. I might try to getting an old copy of VC to get midl. It might be useful for tests comparing results with widl.

Aug. 2, 2004

Re: Anyone writing COM tests?

by Jeroen Janssen

Duane Clark wrote: > Howdy, > > Debugging a problem I am having in COM (mentioned a few weeks ago), I > think I know what the problem is but not where. So I figured some COM > test would help me to understand how things should work. I was a bit > surprised to see no COM tests, or at least I didn't find any in the ole* > directories. So I figured if no one else is working on them, I might > take a shot at it over the next few weeks/months. And maybe this would > encourage some updates to the COM implementation. I think writing (COM) tests is a great idea. I have 'hit' a few bumps in the road of wine & COM in the past few weeks and I would appreciate it if I can help with writing (specific) testscenarios. It would be great to have a small 'com test framework' & sample code to base specific tests upon. I'm wondering though if all can be build without problems : I'm used to VC6, but it would be better if things can be (cross) build with mingw and/or gcc + with winelib. Also generating proxy/stub code (without using midl) might be a problem at this point. --- Jeroen Janssen

Aug. 2, 2004

Anyone writing COM tests?

by Duane Clark

Howdy, Debugging a problem I am having in COM (mentioned a few weeks ago), I think I know what the problem is but not where. So I figured some COM test would help me to understand how things should work. I was a bit surprised to see no COM tests, or at least I didn't find any in the ole* directories. So I figured if no one else is working on them, I might take a shot at it over the next few weeks/months. And maybe this would encourage some updates to the COM implementation.

Aug. 2, 2004

Winrash / Winetest

by Stephen Ogletree

(I sent a version of this to wine-users originally and Ivan said to send it over here to wine-devel) On windows XP, with the latest patches/service packs, I got the errors below. Since these were popups and/or crashes, I'm assuming they need to be reported manually. 0. Small issue: The winrash installer (NSIS) concludes with a window that has 3 lines that are in blue text to suggest a hyperlink (and the surrounding text even says "Click the text below to make a bookmark for the test results") but clicking the text has no visible effect (when moving the cursor over the text, the cursor does change shape to indicate the text is clickable, so at least that much works...). My default browser is Opera and my security settings in IE are maxed out, with everything possible disabled. In Opera, I typically keep popups, plugins, and javascript disabled, but none of that should keep normal URL to a html page from opening. Since installing winrash didn't do anything except put the service in place and start it, I figured I'd go ahead and download the test manually. This rest of this email pertains to /winetest-200407091000-kevin-mingw.exe/ 1. I received the "Can't parse subtests output of msvcrtd" message during 'extraction'. I assume this is the same error Holly reported. 2. I had a message indicating a timeout during the user32 tests (before the network tests - this appears to be the same message Holly reported). Also, I remember the timeout was occurring back when we first tried out this testing program a month or two (or 3?) ago, so its a bug thats been around a while. 3. I am still seeing an error that I pointed out in the first round (or a long time ago, at least..) of testing where the test crashes Explorer (this is after the timeout, but before the prompt to send the results). Explorer crashing causes all of my desktop icons to reset to their positions from when I last logged in/out (which has been a week or two, so this was significant change), as well as causes some of the SysTray icons to vanish, and finally, of course I lose the start menu bar and the bar containing the running application names for a moment, while Windows XP nicely restarts explorer.exe. Meanwhile, there's no indication of trouble from the winetest window. FWIW: When I agreed to submit my test results, I did *not* receive any warning about my log being too big. Stephen Ogletree

Aug. 2, 2004

Dynamic memory management in CryptAcquireContext

by Michael Jung

Alexandre, I've noticed that you applied a modified version of my patch, which tries to fix a potential double free of the "temp" variable in dlls/advapi32/crypt.c's CryptAcquireContextA function. However, I think that the modified version does not fix the problem. Here is a code snippet from the current cvs versionc of crypt.c: CRYPT_Free(temp); ... if (pProv->pFuncs->pCPAcquireContext(&pProv->hPrivate, (CHAR*)pszContainer, dwFlags, pProv->pVTable)) { ... return TRUE; } /* FALLTHROUGH TO ERROR IF FALSE - CSP internal error! */ error: ... CRYPT_Free(temp); ... return FALSE; If the CSP's CPAcquireContext function fails, which is quite common (e.g. because the user specified key container does not exist), the "temp" variable is still free'd twice. I'm aware that my original patch was pretty ugly, due to a lot of redundancy, but I think this is due to fact that the CryptAcquireContext function seems not to be very well structured. I've submitted a patch two weeks ago, which basically was a reimplementation of CryptAcquireContext, but which was not committed (http://www.winehq.org/hypermail/wine-patches/2004/07/0213.html) Rob Shearman commented on this patch and felt that it is overkill to add both a helper function and a new struct type. Is this the reason the patch was not applied? I would be glad to rework the patch, if you give me some hints about what you did not like. However, I would prefer to wait until James Hawkins got his a->w cross call cleanup patch committed, in order not to break his work. Greetings, Michael -- Michael Jung, MSc Be liberal in what you accept, Integrated Circuits and Systems Lab and conservative in what you send. University of Technology, Darmstadt -- Jonathan Postel, Internet Pioneer phone: +49(6151)16-6692 / email: mjung(a)iss.tu-darmstadt.de

Aug. 2, 2004