October 2007 - Wine-commits

Jacek Caban : msimtf: Added class factory implementation.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: dc57873fe0c06ac18ab5d938d82162f2f0aeed92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc57873fe0c06ac18ab5d938d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 20:50:49 2007 +0200 msimtf: Added class factory implementation. --- dlls/msimtf/main.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 238c781..89034e7 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -36,6 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); static HINSTANCE msimtf_instance; +static HRESULT CActiveIMM_Create(IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + /****************************************************************** * DllMain (msimtf.@) */ @@ -55,11 +63,81 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } +typedef struct { + const IClassFactoryVtbl *lpClassFactoryVtbl; + + HRESULT (*cf)(IUnknown*,REFIID,void**); +} ClassFactory; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("IID_IClassFactory %p)\n", ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pOuter, REFIID riid, void **ppv) +{ + ClassFactory *This = (ClassFactory*)iface; + return This->cf(pOuter, riid, ppv); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%d)\n", dolock); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + /****************************************************************** * DllGetClassObject (msimtf.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_CActiveIMM, rclsid)) { + static ClassFactory cf = { + &ClassFactoryVtbl, + CActiveIMM_Create + }; + + TRACE("CLSID_CActiveIMM\n"); + + return IClassFactory_QueryInterface((IClassFactory*)&cf, riid, ppv); + } + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Alexandre Julliard : comctl32: Fix a discard const warning.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 16080ccd487529932d2eac31b2297ef23fd9e51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16080ccd487529932d2eac31b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:15:13 2007 +0200 comctl32: Fix a discard const warning. --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab60d23..41f19b0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5040,11 +5040,12 @@ static INT LISTVIEW_FindItemA(const LISTVIEW_INFO *infoPtr, INT nStart, BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL); LVFINDINFOW fiw; INT res; + LPWSTR strW; memcpy(&fiw, lpFindInfo, sizeof(fiw)); - if (hasText) fiw.psz = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); + if (hasText) fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw); - if (hasText) textfreeT((LPWSTR)fiw.psz, FALSE); + if (hasText) textfreeT(strW, FALSE); return res; }

1 0

Alexandre Julliard : kernel32/tests: Replace a couple of macros by a function to avoid compiler warnings.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 00193610f0e96f7e1fa28f045bf24c4ff1bda53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00193610f0e96f7e1fa28f045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:15:40 2007 +0200 kernel32/tests: Replace a couple of macros by a function to avoid compiler warnings. --- dlls/kernel32/tests/process.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a5f240a..43d6ac0 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -424,17 +424,16 @@ static int strCmp(const char* s1, const char* s2, BOOL sensitive) return (sensitive) ? strcmp(s1, s2) : wtstrcasecmp(s1, s2); } -#define okChildString(sect, key, expect) \ - do { \ - char* result = getChildString((sect), (key)); \ - ok(strCmp(result, expect, 1) == 0, "%s:%s expected '%s', got '%s'\n", (sect), (key), (expect)?(expect):"(null)", result); \ - } while (0) +static void ok_child_string( int line, const char *sect, const char *key, + const char *expect, int sensitive ) +{ + char* result = getChildString( sect, key ); + ok_(__FILE__, line)( strCmp(result, expect, sensitive) == 0, "%s:%s expected '%s', got '%s'\n", + sect, key, expect ? expect : "(null)", result ); +} -#define okChildIString(sect, key, expect) \ - do { \ - char* result = getChildString(sect, key); \ - ok(strCmp(result, expect, 0) == 0, "%s:%s expected '%s', got '%s'\n", sect, key, expect, result); \ - } while (0) +#define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) +#define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) /* using !expect ensures that the test will fail if the sect/key isn't present * in result file

1 0

Alexandre Julliard : user32: Replace a pointer cast by FIELD_OFFSET.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 07bf51efbd06f147248aa6e970b0a6655111910c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07bf51efbd06f147248aa6e97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:18:06 2007 +0200 user32: Replace a pointer cast by FIELD_OFFSET. --- dlls/user32/winproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e58d1f0..51936af 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -524,7 +524,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA if (!(context.Eax = GetWindowWord( HWND_32(hwnd), GWLP_HINSTANCE ))) context.Eax = context.SegDs; context.SegCs = SELECTOROF(proc); context.Eip = OFFSETOF(proc); - context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME, bp); if (lParam) {

1 0

Jacek Caban : msimtf: Added Dll[Un]RegisterServer implementation.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 0101e58d43d1eebec2c9dcbfa8071f2eb3db55ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0101e58d43d1eebec2c9dcbfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 20:50:20 2007 +0200 msimtf: Added Dll[Un]RegisterServer implementation. --- .gitignore | 1 + dlls/msimtf/Makefile.in | 2 + dlls/msimtf/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msimtf/msimtf.inf | 26 +++++++++++++++++++ dlls/msimtf/rsrc.rc | 20 +++++++++++++++ 5 files changed, 108 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43ee7d8..95e66f5 100644 --- a/.gitignore +++ b/.gitignore @@ -266,6 +266,7 @@ dlls/msi/tests/*.ok dlls/msi/tests/msi_crosstest.exe dlls/msi/tests/testlist.c dlls/msimg32/libmsimg32.def +dlls/msimtf/rsrc.res dlls/msrle32/rsrc.res dlls/msvcrt/libmsvcrt.def dlls/msvcrt/rsrc.res diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index 2ec6168..2de6646 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -4,8 +4,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msimtf.dll IMPORTS = kernel32 +EXTRALIBS = -luuid C_SRCS = main.c +RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 5659647..238c781 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -19,14 +19,23 @@ #include "config.h" #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "advpub.h" +#include "ole2.h" +#include "dimm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msimtf); +static HINSTANCE msimtf_instance; + /****************************************************************** * DllMain (msimtf.@) */ @@ -37,6 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -63,13 +73,59 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +#define INF_SET_CLSID(clsid) \ + do \ + { \ + static CHAR name[] = "CLSID_" #clsid; \ + \ + pse[i].pszName = name; \ + clsids[i++] = &CLSID_ ## clsid; \ + } while (0) + +static HRESULT register_server(BOOL doregister) +{ + HRESULT hres; + HMODULE hAdvpack; + typeof(RegInstallA) *pRegInstall; + STRTABLEA strtable; + STRENTRYA pse[1]; + static CLSID const *clsids[34]; + int i = 0; + + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + INF_SET_CLSID(CActiveIMM); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); + + hres = pRegInstall(msimtf_instance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + /*********************************************************************** * DllRegisterServer (msimtf.@) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + return register_server(TRUE); } /*********************************************************************** @@ -77,6 +133,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + return register_server(FALSE); } diff --git a/dlls/msimtf/msimtf.inf b/dlls/msimtf/msimtf.inf new file mode 100644 index 0000000..d7e6b73 --- /dev/null +++ b/dlls/msimtf/msimtf.inf @@ -0,0 +1,26 @@ +[version] +Signature="$CHICAGO$" + + +[RegisterDll] +AddReg=Classes.Reg + + +[UnregisterDll] +DelReg=Classes.Reg + + +[Classes.Reg] +HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" +HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" +HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident",,,"CActiveIMMAppEx_Trident" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident\InProcServer32",,,"msimtf.dll" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx",,,"CActiveIMMAppEx" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx\InProcServer32",,,"msimtf.dll" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx\InProcServer32","ThreadingModel",,"Apartment" + +[Strings] +CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC} +CLSID_CActiveIMMAppEx="{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}" diff --git a/dlls/msimtf/rsrc.rc b/dlls/msimtf/rsrc.rc new file mode 100644 index 0000000..361feee --- /dev/null +++ b/dlls/msimtf/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2007 Jacek Caban 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 + */ + +/* @makedep: msimtf.inf */ +REGINST REGINST msimtf.inf

1 0

Alexandre Julliard : msi: Properly clear the new table data when a column is added.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 71747518ad8e95de8fb30ff76b6b5caaf8d7437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71747518ad8e95de8fb30ff76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:13:53 2007 +0200 msi: Properly clear the new table data when a column is added. --- dlls/msi/table.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bf7d705..0193649 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1041,10 +1041,11 @@ static UINT get_tablecolumns( MSIDATABASE *db, static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; - UINT size, offset; + UINT size, offset, old_count; int n; table = find_cached_table( db, name ); + old_count = table->col_count; msi_free( table->colinfo ); table_get_column_info( db, name, &table->colinfo, &table->col_count ); @@ -1054,7 +1055,8 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) for ( n = 0; n < table->row_count; n++ ) { table->data[n] = msi_realloc( table->data[n], size ); - table->data[n][offset] = (BYTE)MSI_NULL_INTEGER; + if (old_count < table->col_count) + memset( &table->data[n][offset], 0, size - offset ); } }

1 0

Alexandre Julliard : msi: Avoid casting const pointers to non-const.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 6adf058089544e39ba10160ca1c80aeb1ae0a864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6adf058089544e39ba10160ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:14:21 2007 +0200 msi: Avoid casting const pointers to non-const. --- dlls/msi/table.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0193649..c5850e3 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -53,9 +53,9 @@ typedef struct tagMSICOLUMNHASHENTRY typedef struct tagMSICOLUMNINFO { - LPCWSTR tablename; + LPWSTR tablename; UINT number; - LPCWSTR colname; + LPWSTR colname; UINT type; UINT offset; INT ref_count; @@ -87,12 +87,12 @@ static const WCHAR szStringPool[] = { '_','S','t','r','i','n','g','P','o','o','l',0 }; /* information for default tables */ -static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; -static const WCHAR szTable[] = { 'T','a','b','l','e',0 }; -static const WCHAR szName[] = { 'N','a','m','e',0 }; -static const WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; -static const WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; -static const WCHAR szType[] = { 'T','y','p','e',0 }; +static WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; +static WCHAR szTable[] = { 'T','a','b','l','e',0 }; +static WCHAR szName[] = { 'N','a','m','e',0 }; +static WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; +static WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; +static WCHAR szType[] = { 'T','y','p','e',0 }; /* These tables are written into (the .hash_table part). * Do not mark them const. @@ -933,8 +933,8 @@ static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ) for( i=0; i<count; i++ ) { - msi_free( (LPWSTR) colinfo[i].tablename ); - msi_free( (LPWSTR) colinfo[i].colname ); + msi_free( colinfo[i].tablename ); + msi_free( colinfo[i].colname ); msi_free( colinfo[i].hash_table ); } }

1 0

Alexandre Julliard : crypt32: Fix pointer casts in decode.c too.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 66787e65a911677552b765e0ca445a290d39d676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66787e65a911677552b765e0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 14:14:36 2007 +0200 crypt32: Fix pointer casts in decode.c too. --- dlls/crypt32/decode.c | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 17e4db6..6297251 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4362,101 +4362,101 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, { switch (LOWORD(lpszStructType)) { - case (WORD)X509_CERT: + case LOWORD(X509_CERT): decodeFunc = CRYPT_AsnDecodeCertSignedContent; break; - case (WORD)X509_CERT_TO_BE_SIGNED: + case LOWORD(X509_CERT_TO_BE_SIGNED): decodeFunc = CRYPT_AsnDecodeCert; break; - case (WORD)X509_CERT_CRL_TO_BE_SIGNED: + case LOWORD(X509_CERT_CRL_TO_BE_SIGNED): decodeFunc = CRYPT_AsnDecodeCRL; break; - case (WORD)X509_EXTENSIONS: + case LOWORD(X509_EXTENSIONS): decodeFunc = CRYPT_AsnDecodeExtensions; break; - case (WORD)X509_NAME_VALUE: + case LOWORD(X509_NAME_VALUE): decodeFunc = CRYPT_AsnDecodeNameValue; break; - case (WORD)X509_NAME: + case LOWORD(X509_NAME): decodeFunc = CRYPT_AsnDecodeName; break; - case (WORD)X509_PUBLIC_KEY_INFO: + case LOWORD(X509_PUBLIC_KEY_INFO): decodeFunc = CRYPT_AsnDecodePubKeyInfo; break; - case (WORD)X509_AUTHORITY_KEY_ID: + case LOWORD(X509_AUTHORITY_KEY_ID): decodeFunc = CRYPT_AsnDecodeAuthorityKeyId; break; - case (WORD)X509_ALTERNATE_NAME: + case LOWORD(X509_ALTERNATE_NAME): decodeFunc = CRYPT_AsnDecodeAltName; break; - case (WORD)X509_BASIC_CONSTRAINTS: + case LOWORD(X509_BASIC_CONSTRAINTS): decodeFunc = CRYPT_AsnDecodeBasicConstraints; break; - case (WORD)X509_BASIC_CONSTRAINTS2: + case LOWORD(X509_BASIC_CONSTRAINTS2): decodeFunc = CRYPT_AsnDecodeBasicConstraints2; break; - case (WORD)RSA_CSP_PUBLICKEYBLOB: + case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; - case (WORD)X509_UNICODE_NAME: + case LOWORD(X509_UNICODE_NAME): decodeFunc = CRYPT_AsnDecodeUnicodeName; break; - case (WORD)PKCS_ATTRIBUTE: + case LOWORD(PKCS_ATTRIBUTE): decodeFunc = CRYPT_AsnDecodePKCSAttribute; break; - case (WORD)X509_UNICODE_NAME_VALUE: + case LOWORD(X509_UNICODE_NAME_VALUE): decodeFunc = CRYPT_AsnDecodeUnicodeNameValue; break; - case (WORD)X509_OCTET_STRING: + case LOWORD(X509_OCTET_STRING): decodeFunc = CRYPT_AsnDecodeOctets; break; - case (WORD)X509_BITS: - case (WORD)X509_KEY_USAGE: + case LOWORD(X509_BITS): + case LOWORD(X509_KEY_USAGE): decodeFunc = CRYPT_AsnDecodeBits; break; - case (WORD)X509_INTEGER: + case LOWORD(X509_INTEGER): decodeFunc = CRYPT_AsnDecodeInt; break; - case (WORD)X509_MULTI_BYTE_INTEGER: + case LOWORD(X509_MULTI_BYTE_INTEGER): decodeFunc = CRYPT_AsnDecodeInteger; break; - case (WORD)X509_MULTI_BYTE_UINT: + case LOWORD(X509_MULTI_BYTE_UINT): decodeFunc = CRYPT_AsnDecodeUnsignedInteger; break; - case (WORD)X509_ENUMERATED: + case LOWORD(X509_ENUMERATED): decodeFunc = CRYPT_AsnDecodeEnumerated; break; - case (WORD)X509_CHOICE_OF_TIME: + case LOWORD(X509_CHOICE_OF_TIME): decodeFunc = CRYPT_AsnDecodeChoiceOfTime; break; - case (WORD)X509_AUTHORITY_KEY_ID2: + case LOWORD(X509_AUTHORITY_KEY_ID2): decodeFunc = CRYPT_AsnDecodeAuthorityKeyId2; break; - case (WORD)PKCS_CONTENT_INFO: + case LOWORD(PKCS_CONTENT_INFO): decodeFunc = CRYPT_AsnDecodePKCSContentInfo; break; - case (WORD)X509_SEQUENCE_OF_ANY: + case LOWORD(X509_SEQUENCE_OF_ANY): decodeFunc = CRYPT_AsnDecodeSequenceOfAny; break; - case (WORD)PKCS_UTC_TIME: + case LOWORD(PKCS_UTC_TIME): decodeFunc = CRYPT_AsnDecodeUtcTime; break; - case (WORD)X509_CRL_DIST_POINTS: + case LOWORD(X509_CRL_DIST_POINTS): decodeFunc = CRYPT_AsnDecodeCRLDistPoints; break; - case (WORD)X509_ENHANCED_KEY_USAGE: + case LOWORD(X509_ENHANCED_KEY_USAGE): decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; break; - case (WORD)PKCS_ATTRIBUTES: + case LOWORD(PKCS_ATTRIBUTES): decodeFunc = CRYPT_AsnDecodePKCSAttributes; break; - case (WORD)X509_ISSUING_DIST_POINT: + case LOWORD(X509_ISSUING_DIST_POINT): decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; break; - case (WORD)X509_NAME_CONSTRAINTS: + case LOWORD(X509_NAME_CONSTRAINTS): decodeFunc = CRYPT_AsnDecodeNameConstraints; break; - case (WORD)PKCS7_SIGNER_INFO: + case LOWORD(PKCS7_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; }

1 0

Mikolaj Zalewski : ntdll: Avoid setting IS_TEXT_UNICODE_NUL_BYTES for the last byte of an ANSI string .
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 370b881fcda8b7b8ef8fe2cfbe99c824882fd104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370b881fcda8b7b8ef8fe2cfb… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Oct 16 17:49:28 2007 -0700 ntdll: Avoid setting IS_TEXT_UNICODE_NUL_BYTES for the last byte of an ANSI string. --- dlls/ntdll/rtlstr.c | 3 +++ dlls/ntdll/tests/rtlstr.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 1b13f12..ecd8523 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1610,6 +1610,9 @@ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) /* Check for an odd length ... pass if even. */ if (len & 1) out_flags |= IS_TEXT_UNICODE_ODD_LENGTH; + if (((char *)buf)[len - 1] == 0) + len--; /* Windows seems to do something like that to avoid e.g. false IS_TEXT_UNICODE_NULL_BYTES */ + len /= sizeof(WCHAR); /* Windows only checks the first 256 characters */ if (len > 256) len = 256; diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 65b9b52..e40bd53 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1677,7 +1677,7 @@ static void test_RtlIsTextUnicode(void) int flags; int i; - todo_wine ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); + ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); ok(pRtlIsTextUnicode(unicode, sizeof(unicode), NULL), "Text should be Unicode\n"); ok(!pRtlIsTextUnicode(unicode, sizeof(unicode) - 1, NULL), "Text should be Unicode\n");

1 0

Bang Jun-young : advapi32: Fix AdjustTokenPrivileges() to match the PSDK.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 27213de046d97a892fdfd4e7577a60d5e2ab7e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27213de046d97a892fdfd4e75… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Wed Oct 17 16:30:44 2007 +0900 advapi32: Fix AdjustTokenPrivileges() to match the PSDK. --- dlls/advapi32/security.c | 4 ++-- include/winbase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f95acf7..559291c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -552,8 +552,8 @@ AdjustTokenGroups( HANDLE TokenHandle, BOOL ResetToDefault, PTOKEN_GROUPS NewSta */ BOOL WINAPI AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, - LPVOID NewState, DWORD BufferLength, - LPVOID PreviousState, LPDWORD ReturnLength ) + PTOKEN_PRIVILEGES NewState, DWORD BufferLength, + PTOKEN_PRIVILEGES PreviousState, LPDWORD ReturnLength ) { NTSTATUS status; diff --git a/include/winbase.h b/include/winbase.h index 2ad4314..2734ecb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1253,7 +1253,7 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); -BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,LPVOID,DWORD,LPVOID,LPDWORD); +BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,LPDWORD); BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); BOOL WINAPI AllocateLocallyUniqueId(PLUID); BOOL WINAPI AreAllAccessesGranted(DWORD,DWORD);

1 0