September 2006 - Wine-Commits

Paul Vriens : crypt32: Partly implement CryptSIPRetrieveSubjectGuid.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 946f3ee10a7673e8bbf948561dcc9e4cf1334c26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=946f3ee10a7673e8bbf9485… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 27 08:00:15 2006 +0200 crypt32: Partly implement CryptSIPRetrieveSubjectGuid. --- dlls/crypt32/sip.c | 83 ++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/sip.c | 94 ++++++++++++++++++---------------------------- 2 files changed, 117 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=946f3ee10a7673e8bbf…

1 0

Saulius Krasuckas : lz32/tests: Fix some typos in error messages.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: d43595fe3292177f465abb65221822bf243ba9ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d43595fe3292177f465abb6… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Wed Sep 27 12:48:49 2006 +0300 lz32/tests: Fix some typos in error messages. --- dlls/lz32/tests/lzexpand_main.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index eead144..ff55a33 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -460,10 +460,10 @@ static void create_fileW(WCHAR *fnameW) DWORD retval; file = LZOpenFileW(fnameW, &ofs, OF_CREATE); - ok(file >= 0, "LZOpenFileA failed on creation\n"); + ok(file >= 0, "LZOpenFileW failed on creation\n"); LZClose(file); retval = GetFileAttributesW(fnameW); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA('%s'): error %ld\n", ofs.szPathName, GetLastError()); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesW('%s'): error %ld\n", ofs.szPathName, GetLastError()); } static void delete_fileW(WCHAR *fnameW) @@ -473,10 +473,10 @@ static void delete_fileW(WCHAR *fnameW) DWORD retval; file = LZOpenFileW(fnameW, &ofs, OF_DELETE); - ok(file >= 0, "LZOpenFileA failed on delete\n"); + ok(file >= 0, "LZOpenFileW failed on delete\n"); LZClose(file); retval = GetFileAttributesW(fnameW); - ok(retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file ('%s')\n", ofs.szPathName); + ok(retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesW succeeded on deleted file ('%s')\n", ofs.szPathName); } static void test_LZOpenFileW_existing_compressed(void) @@ -637,11 +637,11 @@ static void test_LZOpenFileW_nonexisting "LZOpenFileW succeeded on nonexistent file\n"); todo_wine ok(test.cBytes == 0xA5, - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, - "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + "LZOpenFileW returned '%s', but was expected to return '%s' or '%s'\n", test.szPathName, expected, filled_0xA5); }

1 0

Ivan Gyurdiev : wined3d: Read GL info and load constants into the same device.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 42a9262acf4600c4eb5e5dd6831b80dd9aa9395d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42a9262acf4600c4eb5e5dd… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Wed Sep 27 07:15:58 2006 -0400 wined3d: Read GL info and load constants into the same device. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 5 +++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e6231c..128f900 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -102,19 +102,19 @@ static void shader_arb_load_constantsF(I * worry about the Integers or Booleans */ void shader_arb_load_constants( - IWineD3DStateBlock* iface, + IWineD3DDevice* device, char usePixelShader, char useVertexShader) { - - IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; - WineD3D_GL_Info *gl_info = &((IWineD3DImpl*)stateBlock->wineD3DDevice->wineD3D)->gl_info; + + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl*)deviceImpl->wineD3D)->gl_info; if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; IWineD3DVertexShaderImpl* vshader_impl = (IWineD3DVertexShaderImpl*) stateBlock->vertexShader; IWineD3DVertexDeclarationImpl* vertexDeclaration = (IWineD3DVertexDeclarationImpl*) vshader_impl->vertexDeclaration; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) vshader->baseShader.device; if (NULL != vertexDeclaration && NULL != vertexDeclaration->constants) { /* Load DirectX 8 float constants for vertex shader */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c9b14a0..1160037 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1852,9 +1852,9 @@ #undef BUFFER_OR_DATA /* Load any global constants/uniforms that may have been set by the application */ if (wined3d_settings.vs_selected_mode == SHADER_GLSL || wined3d_settings.ps_selected_mode == SHADER_GLSL) - shader_glsl_load_constants((IWineD3DStateBlock*)This->stateBlock, usePixelShaderFunction, useVertexShaderFunction); + shader_glsl_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); else if (wined3d_settings.vs_selected_mode== SHADER_ARB || wined3d_settings.ps_selected_mode == SHADER_ARB) - shader_arb_load_constants((IWineD3DStateBlock*)This->stateBlock, usePixelShaderFunction, useVertexShaderFunction); + shader_arb_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); /* Draw vertex-by-vertex */ if (useDrawStridedSlow) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 63d8bfd..b92cecb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -269,12 +269,14 @@ void shader_glsl_load_constantsB( * Loads the app-supplied constants into the currently set GLSL program. */ void shader_glsl_load_constants( - IWineD3DStateBlock* iface, + IWineD3DDevice* device, char usePixelShader, char useVertexShader) { - - IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; - WineD3D_GL_Info *gl_info = &((IWineD3DImpl*)stateBlock->wineD3DDevice->wineD3D)->gl_info; + + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl*) deviceImpl->wineD3D)->gl_info; + GLhandleARB *constant_locations; struct list *constant_list; GLhandleARB programId; @@ -288,7 +290,6 @@ void shader_glsl_load_constants( if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; IWineD3DVertexShaderImpl* vshader_impl = (IWineD3DVertexShaderImpl*) vshader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) vshader->baseShader.device; GLint pos; IWineD3DVertexDeclarationImpl* vertexDeclaration = @@ -332,7 +333,7 @@ void shader_glsl_load_constants( constant_list = &stateBlock->set_pconstantsF; /* Load pixel shader samplers */ - shader_glsl_load_psamplers(gl_info, iface); + shader_glsl_load_psamplers(gl_info, (IWineD3DStateBlock*) stateBlock); /* Load DirectX 9 float constants/uniforms for pixel shader */ shader_glsl_load_constantsF(pshader, gl_info, GL_LIMITS(pshader_constantsF), diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588f099..d2ee681 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1412,6 +1412,7 @@ typedef struct SHADER_OPCODE { } SHADER_OPCODE; typedef struct SHADER_OPCODE_ARG { + IWineD3DStateBlock* stateBlock; IWineD3DBaseShader* shader; shader_reg_maps* reg_maps; CONST SHADER_OPCODE* opcode; @@ -1472,7 +1473,7 @@ extern HRESULT allocate_shader_constants /* ARB_[vertex/fragment]_program helper functions */ extern void shader_arb_load_constants( - IWineD3DStateBlock* iface, + IWineD3DDevice* device, char usePixelShader, char useVertexShader); @@ -1503,7 +1504,7 @@ extern void vshader_hw_mnxn(SHADER_OPCOD extern void set_glsl_shader_program(IWineD3DDevice *iface); extern void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG *arg); extern void shader_glsl_load_constants( - IWineD3DStateBlock* iface, + IWineD3DDevice* device, char usePixelShader, char useVertexShader);

1 0

Ivan Gyurdiev : wined3d: Move device pointer into the BaseShader class.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: d0032a1a2ae56fb5847218b64558a72f22c53321 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0032a1a2ae56fb5847218b… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Wed Sep 27 07:14:46 2006 -0400 wined3d: Move device pointer into the BaseShader class. --- dlls/wined3d/arb_program_shader.c | 7 +++++-- dlls/wined3d/device.c | 14 ++++++++++++-- dlls/wined3d/glsl_shader.c | 11 ++++++++--- dlls/wined3d/pixelshader.c | 10 ++++++---- dlls/wined3d/vertexshader.c | 13 ++++++++----- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 42 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d0032a1a2ae56fb5847…

1 0

Juan Lang : netapi32: Add stubs for DsGetDcNameW and DsGetSiteNameW.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: afbe00a85eb96dd2c433dad86b7e285ce3347e13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=afbe00a85eb96dd2c433dad… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 27 07:23:29 2006 -0700 netapi32: Add stubs for DsGetDcNameW and DsGetSiteNameW. --- dlls/netapi32/ds.c | 17 +++++++++++++++++ dlls/netapi32/netapi32.spec | 6 ++++-- include/dsgetdc.h | 4 ++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index fbcd665..1715257 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -29,9 +29,26 @@ #include "winternl.h" #include "ntsecapi.h" #include "wine/debug.h" #include "dsrole.h" +#include "dsgetdc.h" WINE_DEFAULT_DEBUG_CHANNEL(ds); +DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, + GUID* DomainGuid, LPCWSTR SiteName, ULONG Flags, + PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo) +{ + FIXME("(%s, %s, %s, %s, %08lx, %p): stub\n", debugstr_w(ComputerName), + debugstr_w(AvoidDCName), debugstr_guid(DomainGuid), + debugstr_w(SiteName), Flags, DomainControllerInfo); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName) +{ + FIXME("(%s, %p): stub\n", debugstr_w(ComputerName), SiteName); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /************************************************************ * DsRoleFreeMemory (NETAPI32.@) * diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 702abac..a4f46e2 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -3,12 +3,14 @@ @ stub DsDeregisterDnsHostRecords @ stub DsEnumerateDomainTrusts @ stub DsGetDcClose -@ stub DsGetDcName +@ stub DsGetDcNameA # (str str ptr str long ptr) +@ stdcall DsGetDcNameW(wstr wstr ptr wstr long ptr) @ stub DsGetDcNext @ stub DsGetDcOpen @ stub DsGetDcSiteCoverage @ stub DsGetForestTrustInformationW -@ stub DsGetSiteName +@ stub DsGetSiteNameA # (str str) +@ stdcall DsGetSiteNameW(wstr wstr) @ stub DsMergeForestTrustInformationW @ stdcall DsRoleFreeMemory(ptr) @ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr) diff --git a/include/dsgetdc.h b/include/dsgetdc.h index ea947bf..faae31a 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -92,6 +92,10 @@ DWORD WINAPI DsGetDcNameA(LPCSTR,LPCSTR, DWORD WINAPI DsGetDcNameW(LPCWSTR,LPCWSTR,GUID*,LPCWSTR,ULONG,PDOMAIN_CONTROLLER_INFOW*); #define DsGetDcName WINELIB_NAME_AW(DsGetDcName) +DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName); +DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName); +#define DsGetSiteName WINELIB_NAME_AW(DsGetSiteName) + #ifdef __cplusplus } #endif

1 0

Paul Vriens : wintrust: Added some CryptSIP stub implementations.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: a0ac040b8cef9f73eb0dbbfa4f98cc8617ed5869 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0ac040b8cef9f73eb0dbbf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 27 14:36:42 2006 +0200 wintrust: Added some CryptSIP stub implementations. --- dlls/wintrust/crypt.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 10 ++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 019d5e5..87fff4f 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wintrust.h" #include "mscat.h" +#include "mssip.h" #include "wine/debug.h" @@ -126,3 +127,60 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFi hProv, dwPublicVersion, dwEncodingType); return 0; } + +/*********************************************************************** + * CryptSIPCreateIndirectData (WINTRUST.@) + */ +BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcbIndirectData, + SIP_INDIRECT_DATA* pIndirectData) +{ + FIXME("(%p %p %p) stub\n", pSubjectInfo, pcbIndirectData, pIndirectData); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPGetSignedDataMsg (WINTRUST.@) + */ +BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, + DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + FIXME("(%p %p %ld %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPPutSignedDataMsg (WINTRUST.@) + */ +BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, + DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + FIXME("(%p %ld %p %ld %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + cbSignedDataMsg, pbSignedDataMsg); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPRemoveSignedDataMsg (WINTRUST.@) + */ +BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, + DWORD dwIndex) +{ + FIXME("(%p %ld) stub\n", pSubjectInfo, dwIndex); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPVerifyIndirectData (WINTRUST.@) + */ +BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, + SIP_INDIRECT_DATA* pIndirectData) +{ + FIXME("(%p %p) stub\n", pSubjectInfo, pIndirectData); + + return FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 97f26a2..49fb9c8 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -33,13 +33,13 @@ @ stub CryptCATPutMemberInfo @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember -@ stub CryptSIPCreateIndirectData +@ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) @ stub CryptSIPGetInfo @ stub CryptSIPGetRegWorkingFlags -@ stub CryptSIPGetSignedDataMsg -@ stub CryptSIPPutSignedDataMsg -@ stub CryptSIPRemoveSignedDataMsg -@ stub CryptSIPVerifyIndirectData +@ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) +@ stdcall CryptSIPPutSignedDataMsg(ptr long ptr long ptr) +@ stdcall CryptSIPRemoveSignedDataMsg(ptr long) +@ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DriverCleanupPolicy

1 0

Juan Lang : wintrust.h: Remove duplicate definitions. Spotted by Paul Vriens.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 180c814c67ef2bd82f85efe0c419593b1e12b606 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=180c814c67ef2bd82f85efe… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 27 07:21:00 2006 -0700 wintrust.h: Remove duplicate definitions. Spotted by Paul Vriens. --- include/wintrust.h | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 982ea0c..2c1b409 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -118,20 +118,6 @@ typedef struct _WINTRUST_DATA DWORD dwUIContext; } WINTRUST_DATA, *PWINTRUST_DATA; -#define WTD_UI_ALL 1 -#define WTD_UI_NONE 2 -#define WTD_UI_NOBAD 3 -#define WTD_UI_NOGOOD 4 - -#define WTD_REVOKE_NONE 0 -#define WTD_REVOKE_WHOLECHAIN 1 - -#define WTD_CHOICE_FILE 1 -#define WTD_CHOICE_CATALOG 2 -#define WTD_CHOICE_BLOB 3 -#define WTD_CHOICE_SIGNER 4 -#define WTD_CHOICE_CERT 5 - #define WTD_STATEACTION_IGNORE 0 #define WTD_STATEACTION_VERIFY 1 #define WTD_STATEACTION_CLOSE 2

1 0

Paul Vriens : crypt32: Another CryptSIPLoad test.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 1a4bd814cafb5d28e741186751c27732d57ab93a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a4bd814cafb5d28e741186… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 27 16:10:22 2006 +0200 crypt32: Another CryptSIPLoad test. --- dlls/crypt32/tests/sip.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 04d2990..e213df9 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -29,6 +29,12 @@ #include <mssip.h> #include "wine/test.h" +static BOOL (WINAPI * funcCryptSIPGetSignedDataMsg)(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *); +static BOOL (WINAPI * funcCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD *,DWORD,BYTE *); +static BOOL (WINAPI * funcCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *,SIP_INDIRECT_DATA *); +static BOOL (WINAPI * funcCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); +static BOOL (WINAPI * funcCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); + static char *show_guid(const GUID *guid) { static char guidstring[39]; @@ -277,6 +283,7 @@ static void test_SIPLoad(void) static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; SIP_DISPATCH_INFO sdi; + HMODULE hCrypt; /* All NULL */ SetLastError(0xdeadbeef); @@ -334,6 +341,34 @@ static void test_SIPLoad(void) ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + /* The function addresses returned by CryptSIPLoad are actually the addresses of + * crypt32's own functions. A function calling these addresses will end up first + * calling crypt32 functions which in it's turn call the equivalent in the SIP + * as dictated by the given GUID. + */ + hCrypt = LoadLibrary("crypt32.dll"); + if (hCrypt) + { + funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); + funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); + funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); + funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); + funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) + todo_wine + ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && + sdi.pfPut == funcCryptSIPPutSignedDataMsg && + sdi.pfCreate == funcCryptSIPCreateIndirectData && + sdi.pfVerify == funcCryptSIPVerifyIndirectData && + sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, + "Expected function addresses to be from crypt32\n"); + else + trace("Couldn't load function pointers\n"); + + FreeLibrary(hCrypt); + } + /* Reserved parameter not 0 */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO));

1 0

Paul Vriens : wintrust: Fix function prototype.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 0181fbb5306ad8ccac4fd074af6eeefed9b7e8c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0181fbb5306ad8ccac4fd07… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 27 14:36:18 2006 +0200 wintrust: Fix function prototype. --- include/mssip.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mssip.h b/include/mssip.h index 4aa2fa4..b0b21a6 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -115,7 +115,7 @@ typedef struct SIP_INDIRECT_DATA_ { #include <poppack.h> typedef BOOL (WINAPI * pCryptSIPGetSignedDataMsg)(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *); -typedef BOOL (WINAPI * pCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD,DWORD,BYTE); +typedef BOOL (WINAPI * pCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD *,DWORD,BYTE *); typedef BOOL (WINAPI * pCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *,SIP_INDIRECT_DATA *); typedef BOOL (WINAPI * pCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); typedef BOOL (WINAPI * pCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); @@ -162,7 +162,7 @@ #include <poppack.h> /**********************************************************************/ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *); -BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO *,DWORD,DWORD,DWORD,BYTE); +BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO *,DWORD,DWORD *,DWORD,BYTE *); BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO *,DWORD *,SIP_INDIRECT_DATA *); BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO *,DWORD);

1 0

Jonathan Ernst : clock: French translation improvements.
by Alexandre Julliard Sept. 27, 2006

Sept. 27, 2006

Module: wine Branch: master Commit: 29c8aec79ec3ce3e412ed09a0c85bba5fb117250 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29c8aec79ec3ce3e412ed09… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Sep 27 12:45:57 2006 +0200 clock: French translation improvements. --- programs/clock/Fr.rc | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index 7e4eae9..dc4c1df 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -3,6 +3,7 @@ * * Copyright 1998 Robert Pouliot <krynos(a)clic.net> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2006 Jonathan Ernst <jonathan(a)ernstfamily.ch> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -47,3 +48,30 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Horloge" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +{ +IDS_LICENSE_CAPTION, "LICENCE" +IDS_LICENSE, +"Cette biblioth�que est libre, vous pouvez la redistribuer et/ou \ +la modifier selon les termes de la Licence Publique G�n�rale GNU \ +Limit�e publi�e par la Free Software Foundation (version 2.1 ou \ +bien toute autre version ult�rieure choisie par vous).\n\ +Cette biblioth�que est distribu�e car potentiellement utile, \ +mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ +les garanties de commercialisation ou d'adaptation dans un but \ +sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ +Limit�e pour plus de d�tails.\n\ +Vous devez avoir re�u une copie de la Licence Publique G�n�rale \ +GNU Limit�e en m�me temps que cette biblioth�que�; si ce n'est pas \ +le cas, �crivez � la Free Software Foundation, Inc., 51 Franklin St, \ +Fifth Floor, Boston, MA 02111-1301, �tats-Unis." + +IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" +IDS_WARRANTY, +"Cette biblioth�que est distribu�e car potentiellement utile, \ +mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ +les garanties de commercialisation ou d'adaptation dans un but \ +sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ +Limit�e pour plus de d�tails." +}

1 0