June 2006 - Wine-commits - list.winehq.org

Karsten Elfenbein : kernel/tests: More tests for FindFirstFile.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 99fa40e2bf84e773ca39a7055f0d79bfe6718ad2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99fa40e2bf84e773ca39a70… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Mon Jun 5 16:23:21 2006 +0200 kernel/tests: More tests for FindFirstFile. --- dlls/kernel/tests/file.c | 60 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index 758cb72..ec736db 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1192,20 +1192,64 @@ static void test_FindFirstFileA(void) WIN32_FIND_DATAA search_results; int err; char buffer[5] = "C:\\"; + char buffer2[100]; /* try FindFirstFileA on "C:\" */ buffer[0] = get_windows_drive(); - handle = FindFirstFileA(buffer,&search_results); + + SetLastError( 0xdeadbeaf ); + handle = FindFirstFileA(buffer, &search_results); err = GetLastError(); - ok ( handle == INVALID_HANDLE_VALUE , "FindFirstFile on root directory should Fail\n"); - if (handle == INVALID_HANDLE_VALUE) - ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on root directory should fail\n" ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); /* try FindFirstFileA on "C:\*" */ - strcat(buffer, "*"); - handle = FindFirstFileA(buffer,&search_results); - ok ( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s should succeed\n", buffer ); - ok ( FindClose(handle) == TRUE, "Failed to close handle\n"); + strcpy(buffer2, buffer); + strcat(buffer2, "*"); + handle = FindFirstFileA(buffer2, &search_results); + ok ( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s should succeed\n", buffer2 ); + ok ( FindClose(handle) == TRUE, "Failed to close handle %s\n", buffer2 ); + + /* try FindFirstFileA on "C:\foo\" */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, buffer); + strcat(buffer2, "foo\\"); + handle = FindFirstFileA(buffer2, &search_results); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + + /* try FindFirstFileA on "C:\foo\bar.txt" */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, buffer); + strcat(buffer2, "foo\\bar.txt"); + handle = FindFirstFileA(buffer2, &search_results); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + todo_wine { + ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + } + + /* try FindFirstFileA on "C:\foo\*.*" */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, buffer); + strcat(buffer2, "foo\\*.*"); + handle = FindFirstFileA(buffer2, &search_results); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + todo_wine { + ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + } + + /* try FindFirstFileA on "foo\bar.txt" */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, "foo\\bar.txt"); + handle = FindFirstFileA(buffer2, &search_results); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + todo_wine { + ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + } } static void test_FindNextFileA(void)

1 0

Huw Davies : msi: Add some integer condition tests.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: f5c72fd202b78a60a372ca25fee54265635ddf61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5c72fd202b78a60a372ca2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 16:57:44 2006 +0100 msi: Add some integer condition tests. --- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2aa2d4f..e23b73c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -381,9 +381,54 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "0 = 1"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "0 > 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "0 ~> 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 > 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 ~> 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "0 >= 1"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "0 ~>= 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 >= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 ~>= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "0 < 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "0 ~< 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 < 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 ~< 1"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "0 <= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "0 ~<= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 <= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "1 ~<= 1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "0 >="); ok( r == MSICONDITION_ERROR, "wrong return val\n");

1 0

Ulrich Czekalla : include: Add DDHAL_UPDATEOVERLAYDATA structure.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 00b2511bc84d8c3b5b926a0a4d552d83308fce1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00b2511bc84d8c3b5b926a0… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Mon Jun 5 11:43:15 2006 -0400 include: Add DDHAL_UPDATEOVERLAYDATA structure. --- include/ddrawi.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/ddrawi.h b/include/ddrawi.h index 40e34aa..8b3b632 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -592,6 +592,18 @@ typedef struct _DDHAL_BLTDATA { LPRECT prDestRects; } DDHAL_BLTDATA; +typedef struct _DDHAL_UPDATEOVERLAYDATA { + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; + RECTL rDest; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; + RECTL rSrc; + DWORD dwFlags; + DDOVERLAYFX overlayFX; + HRESULT ddRVal; + LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; +} DDHAL_UPDATEOVERLAYDATA; + typedef struct _DDHAL_SETPALETTEDATA { LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;

1 0

Mike McCormack : hlink: Add hlguids.h (based on a patch by Aric Stewart).
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: a47ed5961054cdf8f0e6ecdc1124146d224c961c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a47ed5961054cdf8f0e6ecd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 5 15:24:52 2006 +0900 hlink: Add hlguids.h (based on a patch by Aric Stewart). --- include/Makefile.in | 1 + include/hlguids.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 include/hlguids.h diff --git a/include/Makefile.in b/include/Makefile.in index d726016..d9825c4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -139,6 +139,7 @@ WINDOWS_INCLUDES = \ fci.h \ fdi.h \ guiddef.h \ + hlguids.h \ htmlhelp.h \ icm.h \ icmpapi.h \ diff --git a/include/hlguids.h b/include/hlguids.h new file mode 100644 index 0000000..77bac3e --- /dev/null +++ b/include/hlguids.h @@ -0,0 +1,29 @@ +/* + * Implementation of hyperlinking (hlink.dll) + * + * Copyright 2005 Aric Stewart for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_HLGUIDS_H__ +#define __WINE_HLGUIDS_H__ + +DEFINE_GUID(CLSID_StdHlink, + 0x79eac9d0, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); +DEFINE_GUID(CLSID_StdHlinkBrowseContext, + 0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); + +#endif

1 0

Magnus Lundborg : wordpad: Declare three functions as static to avoid compiler warnings.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 80e5f27b30236ea86b1e2db5d5257f4b7466c58f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e5f27b30236ea86b1e2db… Author: Magnus Lundborg <magnus.lundborg.6955(a)student.uu.se> Date: Mon Jun 5 12:10:40 2006 +0200 wordpad: Declare three functions as static to avoid compiler warnings. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7392b9c..0abe457 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -43,7 +43,7 @@ static const WCHAR wszAppTitle[] = {'W', static HWND hMainWnd = NULL; -void AddButton(HWND hwndToolBar, int nImage, int nCommand) +static void AddButton(HWND hwndToolBar, int nImage, int nCommand) { TBBUTTON button; @@ -57,7 +57,7 @@ void AddButton(HWND hwndToolBar, int nIm SendMessage(hwndToolBar, TB_ADDBUTTONS, 1, (LPARAM)&button); } -void AddSeparator(HWND hwndToolBar) +static void AddSeparator(HWND hwndToolBar) { TBBUTTON button; @@ -435,7 +435,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam); } -LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) {

1 0

Stefan Dösinger : wined3d: Render target locking fixes .
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 2c3adec5959b6ac0f1ca4a097c62000733d4a1e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c3adec5959b6ac0f1ca4a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 4 16:42:57 2006 +0200 wined3d: Render target locking fixes. --- dlls/wined3d/drawprim.c | 12 ++ dlls/wined3d/surface.c | 302 +++++++++++++++++++++++----------------------- dlls/wined3d/swapchain.c | 3 3 files changed, 168 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2c3adec5959b6ac0f1c…

1 0

Mike McCormack : dnsapi: Fix the case where we have libresolv headers but no libraries.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: ea2d3f802bec6109f6b1f717ee5f8a15e132847d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea2d3f802bec6109f6b1f71… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 5 21:50:00 2006 +0900 dnsapi: Fix the case where we have libresolv headers but no libraries. --- dlls/dnsapi/ns_parse.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index 7d76428..9c386bc 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -17,6 +17,8 @@ #include "config.h" +#ifdef HAVE_RESOLV + #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -180,3 +182,5 @@ setsection(ns_msg *msg, ns_sect sect) { NS_PTR(msg) = msg->_sections[(int)sect]; } } + +#endif

1 0

Mike McCormack : advapi32: Implement and test SystemFunction031.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 473ad39dcba386ff38ccd44bed84fc0a9c70f6ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=473ad39dcba386ff38ccd44… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 19:41:37 2006 +0900 advapi32: Implement and test SystemFunction031. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/tests/crypt_lmhash.c | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3b1828a..f9285ca 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -625,7 +625,7 @@ # @ stub StopTraceW @ stub SystemFunction028 @ stub SystemFunction029 @ stdcall SystemFunction030(ptr ptr) -@ stub SystemFunction031 +@ stdcall SystemFunction031(ptr ptr) SystemFunction030 @ stdcall SystemFunction032(ptr ptr) @ stub SystemFunction033 @ stub SystemFunction034 diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 1618cf8..847f3b0 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -79,7 +79,10 @@ descrypt pSystemFunction025; descrypt pSystemFunction026; descrypt pSystemFunction027; -fnSystemFunction030 pSystemFunction030; +typedef int (WINAPI *memcmpfunc)(unsigned char *, unsigned char *); +memcmpfunc pSystemFunction030; +memcmpfunc pSystemFunction031; + fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -476,37 +479,40 @@ static void test_SystemFunction_dec32(de ok( !memcmp( output, des_plaintext, sizeof des_plaintext), "plaintext wrong (%d)\n", num); } -static void test_SystemFunction030(void) +static void test_memcmpfunc(memcmpfunc fn) { unsigned char arg1[0x20], arg2[0x20]; int r; - /* r = pSystemFunction030(NULL, NULL); - crashes */ + if (!fn) + return; + + /* r = fn(NULL, NULL); - crashes */ memset(arg1, 0, sizeof arg1); memset(arg2, 0, sizeof arg2); arg1[0x10] = 1; - r = pSystemFunction030(arg1, arg2); + r = fn(arg1, arg2); ok( r == 1, "wrong error code\n"); memset(arg1, 1, sizeof arg1); memset(arg2, 1, sizeof arg2); arg1[0x10] = 0; - r = pSystemFunction030(arg1, arg2); + r = fn(arg1, arg2); ok( r == 1, "wrong error code\n"); memset(arg1, 0, sizeof arg1); memset(arg2, 1, sizeof arg2); - r = pSystemFunction030(arg1, arg2); + r = fn(arg1, arg2); ok( r == 0, "wrong error code\n"); memset(arg1, 1, sizeof arg1); memset(arg2, 0, sizeof arg2); - r = pSystemFunction030(arg1, arg2); + r = fn(arg1, arg2); ok( r == 0, "wrong error code\n"); } @@ -590,9 +596,11 @@ START_TEST(crypt_lmhash) test_SystemFunction_dec32(pSystemFunction025, 25); test_SystemFunction_dec32(pSystemFunction027, 27); - pSystemFunction030 = (fnSystemFunction030)GetProcAddress( module, "SystemFunction030" ); - if (pSystemFunction030) - test_SystemFunction030(); + pSystemFunction030 = (memcmpfunc) GetProcAddress( module, "SystemFunction030" ); + pSystemFunction031 = (memcmpfunc) GetProcAddress( module, "SystemFunction031" ); + + test_memcmpfunc(pSystemFunction030); + test_memcmpfunc(pSystemFunction031); pSystemFunction032 = (fnSystemFunction032)GetProcAddress( module, "SystemFunction032" ); if (pSystemFunction032)

1 0

Mike McCormack : advapi32: Implement and test SystemFunction030.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: 546b84c0c56b8168560aeadae229c8972c1aa509 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=546b84c0c56b8168560aead… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 19:40:54 2006 +0900 advapi32: Implement and test SystemFunction030. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 17 +++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 48 +++++++++++++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index f783c6d..3b1828a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -624,7 +624,7 @@ # @ stub StopTraceW @ stdcall SystemFunction027(ptr ptr ptr) SystemFunction025 @ stub SystemFunction028 @ stub SystemFunction029 -@ stub SystemFunction030 +@ stdcall SystemFunction030(ptr ptr) @ stub SystemFunction031 @ stdcall SystemFunction032(ptr ptr) @ stub SystemFunction033 diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index dae2343..7a258c4 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1969,6 +1969,23 @@ BOOL WINAPI CryptVerifySignatureA (HCRYP /****************************************************************************** * SystemFunction036 (ADVAPI32.@) * + * Tests if two blocks of 16 bytes are equal + * + * PARAMS + * b1,b2 [I] block of 16 bytes + * + * RETURNS + * TRUE if blocks are the same + * FALSE if blocks are different + */ +BOOL WINAPI SystemFunction030(PVOID b1, PVOID b2) +{ + return !memcmp(b1, b2, 0x10); +} + +/****************************************************************************** + * SystemFunction036 (ADVAPI32.@) + * * MSDN documents this function as RtlGenRandom and declares it in ntsecapi.h * * PARAMS diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 79d5542..1618cf8 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -43,6 +43,7 @@ typedef VOID (WINAPI *fnSystemFunction00 typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction009)(const LPBYTE, const LPBYTE, LPBYTE); typedef int (WINAPI *descrypt)(unsigned char *, unsigned char *, unsigned char *); +typedef NTSTATUS (WINAPI *fnSystemFunction030)(void*, void*); typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); fnSystemFunction001 pSystemFunction001; @@ -78,6 +79,7 @@ descrypt pSystemFunction025; descrypt pSystemFunction026; descrypt pSystemFunction027; +fnSystemFunction030 pSystemFunction030; fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -474,6 +476,40 @@ static void test_SystemFunction_dec32(de ok( !memcmp( output, des_plaintext, sizeof des_plaintext), "plaintext wrong (%d)\n", num); } +static void test_SystemFunction030(void) +{ + unsigned char arg1[0x20], arg2[0x20]; + int r; + + /* r = pSystemFunction030(NULL, NULL); - crashes */ + + memset(arg1, 0, sizeof arg1); + memset(arg2, 0, sizeof arg2); + arg1[0x10] = 1; + + r = pSystemFunction030(arg1, arg2); + ok( r == 1, "wrong error code\n"); + + memset(arg1, 1, sizeof arg1); + memset(arg2, 1, sizeof arg2); + arg1[0x10] = 0; + + r = pSystemFunction030(arg1, arg2); + ok( r == 1, "wrong error code\n"); + + memset(arg1, 0, sizeof arg1); + memset(arg2, 1, sizeof arg2); + + r = pSystemFunction030(arg1, arg2); + ok( r == 0, "wrong error code\n"); + + memset(arg1, 1, sizeof arg1); + memset(arg2, 0, sizeof arg2); + + r = pSystemFunction030(arg1, arg2); + ok( r == 0, "wrong error code\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -512,10 +548,6 @@ START_TEST(crypt_lmhash) if (pSystemFunction009) test_SystemFunction009(); - pSystemFunction032 = (fnSystemFunction032)GetProcAddress( module, "SystemFunction032" ); - if (pSystemFunction032) - test_SystemFunction032(); - pSystemFunction012 = (descrypt) GetProcAddress( module, "SystemFunction012"); pSystemFunction013 = (descrypt) GetProcAddress( module, "SystemFunction013"); pSystemFunction014 = (descrypt) GetProcAddress( module, "SystemFunction014"); @@ -557,4 +589,12 @@ START_TEST(crypt_lmhash) /* these descrypt two DES blocks with a short key */ test_SystemFunction_dec32(pSystemFunction025, 25); test_SystemFunction_dec32(pSystemFunction027, 27); + + pSystemFunction030 = (fnSystemFunction030)GetProcAddress( module, "SystemFunction030" ); + if (pSystemFunction030) + test_SystemFunction030(); + + pSystemFunction032 = (fnSystemFunction032)GetProcAddress( module, "SystemFunction032" ); + if (pSystemFunction032) + test_SystemFunction032(); }

1 0

Hans Leidekker : msi: Fix some copy/ paste bugs in the implementation of condition operators.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Module: wine Branch: refs/heads/master Commit: c077aaf11689586a4a961c2f9349cd04998bca6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c077aaf11689586a4a961c2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 5 12:54:20 2006 +0200 msi: Fix some copy/paste bugs in the implementation of condition operators. --- dlls/msi/cond.y | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index b32c417..031c489 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -463,7 +463,7 @@ static INT compare_int( INT a, INT opera return a >= b; case COND_LE: case COND_ILE: - return a >= b; + return a <= b; case COND_SS: case COND_ISS: return ( a & b ) ? 1 : 0; @@ -492,21 +492,21 @@ static int COND_GetOperator( COND_input int id; } table[] = { { {'~','=',0}, COND_IEQ }, - { {'~','>','=',0}, COND_ILE }, + { {'~','<','=',0}, COND_ILE }, { {'~','>','<',0}, COND_ISS }, { {'~','>','>',0}, COND_IRHS }, - { {'~','>',0}, COND_ILT }, { {'~','<','>',0}, COND_INE }, - { {'~','<','=',0}, COND_IGE }, + { {'~','<',0}, COND_ILT }, + { {'~','>','=',0}, COND_IGE }, { {'~','<','<',0}, COND_ILHS }, - { {'~','<',0}, COND_IGT }, + { {'~','>',0}, COND_IGT }, { {'>','=',0}, COND_GE }, { {'>','<',0}, COND_SS }, - { {'>','>',0}, COND_LHS }, + { {'<','<',0}, COND_LHS }, { {'>',0}, COND_GT }, { {'<','>',0}, COND_NE }, { {'<','=',0}, COND_LE }, - { {'<','<',0}, COND_RHS }, + { {'>','>',0}, COND_RHS }, { {'<',0}, COND_LT }, { {0}, 0 } };

1 0