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

Dan Hipschman : widl: Calculate method indices in parser instead of during header generation.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 16d4e712301e4e10159807ec261b321b4a2665d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=16d4e712301e4e10159807e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 15 14:23:18 2006 -0700 widl: Calculate method indices in parser instead of during header generation. --- tools/widl/header.c | 12 +++--------- tools/widl/parser.y | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6344fb3..0042c63 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -572,15 +572,13 @@ const var_t *is_callas(const attr_t *a) return get_attrp(a, ATTR_CALLAS); } -static int write_method_macro(const type_t *iface, const char *name) +static void write_method_macro(const type_t *iface, const char *name) { - int idx; func_t *cur = iface->funcs; - if (iface->ref) idx = write_method_macro(iface->ref, name); - else idx = 0; + if (iface->ref) write_method_macro(iface->ref, name); - if (!cur) return idx; + if (!cur) return; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); fprintf(header, "/*** %s methods ***/\n", iface->name); @@ -608,13 +606,9 @@ static int write_method_macro(const type for (c=0; c<argc; c++) fprintf(header, ",%c", c+'a'); fprintf(header, ")\n"); - if (cur->idx == -1) cur->idx = idx; - else if (cur->idx != idx) yyerror("BUG: method index mismatch in write_method_macro"); - idx++; } cur = PREV_LINK(cur); } - return idx; } void write_args(FILE *h, var_t *arg, const char *name, int method, int do_indent) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 73ccf25..745056f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -101,6 +101,8 @@ static void write_clsid(type_t *cls); static void write_diid(type_t *iface); static void write_iid(type_t *iface); +static int compute_method_indexes(type_t *iface); + #define tsENUM 1 #define tsSTRUCT 2 #define tsUNION 3 @@ -711,6 +713,7 @@ dispinterfacedef: dispinterfacehdr '{' } /* FIXME: not sure how to handle this yet | dispinterfacehdr '{' interface '}' { $$ = $1; + compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && do_idfile) write_iid($$); } @@ -737,6 +740,7 @@ interfacedef: interfacehdr inherit '{' int_statements '}' { $$ = $1; $$->ref = $2; $$->funcs = $4; + compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && do_idfile) write_iid($$); } @@ -747,6 +751,7 @@ interfacedef: interfacehdr inherit $$->ref = find_type2($3, 0); if (!$$->ref) yyerror("base class '%s' not found in import", $3); $$->funcs = $6; + compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && do_idfile) write_iid($$); } @@ -1539,3 +1544,26 @@ static void write_iid(type_t *iface) const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid(idfile, "IID", iface->name, uuid); } + +static int compute_method_indexes(type_t *iface) +{ + int idx; + func_t *f = iface->funcs; + + if (iface->ref) + idx = compute_method_indexes(iface->ref); + else + idx = 0; + + if (! f) + return idx; + + while (NEXT_LINK(f)) + f = NEXT_LINK(f); + + for ( ; f ; f = PREV_LINK(f)) + if (! is_callas(f->def->attrs)) + f->idx = idx++; + + return idx; +}

1 0

Dan Hipschman : widl: Fix NdrConformantArrayUnmarshall calls in generated code.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: b17d1c14d955fcce557010e5ee1cf777db919d32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b17d1c14d955fcce557010e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 15 18:31:14 2006 -0700 widl: Fix NdrConformantArrayUnmarshall calls in generated code. --- tools/widl/proxy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3d3e717..642afbe 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -449,8 +449,8 @@ static void unmarshall_copy_arg( var_t * expr = get_attrp( arg->attrs, ATTR_SIZEIS ); if (expr) { - print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); + print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char**)&%s, ", arg->name ); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index ); return; } @@ -481,8 +481,8 @@ static void unmarshall_copy_arg( var_t * case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: case RPC_FC_CARRAY: - print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); + print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char**)&%s, ", arg->name ); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index ); break; case RPC_FC_BOGUS_STRUCT:

1 0

Robert Reif : secur32: Add GetComputerObjectName tests.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: e86828a072fe70adfd88b8270c696ae1b3cef345 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e86828a072fe70adfd88b82… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 15 19:01:55 2006 -0400 secur32: Add GetComputerObjectName tests. --- dlls/secur32/tests/Makefile.in | 3 +- dlls/secur32/tests/secur32.c | 68 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletions(-) create mode 100644 dlls/secur32/tests/secur32.c diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in index dfe17a0..8218fa9 100644 --- a/dlls/secur32/tests/Makefile.in +++ b/dlls/secur32/tests/Makefile.in @@ -8,7 +8,8 @@ IMPORTS = crypt32 secur32 advapi32 ker CTESTS = \ main.c \ ntlm.c \ - schannel.c + schannel.c \ + secur32.c @MAKE_TEST_RULES@ diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c new file mode 100644 index 0000000..5c681cd --- /dev/null +++ b/dlls/secur32/tests/secur32.c @@ -0,0 +1,68 @@ +/* + * tests + * + * Copyright 2006 Robert Reif + * + * 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 + */ +#include <stdio.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#define SECURITY_WIN32 +#include <security.h> +#include <schannel.h> + +#include "wine/test.h" + +static void testGetComputerObjectName() +{ + char name[256]; + WCHAR nameW[256]; + ULONG size; + BOOLEAN rc; + int i; + EXTENDED_NAME_FORMAT formats[] = { NameUnknown, NameFullyQualifiedDN, + NameSamCompatible, NameDisplay, NameUniqueId, NameCanonical, + NameUserPrincipal, NameCanonicalEx, NameServicePrincipal, + NameDnsDomain }; + + for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = sizeof(name); + ZeroMemory(name, sizeof(name)); + rc = GetComputerObjectNameA(formats[i], name, &size); + ok(rc || ((formats[i] == NameUnknown) && + (GetLastError() == ERROR_INVALID_PARAMETER)) || + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), + "GetComputerObjectNameA(%d) failed: %ld\n", + formats[i], GetLastError()); + if (rc) + trace("GetComputerObjectNameA() returned %s\n", name); + + size = sizeof(nameW)/sizeof(nameW[0]); + ZeroMemory(nameW, sizeof(nameW)); + rc = GetComputerObjectNameW(formats[i], nameW, &size); + ok(rc || ((formats[i] == NameUnknown) && + (GetLastError() == ERROR_INVALID_PARAMETER)) || + (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), + "GetComputerObjectNameW(%d) failed: %ld\n", + formats[i], GetLastError()); + } +} + +START_TEST(secur32) +{ + testGetComputerObjectName(); +}

1 0

Robert Reif : secur32: Partial GetComputerObjectName implementation.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 1771a550b8ad0f9c7cdb6483b61aa9c2fe918bfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1771a550b8ad0f9c7cdb648… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 15 18:54:23 2006 -0400 secur32: Partial GetComputerObjectName implementation. --- dlls/secur32/secur32.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 153 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 6ad2138..a6c12b2 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -18,6 +18,9 @@ */ #include <assert.h> #include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -859,12 +862,52 @@ SECURITY_STATUS WINAPI EnumerateSecurity /*********************************************************************** * GetComputerObjectNameA (SECUR32.@) + * + * Get the local computer's name using the format specified. + * + * PARAMS + * NameFormat [I] The format for the name. + * lpNameBuffer [O] Pointer to buffer to receive the name. + * nSize [I/O] Size in characters of buffer. + * + * RETURNS + * TRUE If the name was written to lpNameBuffer. + * FALSE If the name couldn't be written. + * + * NOTES + * If lpNameBuffer is NULL, then the size of the buffer needed to hold the + * name will be returned in *nSize. + * + * nSize returns the number of characters written when lpNameBuffer is not + * NULL or the size of the buffer needed to hold the name when the buffer + * is too short or lpNameBuffer is NULL. + * + * It the buffer is too short, ERROR_INSUFFICIENT_BUFFER error will be set. */ BOOLEAN WINAPI GetComputerObjectNameA( EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) { - FIXME("%d %p %p\n", NameFormat, lpNameBuffer, nSize); - return FALSE; + BOOLEAN rc; + LPWSTR bufferW = NULL; + ULONG sizeW = *nSize; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + if (lpNameBuffer) { + bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); + if (bufferW == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + rc = GetComputerObjectNameW(NameFormat, bufferW, &sizeW); + if (rc && bufferW) { + ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); + *nSize = len; + } + else + *nSize = sizeW; + HeapFree(GetProcessHeap(), 0, bufferW); + return rc; } /*********************************************************************** @@ -873,8 +916,114 @@ BOOLEAN WINAPI GetComputerObjectNameA( BOOLEAN WINAPI GetComputerObjectNameW( EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { - FIXME("%d %p %p\n", NameFormat, lpNameBuffer, nSize); - return FALSE; + LSA_HANDLE policyHandle; + LSA_OBJECT_ATTRIBUTES objectAttributes; + PPOLICY_DNS_DOMAIN_INFO domainInfo; + NTSTATUS ntStatus; + BOOLEAN status; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + + if (NameFormat == NameUnknown) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + ZeroMemory(&objectAttributes, sizeof(objectAttributes)); + objectAttributes.Length = sizeof(objectAttributes); + + ntStatus = LsaOpenPolicy(NULL, &objectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &policyHandle); + if (ntStatus != STATUS_SUCCESS) + { + SetLastError(LsaNtStatusToWinError(ntStatus)); + WARN("LsaOpenPolicy failed with NT status %lx\n", GetLastError()); + return FALSE; + } + + ntStatus = LsaQueryInformationPolicy(policyHandle, + PolicyDnsDomainInformation, + (PVOID *)&domainInfo); + if (ntStatus != STATUS_SUCCESS) + { + SetLastError(LsaNtStatusToWinError(ntStatus)); + WARN("LsaQueryInformationPolicy failed with NT status %lx\n", + GetLastError()); + LsaClose(policyHandle); + return FALSE; + } + + if (domainInfo->Sid) + { + switch (NameFormat) + { + case NameSamCompatible: + { + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD size = sizeof(name); + if (GetComputerNameW(name, &size)) + { + int len = domainInfo->Name.Length + size + 3; + if (lpNameBuffer) + { + if (*nSize < len) + { + *nSize = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; + } + else + { + WCHAR bs[] = { '\\', 0 }; + WCHAR ds[] = { '$', 0 }; + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, ds); + status = TRUE; + } + } + else /* just requesting length required */ + { + *nSize = len; + status = TRUE; + } + } + else + { + SetLastError(ERROR_INTERNAL_ERROR); + status = FALSE; + } + } + break; + case NameFullyQualifiedDN: + case NameDisplay: + case NameUniqueId: + case NameCanonical: + case NameUserPrincipal: + case NameCanonicalEx: + case NameServicePrincipal: + case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); + SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + status = FALSE; + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + status = FALSE; + } + } + else + { + SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + status = FALSE; + } + + LsaFreeMemory(domainInfo); + LsaClose(policyHandle); + + return status; } BOOLEAN WINAPI GetUserNameExA(

1 0

Robert Reif : advapi32: Fix LsaQueryInformationPolicy test to pass on NT4.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 6abfc027d5c53ac999a0e09e050ea745ae7683b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6abfc027d5c53ac999a0e09… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 15 19:05:18 2006 -0400 advapi32: Fix LsaQueryInformationPolicy test to pass on NT4. --- dlls/advapi32/tests/lsa.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 31fd802..abc7f59 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -100,8 +100,10 @@ static void test_lsa(void) pLsaFreeMemory((LPVOID)account_domain_info); } + /* This isn't supported in NT4 */ status = pLsaQueryInformationPolicy(handle, PolicyDnsDomainInformation, (PVOID*)&dns_domain_info); - ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyDnsDomainInformation) failed, returned 0x%08lx\n", status); + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, + "LsaQueryInformationPolicy(PolicyDnsDomainInformation) failed, returned 0x%08lx\n", status); if (status == STATUS_SUCCESS) { ok(IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL), "DomainGUID should be GUID_NULL on local computer\n"); ok(dns_domain_info->Sid==0,"Sid should be NULL on the local computer\n");

1 0

Robert Reif : kernel32: Add GetNativeSystemInfo.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: abdb2dbc66ea6ea75ec44a8a9e48a122f62241b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abdb2dbc66ea6ea75ec44a8… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 15 18:49:06 2006 -0400 kernel32: Add GetNativeSystemInfo. --- dlls/kernel/cpu.c | 10 ++++++++++ dlls/kernel/kernel32.spec | 2 +- include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index b077ad6..eaeac6e 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -779,6 +779,16 @@ #endif /*********************************************************************** + * GetNativeSystemInfo [KERNEL32.@] + */ +VOID WINAPI GetNativeSystemInfo( + LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) +{ + FIXME("(%p) using GetSystemInfo()\n", si); + GetSystemInfo(si); +} + +/*********************************************************************** * IsProcessorFeaturePresent [KERNEL32.@] * * Determine if the cpu supports a given feature. diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index f3e4dcb..09cfc8b 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -546,7 +546,7 @@ # @ stub GetFirmwareEnvironmentVariableW @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) -# @ stub GetNativeSystemInfo +@ stdcall GetNativeSystemInfo(ptr) @ stub GetNextVDMCommand @ stub GetNlsSectionName # @ stub GetNumaAvailableMemory diff --git a/include/winbase.h b/include/winbase.h index f2165d4..086d194 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1581,6 +1581,7 @@ BOOL WINAPI GetNamedPipeHandleSta BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); +VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL);

1 0

James Hawkins : msi: Add a stub for MsiGetFeatureCost.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 485484deace78519bf7309030400fab0f4d3d2ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=485484deace78519bf73090… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 15 14:56:19 2006 -0700 msi: Add a stub for MsiGetFeatureCost. --- dlls/msi/install.c | 24 ++++++++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msiquery.h | 8 ++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 249102f..f80f68a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -634,6 +634,30 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDL } /*********************************************************************** +* MsiGetFeatureCostA (MSI.@) +*/ +UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, + MSICOSTTREE iCostTree, INSTALLSTATE iState, INT *piCost) +{ + FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), + iCostTree, iState, piCost); + if (piCost) *piCost = 0; + return ERROR_SUCCESS; +} + +/*********************************************************************** +* MsiGetFeatureCostW (MSI.@) +*/ +UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, + MSICOSTTREE iCostTree, INSTALLSTATE iState, INT *piCost) +{ + FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), + iCostTree, iState, piCost); + if (piCost) *piCost = 0; + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiSetComponentStateA (MSI.@) */ UINT WINAPI MsiSetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent, diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index d718fd2..295ba7b 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -46,8 +46,8 @@ 50 stdcall MsiGetComponentStateA(long str ptr ptr) 51 stdcall MsiGetComponentStateW(long wstr ptr ptr) 52 stdcall MsiGetDatabaseState(long) -53 stub MsiGetFeatureCostA -54 stub MsiGetFeatureCostW +53 stdcall MsiGetFeatureCostA(long str long long ptr) +54 stdcall MsiGetFeatureCostW(long wstr long long ptr) 55 stub MsiGetFeatureInfoA 56 stub MsiGetFeatureInfoW 57 stdcall MsiGetFeatureStateA(long str ptr ptr) diff --git a/include/msiquery.h b/include/msiquery.h index ed99b85..57f7577 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -37,6 +37,14 @@ typedef enum tagMSICOLINFO MSICOLINFO_TYPES = 1 } MSICOLINFO; +typedef enum tagMSICOSTTREE +{ + MSICOSTTREE_SELFONLY = 0, + MSICOSTTREE_CHILDREN = 1, + MSICOSTTREE_PARENTS = 2, + MSICOSTTREE_PRODUCT = 3, +} MSICOSTTREE; + typedef enum tagMSIMODIFY { MSIMODIFY_REFRESH = 0,

1 0

James Hawkins : msi: Use the bare minimum number of parameters for LookupAccountName.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: d4a27358a57ff2f398c63de6c2dc688ed8f06d7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4a27358a57ff2f398c63de… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 15 14:48:11 2006 -0700 msi: Use the bare minimum number of parameters for LookupAccountName. --- dlls/msi/source.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index ca66c1f..7499429 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -407,14 +407,15 @@ UINT WINAPI MsiSourceListAddSourceW( LPC INT ret; LPWSTR sidstr = NULL; DWORD sidsize = 0; + DWORD domsize = 0; TRACE("%s %s %s\n", debugstr_w(szProduct), debugstr_w(szUserName), debugstr_w(szSource)); - if (LookupAccountNameW(NULL, szUserName, NULL, &sidsize, NULL, NULL, NULL)) + if (LookupAccountNameW(NULL, szUserName, NULL, &sidsize, NULL, &domsize, NULL)) { PSID psid = msi_alloc(sidsize); - if (LookupAccountNameW(NULL, szUserName, psid, &sidsize, NULL, NULL, NULL)) + if (LookupAccountNameW(NULL, szUserName, psid, &sidsize, NULL, &domsize, NULL)) ConvertSidToStringSidW(psid, &sidstr); msi_free(psid);

1 0

Andrew Talbot : wineps.drv: Write-strings warnings fix and declare function static.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 398098ab32f836d16f113d7fea314c1eab5650f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=398098ab32f836d16f113d7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 15 21:20:15 2006 +0100 wineps.drv: Write-strings warnings fix and declare function static. --- dlls/wineps.drv/ps.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index b27e900..7d6fb7a 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -231,8 +231,7 @@ DWORD PSDRV_WriteSpool(PSDRV_PDEVICE *ph } -INT PSDRV_WriteFeature(HANDLE16 hJob, char *feature, char *value, - char *invocation) +static INT PSDRV_WriteFeature(HANDLE16 hJob, LPCSTR feature, LPCSTR value, LPSTR invocation) { char *buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psbeginfeature) +

1 0

Andrew Talbot : crypt32/tests: Write-strings warning fix.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 318d92b46c5ef5540d00c8df1393e5d3815e96b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=318d92b46c5ef5540d00c8d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 15 19:49:15 2006 +0100 crypt32/tests: Write-strings warning fix. --- dlls/crypt32/tests/oid.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 4be68d8..c5d2689 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -431,13 +431,14 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { static const WCHAR sha1[] = { 's','h','a','1',0 }; + static CHAR oid_rsa_md5[] = szOID_RSA_MD5; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; PCCRYPT_OID_INFO info; info = CryptFindOIDInfo(0, NULL, 0); ok(info == NULL, "Expected NULL\n"); - info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, szOID_RSA_MD5, 0); + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, 0); ok(info != NULL, "Expected to find szOID_RSA_MD5\n"); if (info) {

1 0