- Wine-Devel - list.winehq.org

Re: InternetSetStatusCallback Fix (resend)
by Alexandre Julliard Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

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 Sept. 17, 2004

Sept. 17, 2004

"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 Sept. 17, 2004

Sept. 17, 2004

May I ask in what way does a person running seti(a)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(a)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(a)home team in the contirbuting page. > > Ivan. -- Hatky, Worshiper of wine (http://www.winehq.org/) Impossible is only an opinion.

1 0

Re: Cryptographic functions
by Juan Lang Sept. 16, 2004

Sept. 16, 2004

Patching advapi32.spec to add the stubs looks correct. Go ahead and submit to wine-patches. --Juan _______________________________ Do you Yahoo!? Declare Yourself - Register online to vote today! http://vote.yahoo.com

4 6

Re: winedos:MCB implementation
by Alexandre Julliard Sept. 16, 2004

Sept. 16, 2004

Markus Amsler <markus.amsler(a)oribi.org> writes: > Please let me know, if there's something wrong with the patch (design > problems, naming conventions, formating, ...). The main problem is that you now have both the MCB and the DOSMEM code trying to allocate memory in the same area, that won't work. What you probably want is to make the DOSMEM functions call out to the MCB ones. -- Alexandre Julliard julliard(a)winehq.org

2 2