October 2006 - Wine-commits

Francois Gouget : oleview: U(x) must be defined after winnt. h has had a chance to define NONAMELESSUNION. Fixes the compilation with gcc 2.95.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: 70066c1640dabf2651ed48dc608e85f0a5c07fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70066c1640dabf2651ed48dc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 15 17:07:00 2006 +0200 oleview: U(x) must be defined after winnt.h has had a chance to define NONAMELESSUNION. Fixes the compilation with gcc 2.95. --- programs/oleview/main.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 3bac011..90f184d 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -20,17 +20,17 @@ #define COBJMACROS +#include <windows.h> +#include <winreg.h> +#include <commctrl.h> +#include <unknwn.h> + #ifdef NONAMELESSUNION # define U(x) (x).u #else # define U(x) (x) #endif -#include <windows.h> -#include <winreg.h> -#include <commctrl.h> -#include <unknwn.h> - #include "resource.h" #define MAX_LOAD_STRING 256

1 0

Mikołaj Zalewski : winetest: Don' t start test programs with STARTUPINFO.wShowWindow = SW_HIDE.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: 9a13344129cb35517be3b64540f8a61e4405dc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a13344129cb35517be3b6454… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 20:51:59 2006 +0200 winetest: Don't start test programs with STARTUPINFO.wShowWindow = SW_HIDE. --- programs/winetest/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 796d542..c1fc50c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -277,8 +277,7 @@ run_ex (char *cmd, const char *out, DWOR DWORD wait, status; GetStartupInfo (&si); - si.wShowWindow = SW_HIDE; - si.dwFlags = STARTF_USESHOWWINDOW; + si.dwFlags = 0; if (out) { fd = open (out, O_WRONLY | O_CREAT, 0666);

1 0

Mikołaj Zalewski : comctl32: header: Test and improve the custom draw and owner draw code.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: 4c5de64014eff4edeba7d3e2c910cff73b6594e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5de64014eff4edeba7d3e2c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 20:27:39 2006 +0200 comctl32: header: Test and improve the custom draw and owner draw code. --- dlls/comctl32/header.c | 136 +++++++++++++++++----------- dlls/comctl32/tests/header.c | 203 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c5de64014eff4edeba7d…

1 0

Mikołaj Zalewski : comctl32: header: Make all repaints pass through HEADER_Refresh.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: b182950bb94bf5e4e694e4aca72720b4e9777af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b182950bb94bf5e4e694e4aca… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 20:23:35 2006 +0200 comctl32: header: Make all repaints pass through HEADER_Refresh. --- dlls/comctl32/header.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 04bf978..5e5fca6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -311,9 +311,6 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, (infoPtr->nNotifyFormat == NFR_UNICODE)); - if (!infoPtr->bRectsValid) - HEADER_SetItemBounds(hwnd); - r = phdi->rect; if (r.right - r.left == 0) return phdi->rect.right; @@ -557,12 +554,12 @@ HEADER_Refresh (HWND hwnd, HDC hdc) for (i = 0; x <= rect.right && i < infoPtr->uNumItem; i++) { int idx = HEADER_OrderToIndex(hwnd,i); if (RectVisible(hdc, &infoPtr->items[idx].rect)) - HEADER_DrawItem (hwnd, hdc, idx, infoPtr->iHotItem == i); + HEADER_DrawItem(hwnd, hdc, idx, infoPtr->iHotItem == idx); x = infoPtr->items[idx].rect.right; } - if ((x <= rect.right) && (infoPtr->uNumItem > 0)) { - rect.left = x; + rect.left = x; + if ((x <= rect.right) && RectVisible(hdc, &rect) && (infoPtr->uNumItem > 0)) { if (theme != NULL) { DrawThemeBackground (theme, hdc, HP_HEADERITEM, HIS_NORMAL, &rect, NULL); @@ -588,12 +585,11 @@ static void HEADER_RefreshItem (HWND hwnd, HDC hdc, INT iItem) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HFONT hFont, hOldFont; - hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); - hOldFont = SelectObject (hdc, hFont); - HEADER_DrawItem (hwnd, hdc, iItem, infoPtr->iHotItem == iItem); - SelectObject (hdc, hOldFont); + if (!infoPtr->bRectsValid) + HEADER_SetItemBounds(hwnd); + + InvalidateRect(hwnd, &infoPtr->items[iItem].rect, FALSE); } @@ -972,6 +968,10 @@ HEADER_CreateDragImage (HWND hwnd, WPARA if (wParam < 0 || wParam >= infoPtr->uNumItem) return FALSE; + + if (!infoPtr->bRectsValid) + HEADER_SetItemBounds(hwnd); + lpItem = &infoPtr->items[wParam]; width = lpItem->rect.right - lpItem->rect.left; height = lpItem->rect.bottom - lpItem->rect.top;

1 0

Mikołaj Zalewski : comctl32: rebar: bUnicode and NtfUnicode should be the same.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: b793472232bf4ce078deca749c4be5346d9290c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b793472232bf4ce078deca749… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 21:46:40 2006 +0200 comctl32: rebar: bUnicode and NtfUnicode should be the same. --- dlls/comctl32/rebar.c | 42 ++++++++++++------------------------------ 1 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index b74dc15..c627a3e 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -188,8 +188,7 @@ typedef struct DWORD orgStyle; /* original style (dwStyle may change) */ SIZE calcSize; /* calculated rebar size */ SIZE oldSize; /* previous calculated rebar size */ - BOOL bUnicode; /* TRUE if this window is W type */ - BOOL NtfUnicode; /* TRUE if parent wants notify in W format */ + BOOL bUnicode; /* TRUE if parent wants notify in W format */ BOOL DoRedraw; /* TRUE to acutally draw bands */ UINT fStatus; /* Status flags (see below) */ HCURSOR hcurArrow; /* handle to the arrow cursor */ @@ -288,6 +287,8 @@ #define LEADJ(b,i) do { if(infoPtr->dwSt #define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongPtrW (hwnd, 0)) +static LRESULT REBAR_NotifyFormat(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); + /* "constant values" retrieved when DLL was initialized */ /* FIXME we do this when the classes are registered. */ @@ -408,9 +409,9 @@ REBAR_DumpBand (REBAR_INFO *iP) iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y, iP->dragNow.x, iP->dragNow.y, iP->iGrabbedBand); - TRACE("hwnd=%p: style=%08x, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n", - iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE", - (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE"); + TRACE("hwnd=%p: style=%08x, notify in Unicode=%s, redraw=%s\n", + iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE", + (iP->DoRedraw)?"TRUE":"FALSE"); for (i = 0; i < iP->uNumBands; i++) { pB = &iP->bands[i]; TRACE("band # %u:", i); @@ -502,15 +503,9 @@ REBAR_Notify (NMHDR *nmhdr, REBAR_INFO * nmhdr->hwndFrom = infoPtr->hwndSelf; nmhdr->code = code; - TRACE("window %p, code=%08x, %s\n", parent, code, - (infoPtr->NtfUnicode) ? "via Unicode" : "via ANSI"); + TRACE("window %p, code=%08x, via %s\n", parent, code, (infoPtr->bUnicode)?"Unicode":"ANSI"); - if (infoPtr->NtfUnicode) - return SendMessageW (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom, - (LPARAM)nmhdr); - else - return SendMessageA (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom, - (LPARAM)nmhdr); + return SendMessageW(parent, WM_NOTIFY, (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); } static INT @@ -4142,7 +4137,6 @@ REBAR_NCCreate (HWND hwnd, WPARAM wParam RECT wnrc1, clrc1; NONCLIENTMETRICSW ncm; HFONT tfont; - INT i; if (infoPtr != NULL) { ERR("Strange info structure pointer *not* NULL\n"); @@ -4176,18 +4170,11 @@ REBAR_NCCreate (HWND hwnd, WPARAM wParam infoPtr->hcurHorz = LoadCursorW (0, (LPWSTR)IDC_SIZEWE); infoPtr->hcurVert = LoadCursorW (0, (LPWSTR)IDC_SIZENS); infoPtr->hcurDrag = LoadCursorW (0, (LPWSTR)IDC_SIZE); - infoPtr->bUnicode = IsWindowUnicode (hwnd); infoPtr->fStatus = CREATE_RUNNING; infoPtr->hFont = GetStockObject (SYSTEM_FONT); /* issue WM_NOTIFYFORMAT to get unicode status of parent */ - i = SendMessageW(REBAR_GetNotifyParent (infoPtr), - WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); - if ((i < NFR_ANSI) || (i > NFR_UNICODE)) { - ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i); - i = NFR_ANSI; - } - infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0; + REBAR_NotifyFormat(infoPtr, 0, NF_REQUERY); /* Stow away the original style */ infoPtr->orgStyle = cs->style; @@ -4318,11 +4305,11 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, if (lParam == NF_REQUERY) { i = SendMessageW(REBAR_GetNotifyParent (infoPtr), WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); - if ((i < NFR_ANSI) || (i > NFR_UNICODE)) { + if ((i != NFR_ANSI) && (i != NFR_UNICODE)) { ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i); i = NFR_ANSI; } - infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->bUnicode = (i == NFR_UNICODE) ? 1 : 0; return (LRESULT)i; } return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI); @@ -4721,12 +4708,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, case WM_COMMAND: case WM_DRAWITEM: case WM_NOTIFY: - if (infoPtr->NtfUnicode) - return SendMessageW (REBAR_GetNotifyParent (infoPtr), - uMsg, wParam, lParam); - else - return SendMessageA (REBAR_GetNotifyParent (infoPtr), - uMsg, wParam, lParam); + return SendMessageW(REBAR_GetNotifyParent (infoPtr), uMsg, wParam, lParam); /* case WM_CHARTOITEM: supported according to ControlSpy */

1 0

James Hawkins : mscoree: Add missing stubs to the spec file.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: b2f21fa0710dd6771e2ee6886bd1172dfcb9ab50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f21fa0710dd6771e2ee6886… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 13 14:06:20 2006 -0700 mscoree: Add missing stubs to the spec file. --- dlls/mscoree/mscoree.spec | 112 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index ec65553..966cbfc 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -1,5 +1,107 @@ -116 stdcall _CorDllMain(long long ptr) -117 stdcall _CorExeMain2(ptr long ptr ptr ptr) -118 stdcall _CorExeMain() -119 stdcall _CorImageUnloading(ptr) -120 stdcall _CorValidateImage(ptr ptr) +17 stub InitErrors +18 stub PostError +19 stub InitSSAutoEnterThread +20 stub UpdateError +22 stub LoadStringRC +23 stub ReOpenMetaDataWithMemory + +@ stub CallFunctionShim +@ stub CloseCtrs +@ stub ClrCreateManagedInstance +@ stub CoEEShutDownCOM +@ stub CoInitializeCor +@ stub CoInitializeEE +@ stub CoUninitializeCor +@ stub CoUninitializeEE +@ stub CollectCtrs +@ stub CorBindToCurrentRuntime +@ stub CorBindToRuntime +@ stub CorBindToRuntimeByCfg +@ stub CorBindToRuntimeByPath +@ stub CorBindToRuntimeByPathEx +@ stub CorBindToRuntimeEx +@ stub CorBindToRuntimeHost +@ stub CorDllMainWorker +@ stub CorExitProcess +@ stub CorGetSvc +@ stub CorIsLatestSvc +@ stub CorMarkThreadInThreadPool +@ stub CorTickleSvc +@ stub CreateConfigStream +@ stub CreateDebuggingInterfaceFromVersion +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub EEDllGetClassObjectFromClass +@ stub EEDllRegisterServer +@ stub EEDllUnregisterServer +@ stub GetAssemblyMDImport +@ stub GetCORRequiredVersion +@ stub GetCORRootDirectory +@ stub GetCORSystemDirectory +@ stub GetCORVersion +@ stub GetCompileInfo +@ stub GetFileVersion +@ stub GetHashFromAssemblyFile +@ stub GetHashFromAssemblyFileW +@ stub GetHashFromBlob +@ stub GetHashFromFile +@ stub GetHashFromFileW +@ stub GetHashFromHandle +@ stub GetHostConfigurationFile +@ stub GetMetaDataInternalInterface +@ stub GetMetaDataInternalInterfaceFromPublic +@ stub GetMetaDataPublicInterfaceFromInternal +@ stub GetPermissionRequests +@ stub GetPrivateContextsPerfCounters +@ stub GetProcessExecutableHeap +@ stub GetRealProcAddress +@ stub GetRequestedRuntimeInfo +@ stub GetRequestedRuntimeVersion +@ stub GetRequestedRuntimeVersionForCLSID +@ stub GetStartupFlags +@ stub GetTargetForVTableEntry +@ stub GetTokenForVTableEntry +@ stub GetVersionFromProcess +@ stub GetXMLElement +@ stub GetXMLElementAttribute +@ stub GetXMLObject +@ stub LoadLibraryShim +@ stub LoadLibraryWithPolicyShim +@ stub LoadStringRCEx +@ stub LockClrVersion +@ stub MetaDataGetDispenser +@ stub OpenCtrs +@ stub ReOpenMetaDataWithMemoryEx +@ stub RunDll(a)ShimW +@ stub RuntimeOSHandle +@ stub RuntimeOpenImage +@ stub RuntimeReleaseHandle +@ stub SetTargetForVTableEntry +@ stub StrongNameCompareAssemblies +@ stub StrongNameErrorInfo +@ stub StrongNameFreeBuffer +@ stub StrongNameGetBlob +@ stub StrongNameGetBlobFromImage +@ stub StrongNameGetPublicKey +@ stub StrongNameHashSize +@ stub StrongNameKeyDelete +@ stub StrongNameKeyGen +@ stub StrongNameKeyGenEx +@ stub StrongNameKeyInstall +@ stub StrongNameSignatureGeneration +@ stub StrongNameSignatureGenerationEx +@ stub StrongNameSignatureSize +@ stub StrongNameSignatureVerification +@ stub StrongNameSignatureVerificationEx +@ stub StrongNameSignatureVerificationFromImage +@ stub StrongNameTokenFromAssembly +@ stub StrongNameTokenFromAssemblyEx +@ stub StrongNameTokenFromPublicKey +@ stub TranslateSecurityAttributes +@ stdcall _CorDllMain(long long ptr) +@ stdcall _CorExeMain2(ptr long ptr ptr ptr) +@ stdcall _CorExeMain() +@ stdcall _CorImageUnloading(ptr) +@ stdcall _CorValidateImage(ptr ptr)

1 0

James Hawkins : mscoree: Add stub implementations of CorBindToRuntimeHost and GetCORVersion.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: eb676fff06ef702c6033f65edb7d39ebe31040ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb676fff06ef702c6033f65ed… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 13 14:07:17 2006 -0700 mscoree: Add stub implementations of CorBindToRuntimeHost and GetCORVersion. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 966cbfc..1d39504 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -20,7 +20,7 @@ @ stub CorBindToRuntimeByPath @ stub CorBindToRuntimeByPathEx @ stub CorBindToRuntimeEx -@ stub CorBindToRuntimeHost +@ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr) @ stub CorDllMainWorker @ stub CorExitProcess @ stub CorGetSvc @@ -40,7 +40,7 @@ @ stub GetCORRequiredVersion @ stub GetCORRootDirectory @ stub GetCORSystemDirectory -@ stub GetCORVersion +@ stdcall GetCORVersion(wstr long ptr) @ stub GetCompileInfo @ stub GetFileVersion @ stub GetHashFromAssemblyFile diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 2dfc046..3743ff5 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -28,6 +28,18 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, + LPCWSTR pwszHostConfigFile, VOID *pReserved, + DWORD startupFlags, REFCLSID rclsid, + REFIID riid, LPVOID *ppv) +{ + FIXME("(%s, %s, %s, %p, %d, %p, %p, %p): stub!\n", debugstr_w(pwszVersion), + debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved, + startupFlags, rclsid, riid, ppv); + + return E_FAIL; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -83,3 +95,23 @@ DWORD _CorValidateImage(LPCVOID* imageBa TRACE("(%p, %s): stub\n", imageBase, debugstr_w(imageName)); return E_FAIL; } + +HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) +{ + static const WCHAR version[] = {'1','.','1','.','4','3','2','2',0}; + + FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); + + if (!dwLength) + return E_POINTER; + + *dwLength = lstrlenW(version); + + if (cchBuffer < *dwLength) + return ERROR_INSUFFICIENT_BUFFER; + + if (pbuffer) + lstrcpyW(pbuffer, version); + + return S_OK; +}

1 0

Kai Blin : secur32: Implement RFC2104 (HMAC) with MD5 for NTLMv2.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: b629b6defdba677c4da6c88d441e716d5d008e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b629b6defdba677c4da6c88d4… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Oct 14 12:58:03 2006 +0200 secur32: Implement RFC2104 (HMAC) with MD5 for NTLMv2. --- dlls/secur32/Makefile.in | 1 + dlls/secur32/hmac_md5.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/secur32/hmac_md5.h | 43 ++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 2a17991..45043d3 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -10,6 +10,7 @@ DELAYIMPORTS = crypt32 C_SRCS = \ base64_codec.c \ dispatcher.c \ + hmac_md5.c \ negotiate.c \ ntlm.c \ schannel.c \ diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c new file mode 100644 index 0000000..1b18659 --- /dev/null +++ b/dlls/secur32/hmac_md5.c @@ -0,0 +1,77 @@ +/* + * Copyright 2006 Kai Blin + * + * 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 + * + * This file implements RFC 2104 (HMAC) for the MD5 provider. + * It is needed for NTLMv2 signing and sealing. + */ + +#include "hmac_md5.h" + +void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len) +{ + int i; + unsigned char inner_padding[64]; + unsigned char temp_key[16]; + + if(key_len > 64) + { + MD5_CTX temp_ctx; + + MD5Init(&temp_ctx); + MD5Update(&temp_ctx, key, key_len); + MD5Final(&temp_ctx); + memcpy(temp_key, temp_ctx.digest, 16); + + key = temp_key; + key_len = 16; + } + + memset(inner_padding, 0, 64); + memset(ctx->outer_padding, 0, 64); + memcpy(inner_padding, key, key_len); + memcpy(ctx->outer_padding, key, key_len); + + for(i = 0; i < 64; ++i) + { + inner_padding[i] ^= 0x36; + ctx->outer_padding[i] ^= 0x5c; + } + + MD5Init(&(ctx->ctx)); + MD5Update(&(ctx->ctx), inner_padding, 64); +} + +void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len) +{ + MD5Update(&(ctx->ctx), data, data_len); +} + +void HMACMD5Final(HMAC_MD5_CTX *ctx, unsigned char *digest) +{ + MD5_CTX outer_ctx; + unsigned char inner_digest[16]; + + MD5Final(&(ctx->ctx)); + memcpy(inner_digest, ctx->ctx.digest, 16); + + MD5Init(&outer_ctx); + MD5Update(&outer_ctx, ctx->outer_padding, 64); + MD5Update(&outer_ctx, inner_digest, 16); + MD5Final(&outer_ctx); + + memcpy(digest, outer_ctx.digest, 16); +} diff --git a/dlls/secur32/hmac_md5.h b/dlls/secur32/hmac_md5.h new file mode 100644 index 0000000..81e4dd6 --- /dev/null +++ b/dlls/secur32/hmac_md5.h @@ -0,0 +1,43 @@ +/* + * Copyright 2006 Kai Blin + * + * 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 + * + * This file holds the declarations needed for HMAC-MD5. + */ + +#include <string.h> + +typedef struct +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +} MD5_CTX; + +typedef struct +{ + MD5_CTX ctx; + unsigned char outer_padding[64]; +} HMAC_MD5_CTX; + +void MD5Init( MD5_CTX *ctx ); +void MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); +void MD5Final( MD5_CTX *ctx ); + +void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len); +void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len); +void HMACMD5Final(HMAC_MD5_CTX *ctx, unsigned char *digest);

1 0

Kai Blin : secur32: Get rid of NEGO_* helper modes, they will never be used . Negotiate should not be done via ntlm_auth.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: e338a30e59e4f80493202d24fa88101f09aacb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e338a30e59e4f80493202d24f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Oct 15 21:12:11 2006 +0200 secur32: Get rid of NEGO_* helper modes, they will never be used. Negotiate should not be done via ntlm_auth. --- dlls/secur32/secur32_priv.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 1ad62c5..2f99454 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -50,8 +50,6 @@ typedef struct _SecurePackage typedef enum _helper_mode { NTLM_SERVER, NTLM_CLIENT, - NEGO_SERVER, - NEGO_CLIENT, NUM_HELPER_MODES } HelperMode;

1 0

Jacek Caban : mshtml: Load page from moniker if AsyncOpen fails.
by Alexandre Julliard 16 Oct '06

16 Oct '06

Module: wine Branch: master Commit: 1e92565c3e9761777f4c7894abe8cca49d62d147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e92565c3e9761777f4c7894a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 15 21:16:48 2006 +0200 mshtml: Load page from moniker if AsyncOpen fails. --- dlls/mshtml/nsio.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2b710e4..46acb67 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -644,7 +644,11 @@ static nsresult NSAPI nsChannel_AsyncOpe } } - return nsIChannel_AsyncOpen(This->channel, aListener, aContext); + nsres = nsIChannel_AsyncOpen(This->channel, aListener, aContext); + + if(NS_FAILED(nsres) && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) + return WINE_NS_LOAD_FROM_MONIKER; + return nsres; } TRACE("channel == NULL\n");

1 0