wine-devel

wine-devel@winehq.org

10 participants
84460 discussions

Start a nNew thread

winetest results refused by server
by Robert Reif 20 Aug '04

20 Aug '04

The winetest server has been refusing to accept test results for a while now. Could someone look into it.

1 0

Re: RE: Adventures in serial port.
by Pouech Eric DMI AEI CAEN 20 Aug '04

20 Aug '04

> I have tried the updates but to no avail. I have a test program that > appears to work well. However when that code is used in my project I still > lose some characters at the end of the message. The main difference is that > my project uses sockets, in another thread, to transfer the read/write data > to/from another application. Could the results from the socket calls be > messing with the ReadFile() results? I will make an example program that > includes sockets to see if I can verify this. does your program (the final one, not the test) use the same buffers and/or the same events in the two threads ? As most of the read/write structures are thread-dependent, I don't really see how two threads could thrash their data, except for some buffer overflow, hence my first question. A+

1 0

make CryptSetProviderEx update the provider Name and TypeName to registry
by James Hawkins 20 Aug '04

20 Aug '04

Changelog * Call provider.dll's DllRegisterServer from CryptSetProviderEx to update the Name and TypeName values in the registry properly when setting the default provider -- James Hawkins

1 0

RE: Adventures in serial port.
by Scott Snell 20 Aug '04

20 Aug '04

Hi Eric, I have tried the updates but to no avail. I have a test program that appears to work well. However when that code is used in my project I still lose some characters at the end of the message. The main difference is that my project uses sockets, in another thread, to transfer the read/write data to/from another application. Could the results from the socket calls be messing with the ReadFile() results? I will make an example program that includes sockets to see if I can verify this. regards, scott. > -----Original Message----- > From: Eric Pouech [SMTP:pouech-eric@wanadoo.fr] > Sent: Thursday, 19 August 2004 3:14 > To: Scott Snell > Subject: Re: Adventures in serial port. > > Scott Snell a écrit : > > Fantastic! Can you let me know when it is committed? > it is

1 0

Re: Let StartServiceCtrlDispatcher handle services started other than with StartService (with patch)
by Alexander Yaworsky 20 Aug '04

20 Aug '04

I think that this is incorrect. If you let StartServiceCtrlDispatcher to continue with no error, you make calling program think that it is running under control of service control manager. When service program handles somehow any kind of its launching, the behaviour may be quite different. Also, under windows StartServiceControlDispatcher always fails if service program is started not with StartService (maybe we should add 15 seconds delay to exactly emulate versions earlier than XP? ;-))). Alexander

1 0

Re: KERNEL: pull WINDIR and WINSYSDIR from config before using hardcoded defaults (possible fix for WWN #234, #235 c:\\windows is not accessible Error)
by Alex Villacís Lasso 20 Aug '04

20 Aug '04

Alex Villacís Lasso wrote: > Alexandre Julliard wrote: > >> Alex Villacís Lasso <a_villacis(a)palosanto.com> writes: >> >> >> >>> Changelog: >>> * if windir or winsysdir environment vars are undefined, pull values >>> from config file before falling to hardcoded values >>> >> >> >> This of course defeats the whole purpose of the use of environment >> variables, which is to get rid of the config file. If the environment >> variables are not set it's because the user's config is wrong, they >> should be set in HKLM\System\CurrentControlSet\Control\SessionManager >> or (preferably) in HKCU\Environment. The code is supposed to migrate >> them automatically, but this may not always work if the registry >> already contains other values, in which case it needs to be fixed by >> hand. Going back to the config file is definitely not the right way. >> >> >> > Thanks for pointing me to misc/registry.c, it helped a LOT. > > Upon examination of the function convert_environment(), I realized the > following: the function > queries HKEY_CURRENT_USER/Environment with a call to NtCreateKey(). If > the call succeeds, > but the result is something other than REG_CREATED_NEW_KEY, the > function terminates in > the assumption that the environment was already migrated in a previous > invocation of Wine. > > The problem is, this assumption is false when the user has a Windows > partition for a Wine drive, > and the user has environment variables of his/her own in the registry. > For example, I am a cygwin user > and I have a Win2k registry with the variables VISUAL, CVS_RSH, and > CVSROOT already defined. > When the function sees that HKEY_CURRENT_USER/Environment already > exists (because it was > taken from the native Windows registry), it (incorrectly) skips the > migration of the config file variables. > > The obvious solution (implemented by this patch) is to remove the > assumption about > HKEY_CURRENT_USER/Environment being newly created, and instead test > for every value before > migrating. > > I hope this is definitely the right way. > > Changelog: > * Do not assume HKEY_CURRENT_USER/Environment exists ==> config file > was migrated. Instead test > for every key to migrate under HKEY_CURRENT_USER/Environment > > Alex Villacis Lasso > UPDATE: %Systemroot% should be migrated too, and this patch combines this and the previous fix. --- wine-20040813/misc/registry.c 2004-07-29 20:35:52.000000000 -0500 +++ wine-20040813-patch/misc/registry.c 2004-08-19 19:47:12.000000000 -0500 @@ -242,7 +242,7 @@ } /******************************************************************/ -/* WINDOWS 31 REGISTRY LOADER, supplied by Tor Sjøwall, tor(a)sn.no */ +/* WINDOWS 31 REGISTRY LOADER, supplied by Tor Sjwall, tor(a)sn.no */ /* reghack - windows 3.11 registry data format demo program. @@ -277,7 +277,7 @@ deduced from the reg.dat file by me. Mistakes may have been made. I claim no rights and give no guarantees for this program. - Tor Sjøwall, tor(a)sn.no + Tor Sjwall, tor(a)sn.no */ /* reg.dat header format */ @@ -1861,6 +1861,7 @@ static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; + static const WCHAR systemrootW[] = {'S','y','s','t','e','m','r','o','o','t',0}; static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; static const WCHAR tempW[] = {'T','E','M','P',0}; @@ -1894,59 +1895,83 @@ NtClose( hkey_old ); return; } - if (disp != REG_CREATED_NEW_KEY) goto done; - /* convert TEMP */ + /* Test for existence of TEMP */ RtlInitUnicodeString( &nameW, tempW ); - if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + if (NtQueryValueKey(hkey_env, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) { - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - RtlInitUnicodeString( &nameW, tmpW ); - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - MESSAGE( "Converted temp dir to new entry HKCU\\Environment \"TEMP\" = %s\n", - debugstr_w( (WCHAR*)info->Data ) ); + /* convert TEMP */ + RtlInitUnicodeString( &nameW, tempW ); + if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + RtlInitUnicodeString( &nameW, tmpW ); + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + MESSAGE( "Converted temp dir to new entry HKCU\\Environment \"TEMP\" = %s\n", + debugstr_w( (WCHAR*)info->Data ) ); + } } - /* convert PATH */ + /* Test for existence of PATH */ RtlInitUnicodeString( &nameW, pathW ); - if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + if (NtQueryValueKey(hkey_env, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) { - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - MESSAGE( "Converted path dir to new entry HKCU\\Environment \"PATH\" = %s\n", - debugstr_w( (WCHAR*)info->Data ) ); + /* convert PATH */ + RtlInitUnicodeString( &nameW, pathW ); + if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + MESSAGE( "Converted path dir to new entry HKCU\\Environment \"PATH\" = %s\n", + debugstr_w( (WCHAR*)info->Data ) ); + } } - /* convert USERPROFILE */ - RtlInitUnicodeString( &nameW, profileW ); - if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) - { - RtlInitUnicodeString( &nameW, userprofileW ); - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - MESSAGE( "Converted profile dir to new entry HKCU\\Environment \"USERPROFILE\" = %s\n", - debugstr_w( (WCHAR*)info->Data ) ); + /* Test for existence of USERPROFILE */ + RtlInitUnicodeString( &nameW, userprofileW ); + if (NtQueryValueKey(hkey_env, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + /* convert USERPROFILE */ + RtlInitUnicodeString( &nameW, profileW ); + if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + RtlInitUnicodeString( &nameW, userprofileW ); + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + MESSAGE( "Converted profile dir to new entry HKCU\\Environment \"USERPROFILE\" = %s\n", + debugstr_w( (WCHAR*)info->Data ) ); + } } - /* convert windir */ - RtlInitUnicodeString( &nameW, windowsW ); - if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) - { - RtlInitUnicodeString( &nameW, windirW ); - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - MESSAGE( "Converted windows dir to new entry HKCU\\Environment \"windir\" = %s\n", - debugstr_w( (WCHAR*)info->Data ) ); + /* Test for existence of windir */ + RtlInitUnicodeString( &nameW, windirW ); + if (NtQueryValueKey(hkey_env, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + /* convert windir */ + RtlInitUnicodeString( &nameW, windowsW ); + if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + RtlInitUnicodeString( &nameW, windirW ); + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + RtlInitUnicodeString( &nameW, systemrootW ); + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + MESSAGE( "Converted windows dir to new entry HKCU\\Environment \"windir\" = %s\n", + debugstr_w( (WCHAR*)info->Data ) ); + } } - - /* convert winsysdir */ - RtlInitUnicodeString( &nameW, systemW ); - if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) - { - RtlInitUnicodeString( &nameW, winsysdirW ); - NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); - MESSAGE( "Converted system dir to new entry HKCU\\Environment \"winsysdir\" = %s\n", - debugstr_w( (WCHAR*)info->Data ) ); + + /* Test for existence of winsysdir */ + RtlInitUnicodeString( &nameW, winsysdirW ); + if (NtQueryValueKey(hkey_env, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + /* convert winsysdir */ + RtlInitUnicodeString( &nameW, systemW ); + if (!NtQueryValueKey( hkey_old, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &dummy )) + { + RtlInitUnicodeString( &nameW, winsysdirW ); + NtSetValueKey( hkey_env, &nameW, 0, info->Type, info->Data, info->DataLength ); + MESSAGE( "Converted system dir to new entry HKCU\\Environment \"winsysdir\" = %s\n", + debugstr_w( (WCHAR*)info->Data ) ); + } } - -done: NtClose( hkey_old ); NtClose( hkey_env ); }

1 0

poll vs. epoll
by Shachar Shemesh 19 Aug '04

19 Aug '04

Hi all, I have a program (a server) that has a very large number of synchronization constructs. Even when everything is idle there, wineserver is taking 60% of the CPU, raising load average to 2.4. When load is applied, response time occasionally jumps from tenths of a second to two minutes. I noticed that in server/fd.c, the wineserver is using "poll" to select between file descriptors. The application is going through this code over 2000 times a second, with over 380 file descriptors each time. I am wondering whether this can be the cause of the slowdown. One of the possible solutions to this would be to use epoll instead. This, of course, would have to be backed by a configure check, as not all systems for which wine is intended support epoll. Another, arguably better, solution would be to use libevent for this purpose. Libevent has the distinct advantage that it automatically chooses the best tool for the job (epoll, poll, /dev/poll, or if all else fails, select). However, if there is another, independent use of poll, porting the semantics to libevent may prove non-trivial. So what does the forum think? One last question. What are the "users"? What constructs cause a new file descriptor to be allocated in the wineserver? Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

2 1

Re: KERNEL: pull WINDIR and WINSYSDIR from config before using hardcoded defaults (possible fix for WWN #234, #235 c:\\windows is not accessible Error)
by Michael Stefaniuc 19 Aug '04

19 Aug '04

On Thu, Aug 19, 2004 at 03:54:40PM -0500, Alex Villacís Lasso wrote: > I hope this is definitely the right way. > > Changelog: > * Do not assume HKEY_CURRENT_USER/Environment exists ==> config file was > migrated. Instead test > for every key to migrate under HKEY_CURRENT_USER/Environment > > Alex Villacis Lasso > > --- wine-20040813/misc/registry.c 2004-07-29 20:35:52.000000000 -0500 > +++ wine-20040813-patch/misc/registry.c 2004-08-19 15:35:00.000000000 -0500 > @@ -242,7 +242,7 @@ > } > > /******************************************************************/ > -/* WINDOWS 31 REGISTRY LOADER, supplied by Tor Sj?wall, tor(a)sn.no */ > +/* WINDOWS 31 REGISTRY LOADER, supplied by Tor Sjwall, tor(a)sn.no */ > /* > reghack - windows 3.11 registry data format demo program. > > @@ -277,7 +277,7 @@ > deduced from the reg.dat file by me. Mistakes may > have been made. I claim no rights and give no guarantees for this program. > > - Tor Sj?wall, tor(a)sn.no > + Tor Sjwall, tor(a)sn.no Was this name change planned? bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

Re: FontDlg fix
by Alexandre Julliard 19 Aug '04

19 Aug '04

Jacek Caban<jack(a)itma.pwr.wroc.pl> writes: > + if(chf16->lpTemplateName) > + { > + len1 = strlen(MapSL(chf16->lpTemplateName)); > + chf32w->lpTemplateName = malloc(len1 * sizeof(WCHAR)); > + MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), > + len1, (LPWSTR)chf32w->lpTemplateName, len1); > + } > + if(chf16->lpszStyle) > + { > + len2 = strlen(MapSL(chf16->lpszStyle)); > + chf32w->lpszStyle = malloc(len2 * sizeof(WCHAR)); > + MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), > + len2, chf32w->lpszStyle, len2); > + } These strings never get freed (and please use HeapAlloc instead of malloc). Also the length arguments are wrong, you can't use strlen() to determine the size of the Unicode string. There are similar problems at other places in your patch too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gethostbyname on local host returns 127.0.0.1 for address
by Juan Lang 19 Aug '04

19 Aug '04

Robert wrote: > On windows gethostbyname for the local host returns > the addresses of the available network interfaces. > On wine and unix, it only returns the localhost > 127.0.0.1. > > Any ideas on how to get the windows behavior? I assume you're referring to gethostname (as in your sample code), not gethostbyname (as in your email). Well, I guess you'd have to modify winsock/socket.c's WS_gethostname function, maybe to call GetAdaptersInfo or some such. That'll get you the addresses, anyway. If you want a name other than localhost you may want to call GetNetworkParams too. --Juan __________________________________ Do you Yahoo!? Yahoo! Mail - 50x more storage than other providers! http://promotions.yahoo.com/new_mail

2 2

RE: iostream and msvcrt?
by Scott Snell 19 Aug '04

19 Aug '04

Is that simpler than fixing the MSVCRT headers? I have used STLport before so the idea sounds feasable to me. I imagine I have to change the gcc-linux.mak by: replacing the call to gcc with winegcc, removing references to GLIBC, adding a path pointing to /include/wine/MSVCRT. Anything else? regards, Scott. > -----Original Message----- > From: Boaz Harrosh [SMTP:boaz@hishome.net] > Sent: Tuesday, 17 August 2004 18:18 > To: Scott Snell > Cc: Wine-Devel (E-mail) > Subject: Re: iostream and msvcrt? > > Using gcc's c++ libraries will not work with msvcrt. If it will compile > (which it doesn't) it will not load. (Some circular linking) > Your best bet is STLPort. Check it out. What I have done is a special > makefiles set with special config.h that compiles and links STLPort over > msvcrt. I have written to STLPort if they want my changes as support for > another platform but I never got a response from them. Do you need me to > dig out the old HD and pack you an STLPort compiled over msvcrt? > You might need to make some changes because it is from before winegcc > times,. Going strait for gcc. and maybe some wine stuff changed since > than. > > Scott Snell wrote: >

3 2

Wine Status - User Interface
by Tom 19 Aug '04

19 Aug '04

Hello, I have been working on a update for the Status UI page over the last couple day's and i'm attaching a copy of what I have. I've re-named the template to .html so you can view it in your e-mail program or browser of choice. I haven't done the changelog so just view this againt http://www.winehq.org/site/status_ui for changes or diff. commits, suggestions, and flames are welcomed Regards, Tom

2 1

gethostbyname on local host returns 127.0.0.1 for address
by Robert Reif 19 Aug '04

19 Aug '04

On windows gethostbyname for the local host returns the addresses of the available network interfaces. On wine and unix, it only returns the localhost 127.0.0.1. Any ideas on how to get the windows behavior? #include <stdio.h> #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> #else #include <netdb.h> #endif int main(int argc, char* argv[]) { char host_name[1024]; char ** alias; struct hostent * host; unsigned int i = 0; #ifdef _WIN32 WSADATA wsaData; WORD wVersionRequested = MAKEWORD(2, 2); int error = WSAStartup(wVersionRequested, &wsaData); if (error != 0) { fprintf(stderr, "WSAStartup failed\n"); return 1; } // Confirm that the Windows Sockets DLL supports 2.2. // Note that if the DLL supports versions greater // than 2.2 in addition to 2.2, it will still return // 2.2 in wVersion since that is the version we // requested. if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { fprintf(stderr, "couldn't find dll\n"); return 1; } #endif if (gethostname(host_name, sizeof(host_name)) != 0) { fprintf(stderr, "gethostname failed\n"); return 1; } printf("host: %s\n", host_name); host = gethostbyname(host_name); if (host == 0) { fprintf(stderr, "gethostbyname failed\n"); return 1; } printf("name of host: %s\n", host->h_name); for (alias = host->h_aliases; *alias != NULL; alias++) printf("alias: %s\n", *alias); printf("length of address: %d\n", host->h_length); while (host->h_addr_list[i] != 0) { struct in_addr n_addr; memcpy(&n_addr, host->h_addr_list[i], sizeof(struct in_addr)); printf("%d: %s\n", i, inet_ntoa(n_addr)); i++; } return 0; }

1 0

Re: Fixed some ref handling
by Alexandre Julliard 18 Aug '04

18 Aug '04

Jacek Caban<jack(a)itma.pwr.wroc.pl> writes: > I attached two test. The first is simple and shows a problem > that the patch fixes but the second one is a more complex test. Could you please merge the test into the existing test framework? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Removed slovenian translation
by Alexandre Julliard 18 Aug '04

18 Aug '04

Jacek Caban<jack(a)itma.pwr.wroc.pl> writes: > Changelog: > Removed slovenian translation If the translation is not complete it should be fixed, or at worse commented out. Removing it doesn't make sense, we'll need to add it back someday anyway. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: KERNEL: pull WINDIR and WINSYSDIR from config before using hardcoded defaults (possible fix for WWN #234, #235 c:\\windows is not accessible Error)
by Alexandre Julliard 18 Aug '04

18 Aug '04

Alex Villacís Lasso <a_villacis(a)palosanto.com> writes: > Changelog: > * if windir or winsysdir environment vars are undefined, pull values > from config file before falling to hardcoded values This of course defeats the whole purpose of the use of environment variables, which is to get rid of the config file. If the environment variables are not set it's because the user's config is wrong, they should be set in HKLM\System\CurrentControlSet\Control\SessionManager or (preferably) in HKCU\Environment. The code is supposed to migrate them automatically, but this may not always work if the registry already contains other values, in which case it needs to be fixed by hand. Going back to the config file is definitely not the right way. -- Alexandre Julliard julliard(a)winehq.org

1 0

bug
by Ivan Leo Puoti 18 Aug '04

18 Aug '04

Since futimes is used instead of utime the installer of word viewer 97 has had a few installation issues. For a start, when the setup looks for installed components, it goes into a non infinite loop that lasts a few minutes. This only took a few seconds previously. I don't know what is causing this slow performance. The changelog of the patch that caused this regression says "so that it can be done on the client side.", maybe doing the call on client side makes it slow because the call has to go trough wineserver? I don't know. Also the graphics aren't redrawn until the loop ends. A relay log of the loop follows. I'm not very confident that I'll be able to fix this myself, but any help/hints are welcome. Interestingly the loop doesn't occur during a call to kernel.dll.SetFileTime() that's the function modified by the patch. The patch that causes the problem is http://cvs.winehq.org/patch.py?id=11722 Subsequent patches have obviously modified the function, but this hasn't solved the problem. MAybe the subsequent patches avoid an infinite loop (I don't remember the loop finishing with wine from a few months ago). Ivan.

1 0

New Fun Project - Winelib port of Allegiance
by Steven Edwards 18 Aug '04

18 Aug '04

Hi all, Microsoft Research has released a Shared Source version of the game Allegiance. This is a hefty 512 meg download and of course the license that it is under would prevent anyone from sharing the changes but this would really allow us to improve Winelib by porting such a massive game. http://research.microsoft.com/research/allegiance/ Grab your copy quick before they pull it down. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Mail - 50x more storage than other providers! http://promotions.yahoo.com/new_mail

1 0

Re: OLEAUT32: implementation for IPersistPropertyBag_Load for OLEFont
by Robert Shearman 18 Aug '04

18 Aug '04

Alex Villacís Lasso wrote: > This implementation is enough to satisfy VB6 when loading font objects > from property bags in projects. > > Changelog: > * Added implementation for IPersistPropertyBag_Load on OLEFont Looks good, but a few comments below: ... >+ V_VT(&valueAttr) = VT_EMPTY; > > It is probably better practice to use VariantInit here. >+ iRes = IPropertyBag_Read(pPropBag, sAttrName, &valueAttr, pErrorLog); >+ switch (iRes) { > > >+ case S_OK: >+ if (V_VT(&valueAttr) == VT_BSTR) { >+ /* Type is BSTR, use for name directly */ >+ OLEFontImpl_put_Name(this, V_BSTR(&valueAttr)); >+ >+ /* FIXME: Leaking memory here? */ >+ } else { >+ /* Don't know how to handle this type */ >+ FIXME("Name has type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ } > Perhaps use VariantChangeType here? >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } > Catch the errors you need to (why is E_INVALIDARG ok?) and either move these common debug statements to the end of the function (they should also be ERR's, not FIXME's). Also, you other unexpected errors, which is bad. >+ } >+ >+ if (iRes == S_OK) { >+ CY iSize; >+ iSize.s.Hi = 0; >+ iSize.s.Lo = 0; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrSize, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ iSize.s.Lo = V_I2(&valueAttr) * 10000UL; >+ break; >+ case VT_UI2: >+ iSize.s.Lo = V_UI2(&valueAttr) * 10000UL; >+ break; >+ case VT_I4: >+ iSize.s.Lo = V_I4(&valueAttr) * 10000UL; >+ break; >+ case VT_UI4: >+ iSize.s.Lo = V_UI4(&valueAttr) * 10000UL; >+ break; >+ case VT_R4: >+ iSize.s.Lo = (ULONG)(V_R4(&valueAttr) * 10000UL); >+ break; >+ case VT_R8: >+ iSize.s.Lo = (ULONG)(V_R8(&valueAttr) * 10000UL); >+ break; > > Again, perhaps use VariantChangeType here? >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Size type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } >+ if (iRes != E_NOTIMPL) IFont_put_Size(this, iSize); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } > Same comment as before about errors. >+ } >+ if (iRes == S_OK) { >+ signed short iCharset = 0; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ if (V_I2(&valueAttr) < 0) { >+ FIXME("Unexpected value for Font Charset (%hd), using 0\n", V_I2(&valueAttr)); >+ } else { >+ iCharset = V_I2(&valueAttr); >+ } >+ break; >+ case VT_UI2: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_UI4(&valueAttr)); >+ } else { >+ iCharset = V_UI2(&valueAttr); >+ } >+ break; >+ case VT_I4: >+ if (V_I4(&valueAttr) < 0 || V_I4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_I4(&valueAttr)); >+ } else { >+ iCharset = V_I4(&valueAttr); >+ } >+ break; >+ case VT_UI4: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_UI4(&valueAttr)); >+ } else { >+ iCharset = V_UI4(&valueAttr); >+ } >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Charset type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; > > Use VariantChangeType here and you will get all the bounds checking for free. >+ } >+ if (iRes != E_NOTIMPL) IFont_put_Charset(this, iCharset); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ signed short iWeight = FW_NORMAL; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ if (V_I2(&valueAttr) < 0) { >+ FIXME("Unexpected value for Font Weight (%hd), using FW_NORMAL\n", V_I2(&valueAttr)); >+ } else { >+ iWeight = V_I2(&valueAttr); >+ } >+ break; >+ case VT_UI2: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_UI4(&valueAttr)); >+ } else { >+ iWeight = V_UI2(&valueAttr); >+ } >+ break; >+ case VT_I4: >+ if (V_I4(&valueAttr) < 0 || V_I4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_I4(&valueAttr)); >+ } else { >+ iWeight = V_I4(&valueAttr); >+ } >+ break; >+ case VT_UI4: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_UI4(&valueAttr)); >+ } else { >+ iWeight = V_UI4(&valueAttr); >+ } >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Weight type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ } > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Weight(this, iWeight); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bUnderline = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bUnderline = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bUnderline = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bUnderline = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bUnderline = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bUnderline = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Underline type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > Again, VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Underline(this, bUnderline); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bItalic = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bItalic = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bItalic = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bItalic = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bItalic = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bItalic = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Italic type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Italic(this, bItalic); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bStrikethrough = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bStrikethrough = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bStrikethrough = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bStrikethrough = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bStrikethrough = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bStrikethrough = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Strikethrough type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Strikethrough(this, bStrikethrough); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ return iRes; > } > > static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Save( > > Thanks, Rob

1 0

Re: Some more hardcoded c:\windows paths
by Juan Lang 18 Aug '04

18 Aug '04

Vincent wrote: > Any idea why CSIDL_PROGRAMS was HKEY_DISALLOWED? That, apparently, was my mistake. I introduced it here: http://www.winehq.org/hypermail/wine-patches/2004/04/0106.html Thanks for fixing it. --Juan __________________________________ Do you Yahoo!? New and Improved Yahoo! Mail - Send 10MB messages! http://promotions.yahoo.com/new_mail

1 0

Re: WineSetupTk...
by Ivan Leo Puoti 18 Aug '04

18 Aug '04

> I doubt there's a one maintainer Nobody maintains it because it's obsolete and isn't used with current versions of wine. Ivan.

1 0

Re: WineSetupTk...
by Mike Hearn 18 Aug '04

18 Aug '04

> I didn't realize that WineSetupTk was depreciated when I wrote. I just want to > play StarCraft and Diablo and was finding the documentation a bit hard to > follow. (I couldn't find my .wine.conf file and got stuck, that's why I > thought I needed WineSetupTk.) I will poke at it a bit myself and if I can > figure out how it works, maybe then I can make a suggestion or two for > clearing up the documentation. (Who maintains the documentation, BTW?) OK, what specifically were you trying to configure. Our aim (obviously) is that StarCraft and such should work out of the box with no configuration needed.

2 1

"winetest" throws an exception after the unsuccessful send operation
by Saulius Krasuckas 18 Aug '04

18 Aug '04

I am getting this after all the tests were performed, network transfer of the report file was over and after the http server has responded (with some error-message) in Wine: err:win:WIN_FindWndPtr window 0x10022 belongs to other process err:win:WIN_FindWndPtr window 0x10022 belongs to other process wine: Unhandled exception (thread 000b), starting debugger... fixme:console:SetConsoleCtrlHandler (0x4067a644,1) - no error checking or testing yet WineDbg starting on pid 0xa Unhandled exception: page fault on read access to 0xffe5024c in 32-bit code (0x40045cf2). In 32 bit mode. 0x40045cf2 pthread_mutex_lock in libpthread.so.0: movl 0xc(%edi),%eax Wine-dbg>bt Backtrace: =>1 0x40045cf2 pthread_mutex_lock+0x12 in libpthread.so.0 (0x40c0fe28) 2 0x42075bea free+0x9a in libc.so.6 (0x40c0fe48) 3 0x4065753a send_file+0x362(name=0x781e4a80) [send.c:217] in winetest (0x40c0fe78) 4 0x40656f2e .L256+0xde in winetest (0x40c0fe9c) 5 0x4065511c __wine_exe_main+0x11c in winetest (0x40c0ff2c) 6 0x403a101a start_process+0xf2(arg=0x0) [process.c:995] in kernel32 (0x40c0fff4) 7 0x4002a8cd wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) And the error message in the message-box looks like this: Can't submit logfile '/tmp/rescVOMCP'. Server response: <!DOCTYPE HTML PUBLIC"... ... <title>500 Internal Server Error</title> ... <p>The server encountered an internal error or misconfiguration and was unable to complete your request.</p> ... <address>Apache 2.0.40 Server at test.winehq.org Port 80</address> <body><html> Back to the code. Excerpts from the programs/winetest/send.c: > unsigned char *buffer; ... > buffer = xmalloc (BUFLEN + 1); ... > if (ret) { > buffer[total] = 0; > str = strstr (buffer, "\r\n\r\n"); > if (str) buffer = str + 4; > report (R_ERROR, "Can't submit logfile '%s'. " > "Server response: %s", name, buffer); > } > free (buffer); Is it OK to try to free the modified "buffer" ptr? I thought we should preserve its value. We can use the "str" instead of the "buffer". I've tried such mod and it worked fine in my case: --- wine/programs/winetest/send.c 6 Jul 2004 21:03:22 -0000 1.12 +++ wine/programs/winetest/send.c 18 Aug 2004 07:41:24 -0000 @@ -209,9 +209,9 @@ if (ret) { buffer[total] = 0; str = strstr (buffer, "\r\n\r\n"); - if (str) buffer = str + 4; + str = (str)?(str + 4):(buffer); report (R_ERROR, "Can't submit logfile '%s'. " - "Server response: %s", name, buffer); + "Server response: %s", name, str); } free (buffer); return ret; Should I submit it to the wine-patches or I am wrong with it?

2 3

Re: WineSetupTk...
by Ivan Leo Puoti 18 Aug '04

18 Aug '04

>Ivan, do we need to remove links to sourceforge since its no longer >available? Actually iy is, but it isn't listed on the download page. Like all files on sf, you can't remove a release, but you can hide it. >I would guess so.. So do you want to do it or me? I'll send in a patch. Ivan.

1 0

Re: More winecfg todos
by Jacek Caban 18 Aug '04

18 Aug '04

> You probably want to increase the size of the drive mappings list so it > fills the tab, currently there is just a lot of empty space at the top of > the pane now you removed the old stuff. I have almost ready patch. I've attached screenshot. Is it a good idea? Thanks, Jacek

6 15

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