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

Ivan Gyurdiev : wined3d: Clean up register use maps.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: cb973648abf808ece1c95c93496b3216fb3e075d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb973648abf808ece1c95c9… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun May 21 17:16:17 2006 -0400 wined3d: Clean up register use maps. --- dlls/wined3d/baseshader.c | 65 ++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 6 ---- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6629d58..844dbc7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -30,6 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLNAME_REQUIRE_GLSL ((const char *)1) +typedef struct shader_reg_maps { + DWORD texcoord; + DWORD temporary; + DWORD address; +} shader_reg_maps; + inline static BOOL shader_is_version_token(DWORD token) { return shader_is_pshader_version(token) || shader_is_vshader_version(token); @@ -153,26 +159,22 @@ int shader_skip_unrecognized( return tokens_read; } -/* Note: For vertex shaders, - * texUsed = addrUsed, and - * D3DSPR_TEXTURE = D3DSPR_ADDR. - * - * Also note that this does not count the loop register - * as an address register. */ +/* Note that this does not count the loop register + * as an address register. */ -void shader_get_registers_used( +static void shader_get_registers_used( IWineD3DBaseShader *iface, + shader_reg_maps* reg_maps, CONST DWORD* pToken) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - DWORD* tempsUsed = &This->baseShader.temps_used; - DWORD* texUsed = &This->baseShader.textures_used; if (pToken == NULL) return; - *tempsUsed = 0; - *texUsed = 0; + reg_maps->temporary = 0; + reg_maps->texcoord = 0; + reg_maps->address = 0; while (D3DVS_END() != *pToken) { CONST SHADER_OPCODE* curOpcode; @@ -233,10 +235,16 @@ void shader_get_registers_used( regtype = (param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT; reg = param & D3DSP_REGNUM_MASK; - if (D3DSPR_TEXTURE == regtype) - *texUsed |= (1 << reg); + if (D3DSPR_TEXTURE == regtype) { /* vs: D3DSPR_ADDR */ + + if (shader_is_pshader_version(This->baseShader.hex_version)) + reg_maps->texcoord |= (1 << reg); + else + reg_maps->address |= (1 << reg); + } + if (D3DSPR_TEMP == regtype) - *tempsUsed |= (1 << reg); + reg_maps->temporary |= (1 << reg); } } } @@ -498,30 +506,33 @@ void shader_dump_param( /** Generate the variable & register declarations for the ARB_vertex_program output target */ -void generate_arb_declarations(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer) { +void generate_arb_declarations( + IWineD3DBaseShader *iface, + shader_reg_maps* reg_maps, + SHADER_BUFFER* buffer) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; DWORD i; for(i = 0; i < This->baseShader.limits.temporary; i++) { - if (This->baseShader.temps_used & (1 << i)) + if (reg_maps->temporary & (1 << i)) shader_addline(buffer, "TEMP R%lu;\n", i); } for (i = 0; i < This->baseShader.limits.address; i++) { - if (This->baseShader.textures_used & (1 << i)) + if (reg_maps->address & (1 << i)) shader_addline(buffer, "ADDRESS A%ld;\n", i); } for(i = 0; i < This->baseShader.limits.texture; i++) { - if (This->baseShader.textures_used & (1 << i)) + if (reg_maps->texcoord & (1 << i)) shader_addline(buffer,"TEMP T%lu;\n", i); } /* Texture coordinate registers must be pre-loaded */ for (i = 0; i < This->baseShader.limits.texture; i++) { - if (This->baseShader.textures_used & (1 << i)) - shader_addline(buffer, "MOV T%lu, fragment.texcoord[%lu];\n", i, i); + if (reg_maps->texcoord & (1 << i)) + shader_addline(buffer, "MOV T%lu, fragment.texcoord[%lu];\n", i, i); } /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ @@ -532,7 +543,10 @@ void generate_arb_declarations(IWineD3DB /** Generate the variable & register declarations for the GLSL output target */ -void generate_glsl_declarations(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer) { +void generate_glsl_declarations( + IWineD3DBaseShader *iface, + shader_reg_maps* reg_maps, + SHADER_BUFFER* buffer) { FIXME("GLSL not fully implemented yet.\n"); @@ -554,14 +568,13 @@ void generate_base_shader( SHADER_HANDLER hw_fct = NULL; DWORD opcode_token; DWORD i; + shader_reg_maps reg_maps; /* Initialize current parsing state */ This->baseShader.parse_state.current_row = 0; /* First pass: figure out which temporary and texture registers are used */ - shader_get_registers_used(iface, pToken); - TRACE("Texture/Address registers used: %#lx, Temp registers used %#lx\n", - This->baseShader.textures_used, This->baseShader.temps_used); + shader_get_registers_used(iface, &reg_maps, pToken); /* TODO: check register usage against GL/Directx limits, and fail if they're exceeded nUseAddressRegister < = GL_MAX_PROGRAM_ADDRESS_REGISTERS_AR @@ -570,10 +583,10 @@ void generate_base_shader( /* Pre-declare registers */ if (USING_GLSL) { - generate_glsl_declarations(iface, buffer); + generate_glsl_declarations(iface, &reg_maps, buffer); shader_addline(buffer, "void main() {\n"); } else { - generate_arb_declarations(iface, buffer); + generate_arb_declarations(iface, &reg_maps, buffer); } /* Second pass, process opcodes */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0addae6..50ab115 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1341,8 +1341,6 @@ typedef struct IWineD3DBaseShaderClass { DWORD version; DWORD hex_version; - DWORD temps_used; - DWORD textures_used; SHADER_LIMITS limits; SHADER_PARSE_STATE parse_state; CONST SHADER_OPCODE *shader_ins; @@ -1360,10 +1358,6 @@ typedef struct IWineD3DBaseShaderImpl { IWineD3DBaseShaderClass baseShader; } IWineD3DBaseShaderImpl; -extern void shader_get_registers_used( - IWineD3DBaseShader *iface, - CONST DWORD* pToken); - extern void shader_program_dump_decl_usage( DWORD dcl, DWORD param);

1 0

Ivan Gyurdiev : wined3d: Allow use of pixel shaders with drawStridedSlow.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: d59eeb3ee58decd07c3f0186c0f9d56b7841b47f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d59eeb3ee58decd07c3f018… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun May 21 17:15:09 2006 -0400 wined3d: Allow use of pixel shaders with drawStridedSlow. --- dlls/wined3d/drawprim.c | 208 ++++++++++++++++++++++++----------------------- 1 files changed, 107 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d59eeb3ee58decd07c3…

1 0

Ivan Gyurdiev : wined3d: Only run parse_decl_usage on vshader INPUT registers.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 438d88e1e83ce0ead842a29aee2fc4ffdde39461 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=438d88e1e83ce0ead842a29… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun May 21 17:12:53 2006 -0400 wined3d: Only run parse_decl_usage on vshader INPUT registers. --- dlls/wined3d/vertexshader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 29a92d1..ff6d6ed 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -709,7 +709,7 @@ inline static void vshader_program_add_p } } -static void parse_decl_usage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) +static void vshader_parse_input_decl_usage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) { switch(usage & 0xFFFF) { case D3DDECLUSAGE_POSITION: @@ -1541,8 +1541,10 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ DWORD usage = *pToken; DWORD param = *(pToken + 1); + DWORD regtype = shader_get_regtype(param); - parse_decl_usage(This, usage, param & D3DSP_REGNUM_MASK); + if (regtype == D3DSPR_INPUT) + vshader_parse_input_decl_usage(This, usage, param & D3DSP_REGNUM_MASK); shader_program_dump_decl_usage(usage, param); shader_dump_ins_modifiers(param); TRACE(" ");

1 0

Saulius Krasuckas : advapi32: Skip token attribute testing if OpenProcessToken() is not implemented.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 7b156bf1702cc2bf4a704334640a2cdb5b446c0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b156bf1702cc2bf4a70433… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon May 22 00:06:47 2006 +0300 advapi32: Skip token attribute testing if OpenProcessToken() is not implemented. --- dlls/advapi32/tests/security.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8dd6df3..46f00f6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -703,11 +703,18 @@ static void test_token_attr(void) TOKEN_GROUPS *Groups; TOKEN_USER *User; BOOL ret; - DWORD i; - LPTSTR SidString; + DWORD i, GLE; + LPSTR SidString; ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); - ok(ret, "OpenProcessToken failed with error %ld\n", GetLastError()); + GLE = GetLastError(); + ok(ret || (GLE == ERROR_CALL_NOT_IMPLEMENTED), + "OpenProcessToken failed with error %ld\n", GLE); + if(!ret && (GLE == ERROR_CALL_NOT_IMPLEMENTED)) + { + trace("OpenProcessToken() not implemented, skipping test_token_attr()\n"); + return; + } /* groups */ ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size);

1 0

Saulius Krasuckas : advapi32: Make test loadable on win9x.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 18af85476440fa58d07af8971d658d25e60d1c7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18af85476440fa58d07af89… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sun May 21 23:25:44 2006 +0300 advapi32: Make test loadable on win9x. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df2ba61..8dd6df3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -722,7 +722,7 @@ static void test_token_attr(void) DWORD DomainLength = 255; TCHAR Domain[255]; SID_NAME_USE SidNameUse; - ConvertSidToStringSid(Groups->Groups[i].Sid, &SidString); + pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); @@ -740,7 +740,7 @@ static void test_token_attr(void) ok(ret, "GetTokenInformation(TokenUser) failed with error %ld\n", GetLastError()); - ConvertSidToStringSid(User->User.Sid, &SidString); + pConvertSidToStringSidA(User->User.Sid, &SidString); trace("TokenUser: %s attr: 0x%08lx\n", SidString, User->User.Attributes); LocalFree(SidString);

1 0

Detlef Riekenberg : winspool/test: Disable a test that crashes on win9x.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: b60f2b0f5b8d2889ef96e81a523515829b33ac2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b60f2b0f5b8d2889ef96e81… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 22 00:39:33 2006 +0200 winspool/test: Disable a test that crashes on win9x. --- dlls/winspool/tests/info.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 4483e65..b0d02a7 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -207,6 +207,8 @@ static void test_AddMonitor(void) "returned %ld with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); +#if 0 + /* This test crash with win9x on vmware (works with win9x on qemu 0.8.1) */ SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, NULL); /* NT: unchanged, 9x: ERROR_PRIVILEGE_NOT_HELD */ @@ -215,6 +217,7 @@ static void test_AddMonitor(void) (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), "returned %ld with %ld (expected '0' with: MAGIC_DEAD or " \ "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); +#endif ZeroMemory(&mi2a, sizeof(MONITOR_INFO_2A)); SetLastError(MAGIC_DEAD);

1 0

Detlef Riekenberg : winspool: Remove cross calls W->A for the "Printers" registry path.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 358ce06741416e1189a357bf57bc9a2fd20f5198 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=358ce06741416e1189a357b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun May 21 14:35:29 2006 +0200 winspool: Remove cross calls W->A for the "Printers" registry path. --- dlls/winspool/info.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 6f86109..3c41a99 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -120,9 +120,6 @@ static INT (WINAPI *GDI_CallExtDeviceMod LPDEVMODEA lpdmInput, LPSTR lpszProfile, DWORD fwMode ); -static const char Printers[] = -"System\\CurrentControlSet\\control\\Print\\Printers\\"; - static const WCHAR DriversW[] = { 'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'c','o','n','t','r','o','l','\\', @@ -350,7 +347,7 @@ #define DYNCUPS(x) \ DYNCUPS(cupsPrintFile); #undef DYNCUPS - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); return FALSE; @@ -479,7 +476,7 @@ PRINTCAP_ParseEntry(char *pent,BOOL isfi } HeapFree(GetProcessHeap(),0,devline); - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); ret = FALSE; @@ -609,7 +606,7 @@ void WINSPOOL_LoadSystemPrinters(void) /* This ensures that all printer entries have a valid Name value. If causes problems later if they don't. If one is found to be missed we create one and set it equal to the name of the key */ - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) == ERROR_SUCCESS) { + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { @@ -921,7 +918,7 @@ static DWORD WINSPOOL_GetOpenedPrinterRe if(!name) return ERROR_INVALID_HANDLE; - if((ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters)) != + if((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters)) != ERROR_SUCCESS) return ret; @@ -1931,7 +1928,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); return 0; @@ -2204,7 +2201,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinte SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(RegOpenKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) == ERROR_SUCCESS) { + if(RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { WINSPOOL_SHDeleteKeyW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters); } @@ -3035,7 +3032,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE h return FALSE; } - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); return FALSE; @@ -3186,7 +3183,7 @@ static BOOL WINSPOOL_EnumPrinters(DWORD return FALSE; } - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); return FALSE; @@ -3568,7 +3565,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HA SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(RegCreateKeyA(HKEY_LOCAL_MACHINE, Printers, &hkeyPrinters) != + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); return FALSE;

1 0

Detlef Riekenberg : winspool: An empty string as server name is valid ( EnumPrinterDrivers).
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: 5de733e4fb206b9289256969a0b8e2311021cfb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5de733e4fb206b928925696… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 20 18:39:20 2006 +0200 winspool: An empty string as server name is valid (EnumPrinterDrivers). --- dlls/winspool/info.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 1f91202..6f86109 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -6,6 +6,7 @@ * Copyright 1999 Klaas van Gend * Copyright 1999, 2000 Huw D M Davies * Copyright 2001 Marcus Meissner + * Copyright 2005, 2006 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4042,9 +4043,9 @@ static BOOL WINSPOOL_EnumPrinterDrivers( Level, pDriverInfo, cbBuf, unicode); /* check for local drivers */ - if(pName) { - ERR("remote drivers unsupported! Current remote host is %s\n", - debugstr_w(pName)); + if((pName) && (pName[0])) { + FIXME("remote drivers (%s) not supported!\n", debugstr_w(pName)); + SetLastError(ERROR_ACCESS_DENIED); return FALSE; }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction026+027.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: eb1b39760e6074db16e587b385af123273f7c8b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb1b39760e6074db16e587b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 19:11:53 2006 +0900 advapi32: Implement and test SystemFunction026+027. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/tests/crypt_lmhash.c | 71 ++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index af21985..f783c6d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -620,8 +620,8 @@ # @ stub StopTraceW @ stdcall SystemFunction023(ptr ptr ptr) SystemFunction013 @ stdcall SystemFunction024(ptr ptr ptr) @ stdcall SystemFunction025(ptr ptr ptr) -@ stub SystemFunction026 -@ stub SystemFunction027 +@ stdcall SystemFunction026(ptr ptr ptr) SystemFunction024 +@ stdcall SystemFunction027(ptr ptr ptr) SystemFunction025 @ stub SystemFunction028 @ stub SystemFunction029 @ stub SystemFunction030 diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index a6741f6..6582fe1 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -70,8 +70,14 @@ descrypt pSystemFunction019; descrypt pSystemFunction021; descrypt pSystemFunction023; +/* encrypt two blocks with a 32bit key */ descrypt pSystemFunction024; descrypt pSystemFunction025; + +/* decrypt two blocks with a 32bit key */ +descrypt pSystemFunction026; +descrypt pSystemFunction027; + fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -425,55 +431,47 @@ static void test_SystemFunction_decrypt( ok( !memcmp(des_plaintext, output, sizeof des_plaintext), "plaintext wrong (%d)\n", num); } -static void test_SystemFunction024(void) +static unsigned char des_ciphertext32[] = { + 0x69, 0x51, 0x35, 0x69, 0x0d, 0x29, 0x24, 0xad, + 0x23, 0x6d, 0xfd, 0x43, 0x0d, 0xd3, 0x25, 0x81, 0 +}; + +static void test_SystemFunction_enc32(descrypt func, int num) { - unsigned char key[0x10], output[0x20]; + unsigned char key[4], output[0x11]; int r; + if (!func) + return; + memset(output, 0, sizeof output); - memset(key, 0, sizeof key); /* two keys are generated using 4 bytes, repeated 4 times ... */ memcpy(key, "foo", 4); - r = pSystemFunction024(des_plaintext, key, output); - ok( r == STATUS_SUCCESS, "wrong error code\n"); - - memcpy(key, "foo", 4); - memcpy(key+4, "foo", 4); - memcpy(key+8, "foo", 4); - memcpy(key+12, "foo", 4); - - r = pSystemFunction022(des_plaintext, key, output+0x10); - ok( r == STATUS_SUCCESS, "wrong error code\n"); + r = func(des_plaintext, key, output); + ok( r == STATUS_SUCCESS, "wrong error code (%d)\n", num); - ok( !memcmp( output, output+0x10, 0x10), "ciphertext wrong\n"); + ok( !memcmp( output, des_ciphertext32, sizeof des_ciphertext32), "ciphertext wrong (%d)\n", num); } -static void test_SystemFunction025(void) +static void test_SystemFunction_dec32(descrypt func, int num) { - unsigned char key[0x10], output[0x20]; + unsigned char key[4], output[0x11]; int r; + if (!func) + return; + memset(output, 0, sizeof output); - memset(key, 0, sizeof key); /* two keys are generated using 4 bytes, repeated 4 times ... */ memcpy(key, "foo", 4); - /* decrypts output of function 025 */ - r = pSystemFunction025(des_ciphertext, key, output); - ok( r == STATUS_SUCCESS, "wrong error code\n"); + r = func(des_ciphertext32, key, output); + ok( r == STATUS_SUCCESS, "wrong error code (%d)\n", num); - memcpy(key, "foo", 4); - memcpy(key+4, "foo", 4); - memcpy(key+8, "foo", 4); - memcpy(key+12, "foo", 4); - - r = pSystemFunction023(des_ciphertext, key, output+0x10); - ok( r == STATUS_SUCCESS, "wrong error code\n"); - - ok( !memcmp( output, output+0x10, 0x10), "plaintext wrong\n"); + ok( !memcmp( output, des_plaintext, sizeof des_plaintext), "plaintext wrong (%d)\n", num); } START_TEST(crypt_lmhash) @@ -548,12 +546,15 @@ START_TEST(crypt_lmhash) test_SystemFunction_decrypt(pSystemFunction023, 23); pSystemFunction024 = (descrypt) GetProcAddress( module, "SystemFunction024"); - if (pSystemFunction024) - test_SystemFunction024(); - pSystemFunction025 = (descrypt) GetProcAddress( module, "SystemFunction025"); - if (pSystemFunction025) - test_SystemFunction025(); + pSystemFunction026 = (descrypt) GetProcAddress( module, "SystemFunction026"); + pSystemFunction027 = (descrypt) GetProcAddress( module, "SystemFunction027"); + + /* these encrypt two DES blocks with a short key */ + test_SystemFunction_enc32(pSystemFunction024, 24); + test_SystemFunction_enc32(pSystemFunction026, 26); - FreeLibrary( module ); + /* these descrypt two DES blocks with a short key */ + test_SystemFunction_dec32(pSystemFunction025, 25); + test_SystemFunction_dec32(pSystemFunction027, 27); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction011.
by Alexandre Julliard 22 May '06

22 May '06

Module: wine Branch: refs/heads/master Commit: c3a1e8731e581daa4c5b72238835c353298582e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3a1e8731e581daa4c5b722… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 18:01:58 2006 +0900 advapi32: Implement and test SystemFunction011. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt_md4.c | 1 + dlls/advapi32/tests/crypt_md4.c | 20 +++++++++++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 2c136c9..af21985 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -605,7 +605,7 @@ # @ stub StopTraceW @ stdcall SystemFunction008(ptr ptr ptr) @ stdcall SystemFunction009(ptr ptr ptr) @ stdcall SystemFunction010(ptr ptr ptr) -@ stub SystemFunction011 +@ stdcall SystemFunction011(ptr ptr ptr) SystemFunction010 @ stdcall SystemFunction012(ptr ptr ptr) @ stdcall SystemFunction013(ptr ptr ptr) @ stdcall SystemFunction014(ptr ptr ptr) SystemFunction012 diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index f782ca0..5ca8953 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -299,6 +299,7 @@ NTSTATUS WINAPI SystemFunction007(PUNICO /****************************************************************************** * SystemFunction010 [ADVAPI32.@] + * SystemFunction011 [ADVAPI32.@] * * MD4 hashes 16 bytes of data * diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index 0c72d2b..e27f8b3 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -40,13 +40,14 @@ typedef VOID (WINAPI *fnMD4Init)( MD4_CT typedef VOID (WINAPI *fnMD4Update)( MD4_CTX *ctx, const unsigned char *src, const int len ); typedef VOID (WINAPI *fnMD4Final)( MD4_CTX *ctx ); typedef int (WINAPI *fnSystemFunction007)(PUNICODE_STRING,LPBYTE); -typedef int (WINAPI *fnSystemFunction010)(LPVOID, const LPBYTE, LPBYTE); +typedef int (WINAPI *md4hashfunc)(LPVOID, const LPBYTE, LPBYTE); fnMD4Init pMD4Init; fnMD4Update pMD4Update; fnMD4Final pMD4Final; fnSystemFunction007 pSystemFunction007; -fnSystemFunction010 pSystemFunction010; +md4hashfunc pSystemFunction010; +md4hashfunc pSystemFunction011; #define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD4_CTX, in ) ) @@ -126,7 +127,7 @@ #endif ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); } -static void test_SystemFunction010(void) +static void test_md4hashfunc(md4hashfunc func) { unsigned char expected[0x10] = { 0x48, 0x7c, 0x3f, 0x5e, 0x2b, 0x0d, 0x6a, 0x79, @@ -134,9 +135,12 @@ static void test_SystemFunction010(void) unsigned char in[0x10], output[0x10]; int r; + if (!func) + return; + memset(in, 0, sizeof in); memset(output, 0, sizeof output); - r = pSystemFunction010(0, in, output); + r = func(0, in, output); ok( r == STATUS_SUCCESS, "wrong error code\n"); ok( !memcmp(expected, output, sizeof output), "output wrong\n"); } @@ -158,9 +162,11 @@ START_TEST(crypt_md4) if (pSystemFunction007) test_SystemFunction007(); - pSystemFunction010 = (fnSystemFunction010)GetProcAddress( module, "SystemFunction010" ); - if (pSystemFunction010) - test_SystemFunction010(); + pSystemFunction010 = (md4hashfunc)GetProcAddress( module, "SystemFunction010" ); + pSystemFunction011 = (md4hashfunc)GetProcAddress( module, "SystemFunction011" ); + + test_md4hashfunc(pSystemFunction010); + test_md4hashfunc(pSystemFunction011); FreeLibrary( module ); }

1 0