wine-devel

wine-devel@winehq.org

11 participants
84461 discussions

Internet Explorer 5.5 on wine (os version = "win2k")
by Lara Joy Francia 20 Sep '04

20 Sep '04

Does anyone know how to install internet explorer 5.5 on Linux with wine (os version = win2k)? I already tried installing ie5.5 on wine with os version as win98 and it worked however, I need to set the os version to win2k because it is the required os version of the other application that I'm trying install on wine. Thanks in advance. ________________________________________________________________________ Yahoo! Messenger - Communicate instantly..."Ping" your friends today! Download Messenger Now http://uk.messenger.yahoo.com/download/index.html

3 2

cdega question
by Jonathan Wilson 20 Sep '04

20 Sep '04

Does the transgaming WINE have anything above what stock WINE has when it comes to OpenGL apps/games?

2 1

Re: Latest CVS alsa problem
by J. Grant 19 Sep '04

19 Sep '04

Hi Ivan, Thanks for your quick response. on the 19/09/04 22:14, Ivan Leo Puoti wrote: >> libalsa2-devel-0.9.0-0.8rc2mdk > This package contains the alsa development headers, so unless you have some good > reason to keep this RPM installed (For example you develop an app that needs > these headers), you can just uninstall this package and wine will compile > without alsa support. Wine's OSS driver should work with alsa's oss emulation. Ok, I did as you suggested and it now works. However it was a bit of a pain, because I use this version of ALSA for SDL development, so I am going to have to reinstall those packages and their deps to let me work on that. Would you be able to consider adding ./configure --disable-alsa ? (a la MPlayer and other projects) Also perhaps the alsa detection could not set it up when only alsa 0.9.0 is installed if WINE requires 1.0.x alsa now..? Please include my email address in any replies. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

http://winehq.org/ - W3C validation problem at present
by J. Grant 19 Sep '04

19 Sep '04

[resent following direction from Ivan] Hello, There is a problem on this page at present: http://validator.w3.org/ 1. Line 317, column 12: an attribute value must be a literal unless it contains only name characters <a href=?issue=239>WWN Issue 239</a> was released today. You have used a character that is not considered a "name character" in an attribute value. Which characters are considered "name characters" varies between the different document types, but a good rule of thumb is that unless the value contains only lower or upper case letters in the range a-z you must put quotation marks around the value. In fact, unless you have extreme file size requirements it is a very very good idea to always put quote marks around your attribute values. It is never wrong to do so, and very often it is absolutely necessary. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

Latest CVS alsa problem
by J. Grant 19 Sep '04

19 Sep '04

Greetings, I am trying to build the latest CVS. My last build was from last year, I want to check if something works with a newer build. Unfortunately, the latest WINE cvs does not work with alsa shipped with mdk 9.0: libalsa2-0.9.0-0.8rc2mdk alsamixergui-0.9.0-0.5rc1_2mdk libalsa2-devel-0.9.0-0.8rc2mdk Is there any way I can ./configure --disable-alsa ? configure does not complain when I pass it --disable-alsa, however it is still broken whey I try and build. I wonder if there is OSS support in WINE? Should the ./configure script not have noticed that alsa was not working? It configured it all ok. This is the error log (below) if someone is interested. I am not on this list, so please include my email address in any replies. Kind regards JG ================================================================== gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o vwin32.vxd.dbg.o vwin32.vxd.dbg.c ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./vwin32.vxd.spec vwin32.o vwin32.vxd.dbg.o -o vwin32.vxd.so -L../../dlls -lwinedos -lkernel32 -L../../libs/wine -lwine -L../../libs/port -lwine_port make[2]: Leaving directory `/home/now3d/wine/wine/dlls/vwin32.vxd' rm -f vwin32.vxd.so && ln -s vwin32.vxd/vwin32.vxd.so vwin32.vxd.so make[2]: Entering directory `/home/now3d/wine/wine/dlls/winmm/winealsa' gcc -c -I. -I. -I../../../include -I../../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o audio.o audio.c audio.c: In function `ALSA_TraceParameters': audio.c:514: too many arguments to function `snd_pcm_hw_params_get_access' audio.c:515: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:564: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c:568: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:569: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c:578: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c:582: too many arguments to function `snd_pcm_hw_params_get_buffer_size_min' audio.c:583: too many arguments to function `snd_pcm_hw_params_get_buffer_size_max' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:605: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time_min' audio.c:606: too many arguments to function `snd_pcm_hw_params_get_buffer_time_max' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods_min' audio.c:607: too many arguments to function `snd_pcm_hw_params_get_periods_max' audio.c:612: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:612: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:616: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size_min' from incompatible pointer type audio.c:616: too many arguments to function `snd_pcm_hw_params_get_period_size_min' audio.c:617: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size_max' from incompatible pointer type audio.c:617: too many arguments to function `snd_pcm_hw_params_get_period_size_max' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time_min' audio.c:624: too many arguments to function `snd_pcm_hw_params_get_period_time_max' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time_min' audio.c:625: too many arguments to function `snd_pcm_hw_params_get_tick_time_max' audio.c: In function `ALSA_WaveInit': audio.c:744: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:745: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:746: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:747: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c:851: too many arguments to function `snd_pcm_hw_params_get_rate_min' audio.c:852: too many arguments to function `snd_pcm_hw_params_get_rate_max' audio.c:853: too many arguments to function `snd_pcm_hw_params_get_channels_min' audio.c:854: too many arguments to function `snd_pcm_hw_params_get_channels_max' audio.c: In function `wodPlayer_DSPWait': audio.c:1200: too many arguments to function `snd_pcm_hw_params_get_period_time' audio.c: In function `wodOpen': audio.c:1717: warning: passing arg 3 of `snd_pcm_hw_params_set_rate_near' makes integer from pointer without a cast audio.c:1729: warning: passing arg 3 of `snd_pcm_hw_params_set_buffer_time_near' makes integer from pointer without a cast audio.c:1731: warning: passing arg 3 of `snd_pcm_hw_params_set_period_time_near' makes integer from pointer without a cast audio.c:1735: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:1735: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:1736: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c: In function `DSDB_MMAPCopy': audio.c:2248: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c:2249: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:2251: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:2251: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c: In function `DSDB_CreateMMAP': audio.c:2302: too many arguments to function `snd_pcm_hw_params_get_format' audio.c:2303: too many arguments to function `snd_pcm_hw_params_get_buffer_size' audio.c:2304: too many arguments to function `snd_pcm_hw_params_get_channels' audio.c: In function `IDsDriverBufferImpl_GetPosition': audio.c:2459: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:2459: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c: In function `widOpen': audio.c:3205: warning: passing arg 3 of `snd_pcm_hw_params_set_rate_near' makes integer from pointer without a cast audio.c:3218: warning: passing arg 3 of `snd_pcm_hw_params_set_buffer_time_near' makes integer from pointer without a cast audio.c:3220: warning: passing arg 3 of `snd_pcm_hw_params_set_period_time_near' makes integer from pointer without a cast audio.c:3225: warning: passing arg 2 of `snd_pcm_hw_params_get_period_size' from incompatible pointer type audio.c:3225: too many arguments to function `snd_pcm_hw_params_get_period_size' audio.c:3226: too many arguments to function `snd_pcm_hw_params_get_buffer_size' make[2]: *** [audio.o] Error 1 make[2]: Leaving directory `/home/now3d/wine/wine/dlls/winmm/winealsa' make[1]: *** [winmm/winealsa] Error 2 make[1]: Leaving directory `/home/now3d/wine/wine/dlls' make: *** [dlls] Error 2 -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

1 0

Re: CreateDIBitmap fix
by Stefan Leichter 19 Sep '04

19 Sep '04

Am Montag, 13. September 2004 13:12 schrieb Huw D M Davies: > Michael Kaufmann <hallo(a)michael-kaufmann.ch> > Huw Davies <huw(a)codeweavers.com> > CreateDIBitmap should return bitmaps at the depth of the > supplied dc. > Add a test to exercise this behaviour. Hello, this patch broke my Freecell (the version shiped with the win32s extension). When starting the game i am get now these fixme's: fixme:bitmap:CreateCompatibleBitmap got bad width 6291527 or height 65537, please look for reason Grepping the logfile i found the values first in a call of CreateBitmap, but i have no idea where the values are created. I noticed that the lower word of the width is correct. Does anyone have a clue how to debug / fix this ? Bye Stefan

3 3

Re: MSCMS: new dll
by Dmitry Timoshkov 19 Sep '04

19 Sep '04

"Hans Leidekker" <hans(a)it.vu.nl> wrote: > Here's the beginnings of an MSCMS.DLL (color management) on top of the > LittleCMS library. I had to resort to some rather ugly preprocessor > trickery to be able to include lcms.h, since it happens to define basic > Windows types when not compiled on Windows ;-(. Then perhaps it's better to make lcms.h think that it's used in a Windows environment (define WIN32 or whatever it wants to see before inclusion). That will help to completely avoid all the ugliness with redefined stuff. > +HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) > +{ > + TRACE("stub ( %p, %lx, %lx, %lx )\n", profile, access, sharing, creation ); > + > + return NULL; > +} > + > +HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) > +{ > + TRACE("stub ( %p, %lx, %lx, %lx )\n", profile, access, sharing, creation ); > + > + return NULL; > +} > + > +BOOL WINAPI CloseColorProfile( HPROFILE profile ) > +{ > + TRACE("stub ( %p )\n", profile ); > + > + return FALSE; > +} You have to use FIXMEs not TRACEs above to clearly indicate the status of the APIs. -- Dmitry.

3 3

Scrollbars and scrollwheel: -fomit-frame-pointer problems
by Diego 'Flameeyes' Pettenò 18 Sep '04

18 Sep '04

Hi, Seems like I found out which flags causes trouble with the scrollbars and the mouse's scrollwheel: building wine without -fomit-frame-pointer flag makes it work right. This fixes my problem ( http://article.gmane.org/gmane.comp.emulators.wine.devel/23780 ) and seems to fix (at least for me) the problem reported by Nguyen Tuan Anh ( http://article.gmane.org/gmane.comp.emulators.wine.user/7169 ). I actually don't know how to filter with autoconf and stuff the specified flag, I only know with gentoo's portage, but I hope there's a way to make this flag doesn't go to the gcc parameters. Regards, -- Diego "Flameeyes" Pettenò dgp85(a)users.sourceforge.net - http://flameeyes.web.ctonet.it/

6 10

Re: Added service database names
by Dmitry Timoshkov 18 Sep '04

18 Sep '04

"Alexander Yaworsky" <yaworsky(a)migusoft.ru> wrote: > +#ifdef UNICODE > +# define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW > +#else > +# define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA > +#endif Wine uses WINELIB_NAME_AW macro in order to simplify '#ifdef UNICODE' magic, so in the above case it would look like this: #define SERVICES_ACTIVE_DATABASE WINELIB_NAME_AW(SERVICES_ACTIVE_DATABASE) -- Dmitry.

2 1

Terminal Font
by pcunite＠fsmail.net 18 Sep '04

18 Sep '04

I have a windows app that works really well under wine. I have placed the fonts from my XP workstation to my Fedora 2 wine directory in "./wine/windows/fonts/" so that I could have more fonts available to the app. My problem is that the "Terminal" font is not showing up when using a windows API "Font Dialog". Where can I get this "Terminal dos/oem" font? Thank you Jason -- Whatever you Wanadoo: http://www.wanadoo.co.uk/time/ This email has been checked for most known viruses - find out more at: http://www.wanadoo.co.uk/help/id/7098.htm

2 1

Help with GetConsoleWindow()
by Ewert, Mark 18 Sep '04

18 Sep '04

I'm running an application that calls the stubbed out function GetConsoleWindow(). I want the application to stay in the dos console when it runs but unfortunately when it sees a NULL from GetConsoleWindow() it loads a graphical window. I tried hacking the function to return the value 1 and this gave me the result I had hoped where it did not call up a graphical window but at a later point I get the error: wine: Unhandled exception (thread 000d), starting debugger... Any ideas on what GetConsoleWindow() should actually return? Cheers, Mark

3 2

Wine-20040918 preblems in
by Green, Shaun E. 18 Sep '04

18 Sep '04

Wine does not function correctly under Yoper Linux with kernel 2.6.8.1-7 (this kernel has performance patches applied). It seems to build fine, but it does not run correctly and running MFC apps do not even open. I tried changing the /tmp link in dosdevices directory, etc but to no avail. I've tried previous Wine versions and stable May release, but same results. Codeweavers crossover office works, but it's too slow for my purposes. I've used Wine-20040818 successfully since it's release on Yoper Linux with kernel 2.4.26 vanilla, so that's why I'm betting it's a kernel 2.6.8.1 issue. Can anyone help? Shaun

2 1

Re: dinput header fixes
by Alexandre Julliard 18 Sep '04

18 Sep '04

Robert Reif <reif(a)earthlink.net> writes: > Add some more version checks. As a rule we avoid such version checks in Wine, they are not necessary and will only cause trouble since we compile our code with the same headers. I know there are some similar checks in there already but they should probably be removed. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: buffer: ref count cleanup
by Robert Reif 18 Sep '04

18 Sep '04

James Hawkins wrote: >Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. > > > That ref doesn't belong to a com object. I belongs to a duplicated memory buffer and should probably be protected by a lock someday.

1 0

[OT] AMD64 Implications
by Ann and Jason Edmeades 17 Sep '04

17 Sep '04

Hello, Slightly off topic, but I am looking at purchasing a new PC and intend to continue doing wine development on it (especially d3d9). Is there any wine implications to buying an AMD64 compared to a 'normal' 32 bit chip. Will I be able to continue my wine development, obviously for running emulation of 32 bit windows apps (games)? Would I need to ensure I use 32 bit kernels, or can I make use of any 64 bit ones (dont know if these exist even!). Sorry if this is an obvious question, but I didnt want to go so far and find I have caused myself problems Jason

2 1

Re: fonts: wine_marlett
by Ivan Leo Puoti 17 Sep '04

17 Sep '04

> That works but then we're maintaining two codepaths, one or other of > which will hardly be tested at all. Why not just check in the font > binaries? What is required to build the fonts? Should I install fontforge? I've been in hospital with appendicitis and haven't followed wine development recently. Ivan.

1 0

Re: olefont: ref count cleanup
by Robert Shearman 17 Sep '04

17 Sep '04

James Hawkins wrote: >Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. > > Again, all of these patches do not fix the whole point about using the Interlocked* functions, which is that the variable must always be used *atomically*. That means if you grep the file for uses of "This->ref" (or the equivalent) then they should all only be as parameters to Interlocked* functions. Rob

2 2

Re: InternetSetStatusCallback Fix (resend)
by Alexandre Julliard 17 Sep '04

17 Sep '04

Robert Shearman <rob(a)codeweavers.com> writes: > Any reason this patch wasn't applied? Yes, it doesn't apply. Could you please resend an updated patch? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: olepicture: ref count cleanup
by Alexandre Julliard 17 Sep '04

17 Sep '04

James Hawkins <truiken(a)gmail.com> writes: > Changelog > * Use InterlockedDecrement and InterlockedIncrement instead of ++/--. When making these changes please fix the rest of the function too, any place that uses This->ref directly is broken, it should use the return value of the Interlocked call instead. Otherwise there's no point in making the changes since it still won't be thread-safe. -- Alexandre Julliard julliard(a)winehq.org

1 0

autoconf issues on HP-UX
by Warren_Baird＠cimmetry.com 17 Sep '04

17 Sep '04

Hi all, I'm in the process of trying to get winelib working on an HP-UX / PA-RISC machine. The first issue I've come across is related to autoconf, and I'm afraid I'm far from an autoconf guru, so I wanted to post my proposed solution here before submitting a patch. The problem is that the current autoconf tests done to determine how to link a shared library aren't very good - they use WINE_TRY_CFLAGS, which builds a c file containing something like "void main() { } " and tries to link it. The problem is that this isn't a very good test about whether you can link a *shared library* - since you've got a main line defined. Unfortunately the gnu ld doesn't work on hpux, so I have to use the system linker, and the UnixWare link test succeed when it should fail - since the HPUX linker doesn't understand the arguments it is given, it goes on to link an executable and generates a warning about not being able to hide symbol "conftest.so.1.0". I believe that a better test is to try to link a shared lib from a C file containing "void myfunc() {}" - this way if the provided arguments don't convince the linker to create a shared lib, you'll get a error about "main" being undefined. My proposed solution is to define a new function "WINE_TRY_SHLIB" that does what I describe above, and then use it in the 3 existing places we're checking for shared libs, and add a new test specifically for hpux. I've attached my proposed patch file (although I'm still trying to sort out exactly what flags I need for hpux libs)... Does this seem reasonable? thanks, Warren (See attached file: patch.txt)

2 1

Re: fonts: wine_marlett
by Robert Shearman 17 Sep '04

17 Sep '04

Huw D M Davies wrote: > TransGaming > Add a Marlett replacement font > > Cool! Is there any policy for using it? E.g. a lot of the arrows and stuff in the native comctl32 are drawn using this font, so would we now be able to do this with our version of the common controls? Rob

5 5

Re: [DPNET] Cleanup/Correct
by Alexandre Julliard 17 Sep '04

17 Sep '04

Raphael <fenix(a)club-internet.fr> writes: > I'm back (after a long time without coding) and seems that many directx dlls > are brokens after COM "migrations" No, the dlls are fine, probably your tree has not been updated properly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ADVAPI32: SHA functions
by Filip Navara 17 Sep '04

17 Sep '04

Filip Navara wrote: > Changelog: > Implement A_SHA* functions present in Windows XP and later systems. Now with a correct diff... Index: dlls/advapi32/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/advapi32/Makefile.in,v retrieving revision 1.19 diff -u -r1.19 Makefile.in --- dlls/advapi32/Makefile.in 11 Oct 2003 01:09:21 -0000 1.19 +++ dlls/advapi32/Makefile.in 16 Sep 2004 20:42:22 -0000 @@ -10,6 +10,7 @@ C_SRCS = \ advapi.c \ crypt.c \ + crypt_sha.c \ eventlog.c \ registry.c \ security.c \ Index: dlls/advapi32/advapi32.spec =================================================================== RCS file: /home/wine/wine/dlls/advapi32/advapi32.spec,v retrieving revision 1.56 diff -u -r1.56 advapi32.spec --- dlls/advapi32/advapi32.spec 16 Sep 2004 19:09:13 -0000 1.56 +++ dlls/advapi32/advapi32.spec 16 Sep 2004 20:42:07 -0000 @@ -1,6 +1,6 @@ -@ stub A_SHAFinal -@ stub A_SHAInit -@ stub A_SHAUpdate +@ stdcall A_SHAFinal(ptr str) +@ stdcall A_SHAInit(ptr) +@ stdcall A_SHAUpdate(ptr str long) @ stdcall AbortSystemShutdownA(ptr) @ stdcall AbortSystemShutdownW(ptr) @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) Index: dlls/advapi32/tests/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/advapi32/tests/Makefile.in,v retrieving revision 1.4 diff -u -r1.4 Makefile.in --- dlls/advapi32/tests/Makefile.in 9 Aug 2004 18:47:22 -0000 1.4 +++ dlls/advapi32/tests/Makefile.in 17 Sep 2004 14:18:58 -0000 @@ -7,6 +7,7 @@ CTESTS = \ crypt.c \ + crypt_sha.c \ registry.c \ security.c --- /dev/null Fri Sep 17 17:41:26 2004 +++ dlls/advapi32/crypt_sha.c Thu Sep 16 22:34:13 2004 @@ -0,0 +1,188 @@ +/* + * Copyright 2004 Filip Navara + * Based on public domain SHA code by Steve Reid <steve(a)edmweb.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/* SHA Context Structure Declaration */ + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +/* SHA1 Helper Macros */ + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) +/* FIXME: This definition of DWORD2BE is little endian specific! */ +#define DWORD2BE(x) (((x) >> 24) & 0xff) | (((x) >> 8) & 0xff00) | (((x) << 8) & 0xff0000) | (((x) << 24) & 0xff000000); +/* FIXME: This definition of blk0 is little endian specific! */ +#define blk0(i) (Block[i] = (rol(Block[i],24)&0xFF00FF00)|(rol(Block[i],8)&0x00FF00FF)) +#define blk1(i) (Block[i&15] = rol(Block[(i+13)&15]^Block[(i+8)&15]^Block[(i+2)&15]^Block[i&15],1)) +#define f1(x,y,z) (z^(x&(y^z))) +#define f2(x,y,z) (x^y^z) +#define f3(x,y,z) ((x&y)|(z&(x|y))) +#define f4(x,y,z) (x^y^z) +/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ +#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); +#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); +#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); + +/* Hash a single 512-bit block. This is the core of the algorithm. */ +void SHA1Transform(ULONG State[5], CHAR Buffer[64]) +{ + ULONG a, b, c, d, e; + ULONG *Block; + + Block = (ULONG*)Buffer; + + /* Copy Context->State[] to working variables */ + a = State[0]; + b = State[1]; + c = State[2]; + d = State[3]; + e = State[4]; + + /* 4 rounds of 20 operations each. Loop unrolled. */ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + + /* Add the working variables back into Context->State[] */ + State[0] += a; + State[1] += b; + State[2] += c; + State[3] += d; + State[4] += e; + + /* Wipe variables */ + a = b = c = d = e = 0; +} + + +/****************************************************************************** + * A_SHAInit [ADVAPI32.@] + * + * Initialize a SHA context structure. + */ +VOID WINAPI +A_SHAInit(PSHA_CTX Context) +{ + /* SHA1 initialization constants */ + Context->State[0] = 0x67452301; + Context->State[1] = 0xEFCDAB89; + Context->State[2] = 0x98BADCFE; + Context->State[3] = 0x10325476; + Context->State[4] = 0xC3D2E1F0; + Context->Count[0] = + Context->Count[1] = 0; +} + +/****************************************************************************** + * A_SHAUpdate [ADVAPI32.@] + * + * Update a SHA context with a hashed data from supplied buffer. + */ +VOID WINAPI +A_SHAUpdate(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize) +{ + ULONG BufferContentSize; + + BufferContentSize = Context->Count[1] & 63; + Context->Count[1] += BufferSize; + if (Context->Count[1] < BufferSize) + Context->Count[0]++; + Context->Count[0] += (BufferSize >> 29); + + if (BufferContentSize + BufferSize < 64) + { + RtlCopyMemory(&Context->Buffer[BufferContentSize], Buffer, + BufferSize); + } + else + { + while (BufferContentSize + BufferSize >= 64) + { + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, + 64 - BufferContentSize); + Buffer += 64 - BufferContentSize; + BufferSize -= 64 - BufferContentSize; + SHA1Transform(Context->State, Context->Buffer); + BufferContentSize = 0; + } + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, BufferSize); + } +} + +/****************************************************************************** + * A_SHAUpdate [ADVAPI32.@] + * + * Finalize SHA context and return the resulting hash. + */ +VOID WINAPI +A_SHAFinal(PSHA_CTX Context, PULONG Result) +{ + INT Pad, Index; + UCHAR Buffer[72]; + ULONG *Count; + ULONG BufferContentSize, LengthHi, LengthLo; + + BufferContentSize = Context->Count[1] & 63; + if (BufferContentSize >= 56) + Pad = 56 + 64 - BufferContentSize; + else + Pad = 56 - BufferContentSize; + + LengthHi = (Context->Count[0] << 3) | (Context->Count[1] >> (32 - 3)); + LengthLo = (Context->Count[1] << 3); + + RtlZeroMemory(Buffer + 1, Pad - 1); + Buffer[0] = 0x80; + Count = (ULONG*)(Buffer + Pad); + Count[0] = DWORD2BE(LengthHi); + Count[1] = DWORD2BE(LengthLo); + A_SHAUpdate(Context, Buffer, Pad + 8); + + for (Index = 0; Index < 5; Index++) + Result[Index] = DWORD2BE(Context->State[Index]); + + A_SHAInit(Context); +} --- /dev/null Fri Sep 17 17:41:59 2004 +++ dlls/advapi32/tests/crypt_sha.c Fri Sep 17 16:20:32 2004 @@ -0,0 +1,85 @@ +/* + * Unit tests for SHA functions + * + * Copyright (c) 2004 Filip Navara + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +typedef VOID (WINAPI *fnA_SHAInit)(PSHA_CTX Context); +typedef VOID (WINAPI *fnA_SHAUpdate)(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize); +typedef VOID (WINAPI *fnA_SHAFinal)(PSHA_CTX Context, PULONG Result); + +fnA_SHAInit pA_SHAInit; +fnA_SHAUpdate pA_SHAUpdate; +fnA_SHAFinal pA_SHAFinal; + +#define ctxcmp(a,b) memcmp((char*)a, (char*)b, FIELD_OFFSET(SHA_CTX, Buffer)) + +void test_sha_ctx() +{ + PCHAR test_buffer = "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; + ULONG test_buffer_size = strlen(test_buffer); + HMODULE hmod; + SHA_CTX ctx; + SHA_CTX ctx_initialized = {{0, 0, 0, 0, 0}, {0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0}, {0, 0}}; + SHA_CTX ctx_update1 = {{0, 0, 0, 0, 0}, {0xdbe5eba8, 0x6b4335ca, 0xf7c94abe, 0xc9f34e31, 0x311023f0}, {0, 0x67}}; + SHA_CTX ctx_update2 = {{0, 0, 0, 0, 0}, {0x5ecc818d, 0x52498169, 0xf6758559, 0xd035a164, 0x871dd125}, {0, 0xce}}; + ULONG result[5]; + ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; + + hmod = LoadLibrary("advapi32.dll"); + pA_SHAInit = (fnA_SHAInit)GetProcAddress(hmod, "A_SHAInit"); + pA_SHAUpdate = (fnA_SHAUpdate)GetProcAddress(hmod, "A_SHAUpdate"); + pA_SHAFinal = (fnA_SHAFinal)GetProcAddress(hmod, "A_SHAFinal"); + + RtlZeroMemory(&ctx, sizeof(ctx)); + pA_SHAInit(&ctx); + ok(!ctxcmp(&ctx, &ctx_initialized), "invalid initialization\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update1), "update doesn't work correctly\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update2), "update doesn't work correctly\n"); + + pA_SHAFinal(&ctx, result); + ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n"); + ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); + + FreeLibrary(hmod); +} + +START_TEST(crypt_sha) +{ + test_sha_ctx(); +}

1 0

Re: ADVAPI32: SHA functions
by Dmitry Timoshkov 17 Sep '04

17 Sep '04

"Filip Navara" <xnavara(a)volny.cz> wrote: > --- /dev/null Fri Sep 17 17:41:26 2004 > +++ dlls/advapi32/crypt_sha.c Thu Sep 16 22:34:13 2004 This is the first crypt_sha.c, with an API implementation. > --- /dev/null Fri Sep 17 17:41:59 2004 > +++ dlls/advapi32/crypt_sha.c Fri Sep 17 16:20:32 2004 This is the second crypt_sha.c, with an API test. It seems that this crypt_sha.c was supposed to go in the tests subdirectory. -- Dmitry.

1 0

Re: Lostwages add seti@home link
by hatky 17 Sep '04

17 Sep '04

May I ask in what way does a person running seti@home helps wine? Not that I am against the project but you make it sound as a needed contribution to wine, well I don't see it helping wine too much except some extra attention from random sources, and it isn't even open source, mybe some other place? Resources -> others ? I would say links -> others but we don't have that :) And another thing please update the seti@home group home page to winehq.org from the winehq.com it has, thanks. On Friday 17 September 2004 02:17, Ivan Leo Puoti wrote: > Add a link to our seti@home team in the contirbuting page. > > Ivan. -- Hatky, Worshiper of wine (http://www.winehq.org/), Impossible is only an opinion.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel