Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65950: [CMD] Fix duplicated ID in resources. GCC build of course doesn't warn/error about this but MSVC does. CORE-9020
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:10:47 2015 New Revision: 65950 URL: http://svn.reactos.org/svn/reactos?rev=65950&view=rev Log: [CMD] Fix duplicated ID in resources. GCC build of course doesn't warn/error about this but MSVC does. CORE-9020 Modified: trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sat Jan 3 09:10:47 2015 @@ -206,20 +206,20 @@ #define STRING_VERSION_RUNNING_ON 705 #define STRING_VERSION_RUNVER 706 -#define STRING_VOL_HELP1 706 -#define STRING_VOL_HELP2 707 -#define STRING_VOL_HELP3 708 -#define STRING_VOL_HELP4 709 - -#define STRING_WINDOW_HELP1 710 -#define STRING_WINDOW_HELP2 711 - -#define STRING_COPY_FILE 712 -#define STRING_DELETE_WIPE 713 -#define STRING_FOR_ERROR 714 -#define STRING_SCREEN_COL 715 -#define STRING_SCREEN_ROW 716 -#define STRING_TIMER_TIME 717 +#define STRING_VOL_HELP1 707 +#define STRING_VOL_HELP2 708 +#define STRING_VOL_HELP3 709 +#define STRING_VOL_HELP4 710 + +#define STRING_WINDOW_HELP1 711 +#define STRING_WINDOW_HELP2 712 + +#define STRING_COPY_FILE 713 +#define STRING_DELETE_WIPE 714 +#define STRING_FOR_ERROR 715 +#define STRING_SCREEN_COL 716 +#define STRING_SCREEN_ROW 717 +#define STRING_TIMER_TIME 718 #define STRING_INVALID_OPERAND 720 #define STRING_EXPECTED_CLOSE_PAREN 721

1 0

[cwittich] 65949: [GDI32_WINETEST] don't skip metafile tests anymore #ROSTESTS-4
by cwittich＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: cwittich Date: Sat Jan 3 08:42:02 2015 New Revision: 65949 URL: http://svn.reactos.org/svn/reactos?rev=65949&view=rev Log: [GDI32_WINETEST] don't skip metafile tests anymore #ROSTESTS-4 Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat Jan 3 08:42:02 2015 @@ -1734,12 +1734,6 @@ broken(emh1->nBytes - diff_9x == emh2->nBytes), "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); ok(emh1->nRecords == emh2->nRecords, "expected nRecords %u, got %u\n", emh1->nRecords, emh2->nRecords); - - if(!winetest_interactive) - { - skip("skipping match_emf_record(), bug ROSTESTS-4\n"); - return 0; - } offset1 = emh1->nSize; offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */

1 0

[jimtabor] 65948: [Win32ss] - Use proper structure name for packed DDE.
by jimtabor＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: jimtabor Date: Sat Jan 3 06:22:31 2015 New Revision: 65948 URL: http://svn.reactos.org/svn/reactos?rev=65948&view=rev Log: [Win32ss] - Use proper structure name for packed DDE. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -3399,11 +3399,11 @@ /* BYTE Data[DataSize] */ } KMDDEEXECUTEDATA, *PKMDDEEXECUTEDATA; -typedef struct tagKMDDELPARAM +typedef struct tagDDEPACK { UINT_PTR uiLo; UINT_PTR uiHi; -} KMDDELPARAM, *PKMDDELPARAM; +} DDEPACK, *PDDEPACK; Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -122,7 +122,7 @@ static MSGMEMORY g_MsgMemory[] = { { WM_CREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, - { WM_DDE_ACK, sizeof(KMDDELPARAM), MMS_FLAG_READ }, + { WM_DDE_ACK, sizeof(DDEPACK), MMS_FLAG_READ }, { WM_DDE_EXECUTE, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_GETMINMAXINFO, sizeof(MINMAXINFO), MMS_FLAG_READWRITE }, { WM_GETTEXT, MMS_SIZE_WPARAMWCHAR, MMS_FLAG_WRITE }, Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -359,8 +359,8 @@ { case WM_DDE_ACK: { - PKMDDELPARAM DdeLparam; - DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDELPARAM)); + PDDEPACK DdeLparam; + DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(DDEPACK)); if (!DdeLparam || !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) return FALSE; @@ -490,7 +490,7 @@ case WM_DDE_ACK: { - PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; + PDDEPACK DdeLparam = (PDDEPACK) KMMsg->lParam; UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); } break;

1 0

[jimtabor] 65947: [User32] - Move dde.c to ddemisc.c to keep the same name as the wine counter part. - Use dde.c for ReactOS based functions.
by jimtabor＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: jimtabor Date: Sat Jan 3 04:39:20 2015 New Revision: 65947 URL: http://svn.reactos.org/svn/reactos?rev=65947&view=rev Log: [User32] - Move dde.c to ddemisc.c to keep the same name as the wine counter part. - Use dde.c for ReactOS based functions. Added: trunk/reactos/win32ss/user/user32/misc/ddemisc.c - copied unchanged from r65933, trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sat Jan 3 04:39:20 2015 @@ -18,6 +18,7 @@ controls/static.c misc/dde.c misc/ddeclient.c + misc/ddemisc.c misc/ddeserver.c misc/desktop.c misc/display.c Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Sat Jan 3 04:39:20 2015 @@ -1,2517 +1,6 @@ -/* - * DDEML library - * - * Copyright 1997 Alexandre Julliard - * Copyright 1997 Len White - * Copyright 1999 Keith Matthews - * Copyright 2000 Corel - * Copyright 2001 Eric Pouech - * Copyright 2003, 2004, 2005 Dmitry Timoshkov - * - * 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 <user32.h> -#include "dde_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); -/* convert between ATOM and HSZ avoiding compiler warnings */ -#define ATOM2HSZ(atom) ((HSZ) (ULONG_PTR)(atom)) -#define HSZ2ATOM(hsz) ((ATOM) (ULONG_PTR)(hsz)) - -static WDML_INSTANCE* WDML_InstanceList = NULL; -static LONG WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */ -const WCHAR WDML_szEventClass[] = {'D','D','E','M','L','E','v','e','n','t',0}; - -/* protection for instance list */ -CRITICAL_SECTION WDML_CritSect; -CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &WDML_CritSect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": WDML_CritSect") } -}; -CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/* ================================================================ - * - * Pure DDE (non DDEML) management - * - * ================================================================ */ - - -/***************************************************************** - * PackDDElParam (USER32.@) - * - * RETURNS - * the packed lParam - */ -LPARAM WINAPI PackDDElParam(UINT msg, UINT_PTR uiLo, UINT_PTR uiHi) -{ - HGLOBAL hMem; - UINT_PTR *params; - - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!(hMem = GlobalAlloc(GMEM_DDESHARE, sizeof(UINT_PTR) * 2))) - { - ERR("GlobalAlloc failed\n"); - return 0; - } - if (!(params = GlobalLock(hMem))) - { - ERR("GlobalLock failed (%p)\n", hMem); - return 0; - } - params[0] = uiLo; - params[1] = uiHi; - GlobalUnlock(hMem); - return (LPARAM)hMem; - - case WM_DDE_EXECUTE: - return uiHi; - - default: - return MAKELONG(uiLo, uiHi); - } -} - - -/***************************************************************** - * UnpackDDElParam (USER32.@) - * - * RETURNS - * success: nonzero - * failure: zero - */ -BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam, - PUINT_PTR uiLo, PUINT_PTR uiHi) -{ - UINT_PTR *params; - - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!lParam || !(params = GlobalLock((HGLOBAL)lParam))) - { - if (uiLo) *uiLo = 0; - if (uiHi) *uiHi = 0; - return FALSE; - } - if (uiLo) *uiLo = params[0]; - if (uiHi) *uiHi = params[1]; - GlobalUnlock( (HGLOBAL)lParam ); - return TRUE; - - case WM_DDE_EXECUTE: - if (uiLo) *uiLo = 0; - if (uiHi) *uiHi = lParam; - return TRUE; - - default: - if (uiLo) *uiLo = LOWORD(lParam); - if (uiHi) *uiHi = HIWORD(lParam); - return TRUE; - } -} - - -/***************************************************************** - * FreeDDElParam (USER32.@) - * - * RETURNS - * success: nonzero - * failure: zero - */ -BOOL WINAPI FreeDDElParam(UINT msg, LPARAM lParam) -{ - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - /* first check if it's a global handle */ - if (!GlobalHandle( (LPVOID)lParam )) return TRUE; - return !GlobalFree( (HGLOBAL)lParam ); - - default: - return TRUE; - } -} - - -/***************************************************************** - * ReuseDDElParam (USER32.@) - * - * RETURNS - * the packed lParam - */ -LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut, - UINT_PTR uiLo, UINT_PTR uiHi) -{ - UINT_PTR *params; - - switch (msgIn) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - switch(msgOut) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!lParam) return 0; - if (!(params = GlobalLock( (HGLOBAL)lParam ))) - { - ERR("GlobalLock failed\n"); - return 0; - } - params[0] = uiLo; - params[1] = uiHi; - TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); - GlobalUnlock( (HGLOBAL)lParam ); - return lParam; - - case WM_DDE_EXECUTE: - FreeDDElParam( msgIn, lParam ); - return uiHi; - - default: - FreeDDElParam( msgIn, lParam ); - return MAKELPARAM(uiLo, uiHi); - } - - default: - return PackDDElParam( msgOut, uiLo, uiHi ); - } -} - -/***************************************************************** - * ImpersonateDdeClientWindow (USER32.@) - * - * PARAMS - * hWndClient [I] handle to DDE client window - * hWndServer [I] handle to DDE server window - */ -BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer) -{ - FIXME("(%p %p): stub\n", hWndClient, hWndServer); - return FALSE; -} - -/***************************************************************** - * DdeSetQualityOfService (USER32.@) - */ - -BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, const SECURITY_QUALITY_OF_SERVICE *pqosNew, - PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); - return TRUE; -} - -/* ================================================================ - * - * WDML Error management - * - * ================================================================ */ - -/****************************************************************************** - * DdeGetLastError [USER32.@] Gets most recent error code - * - * PARAMS - * idInst [I] Instance identifier - * - * RETURNS - * Last error code - */ -UINT WINAPI DdeGetLastError(DWORD idInst) -{ - DWORD error_code; - WDML_INSTANCE* pInstance; - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - error_code = DMLERR_INVALIDPARAMETER; - } - else - { - error_code = pInstance->lastError; - pInstance->lastError = 0; - } - - return error_code; -} - -/****************************************************************** - * WDML_SetAllLastError - * - * - */ -static void WDML_SetAllLastError(DWORD lastError) -{ - DWORD threadID; - WDML_INSTANCE* pInstance; - threadID = GetCurrentThreadId(); - pInstance = WDML_InstanceList; - while (pInstance) - { - if (pInstance->threadID == threadID) - pInstance->lastError = lastError; - pInstance = pInstance->next; - } -} - -/* ================================================================ - * - * String management - * - * ================================================================ */ - - -/****************************************************************** - * WDML_FindNode - * - * - */ -static HSZNode* WDML_FindNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - if (pInstance == NULL) return NULL; - - for (pNode = pInstance->nodeList; pNode != NULL; pNode = pNode->next) - { - if (pNode->hsz == hsz) break; - } - if (!pNode) WARN("HSZ %p not found\n", hsz); - return pNode; -} - -/****************************************************************** - * WDML_MakeAtomFromHsz - * - * Creates a global atom from an existing HSZ - * Generally used before sending an HSZ as an atom to a remote app - */ -ATOM WDML_MakeAtomFromHsz(HSZ hsz) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (GetAtomNameW(HSZ2ATOM(hsz), nameBuffer, MAX_BUFFER_LEN)) - return GlobalAddAtomW(nameBuffer); - WARN("HSZ %p not found\n", hsz); - return 0; -} - -/****************************************************************** - * WDML_MakeHszFromAtom - * - * Creates a HSZ from an existing global atom - * Generally used while receiving a global atom and transforming it - * into an HSZ - */ -HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (!atom) return NULL; - - if (GlobalGetAtomNameW(atom, nameBuffer, MAX_BUFFER_LEN)) - { - TRACE("%x => %s\n", atom, debugstr_w(nameBuffer)); - return DdeCreateStringHandleW(pInstance->instanceID, nameBuffer, CP_WINUNICODE); - } - WARN("ATOM 0x%x not found\n", atom); - return 0; -} - -/****************************************************************** - * WDML_IncHSZ - * - * - */ -BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - pNode = WDML_FindNode(pInstance, hsz); - if (!pNode) return FALSE; - - pNode->refCount++; - return TRUE; -} - -/****************************************************************************** - * WDML_DecHSZ (INTERNAL) - * - * Decrease the ref count of an HSZ. If it reaches 0, the node is removed from the list - * of HSZ nodes - * Returns -1 is the HSZ isn't found, otherwise it's the current (after --) of the ref count - */ -BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pPrev = NULL; - HSZNode* pCurrent; - - for (pCurrent = pInstance->nodeList; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) - { - /* If we found the node we were looking for and its ref count is one, - * we can remove it - */ - if (pCurrent->hsz == hsz) - { - if (--pCurrent->refCount == 0) - { - if (pCurrent == pInstance->nodeList) - { - pInstance->nodeList = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - HeapFree(GetProcessHeap(), 0, pCurrent); - DeleteAtom(HSZ2ATOM(hsz)); - } - return TRUE; - } - } - WARN("HSZ %p not found\n", hsz); - - return FALSE; -} - -/****************************************************************************** - * WDML_FreeAllHSZ (INTERNAL) - * - * Frees up all the strings still allocated in the list and - * remove all the nodes from the list of HSZ nodes. - */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) -{ - /* Free any strings created in this instance. - */ - while (pInstance->nodeList != NULL) - { - DdeFreeStringHandle(pInstance->instanceID, pInstance->nodeList->hsz); - } -} - -/****************************************************************************** - * InsertHSZNode (INTERNAL) - * - * Insert a node to the head of the list. - */ -static void WDML_InsertHSZNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - if (hsz != 0) - { - HSZNode* pNew = NULL; - /* Create a new node for this HSZ. - */ - pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); - if (pNew != NULL) - { - pNew->hsz = hsz; - pNew->next = pInstance->nodeList; - pNew->refCount = 1; - pInstance->nodeList = pNew; - } - else - { - ERR("Primary HSZ Node allocation failed - out of memory\n"); - } - } -} - -/****************************************************************** - * WDML_QueryString - * - * - */ -static int WDML_QueryString(WDML_INSTANCE* pInstance, HSZ hsz, LPVOID ptr, DWORD cchMax, - int codepage) -{ - WCHAR pString[MAX_BUFFER_LEN]; - int ret; - /* If psz is null, we have to return only the length - * of the string. - */ - if (ptr == NULL) - { - ptr = pString; - cchMax = MAX_BUFFER_LEN; - } - - /* if there is no input windows returns a NULL string */ - if (hsz == NULL) - { - CHAR *t_ptr = ptr; - *t_ptr = '\0'; - return 1; - } - - switch (codepage) - { - case CP_WINANSI: - ret = GetAtomNameA(HSZ2ATOM(hsz), ptr, cchMax); - break; - case CP_WINUNICODE: - ret = GetAtomNameW(HSZ2ATOM(hsz), ptr, cchMax); - break; - default: - ERR("Unknown code page %d\n", codepage); - ret = 0; - } - return ret; -} - -/***************************************************************** - * DdeQueryStringA [USER32.@] - */ -DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINANSI; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); - return ret; -} - -/***************************************************************** - * DdeQueryStringW [USER32.@] - */ - -DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINUNICODE; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); - return ret; -} - -/****************************************************************** - * DML_CreateString - * - * - */ -static HSZ WDML_CreateString(WDML_INSTANCE* pInstance, LPCVOID ptr, int codepage) -{ - HSZ hsz; - - switch (codepage) - { - case CP_WINANSI: - hsz = ATOM2HSZ(AddAtomA(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_a(ptr), hsz); - break; - case CP_WINUNICODE: - hsz = ATOM2HSZ(AddAtomW(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_w(ptr), hsz); - break; - default: - ERR("Unknown code page %d\n", codepage); - return 0; - } - WDML_InsertHSZNode(pInstance, hsz); - return hsz; -} - -/***************************************************************** - * DdeCreateStringHandleA [USER32.@] - * - * See DdeCreateStringHandleW. - */ -HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) -{ - HSZ hsz = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINANSI; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - - -/****************************************************************************** - * DdeCreateStringHandleW [USER32.@] Creates handle to identify string - * - * PARAMS - * idInst [I] Instance identifier - * psz [I] Pointer to string - * codepage [I] Code page identifier - * RETURNS - * Success: String handle - * Failure: 0 - */ -HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) -{ - WDML_INSTANCE* pInstance; - HSZ hsz = 0; - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINUNICODE; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - -/***************************************************************** - * DdeFreeStringHandle (USER32.@) - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_DecHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeKeepStringHandle (USER32.@) - * - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_IncHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeCmpStringHandles (USER32.@) - * - * Compares the value of two string handles. This comparison is - * not case sensitive. - * - * PARAMS - * hsz1 [I] Handle to the first string - * hsz2 [I] Handle to the second string - * - * RETURNS - * -1 The value of hsz1 is zero or less than hsz2 - * 0 The values of hsz 1 and 2 are the same or both zero. - * 1 The value of hsz2 is zero of less than hsz1 - */ -INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) -{ - WCHAR psz1[MAX_BUFFER_LEN]; - WCHAR psz2[MAX_BUFFER_LEN]; - int ret = 0; - int ret1, ret2; - - ret1 = GetAtomNameW(HSZ2ATOM(hsz1), psz1, MAX_BUFFER_LEN); - ret2 = GetAtomNameW(HSZ2ATOM(hsz2), psz2, MAX_BUFFER_LEN); - - TRACE("(%p<%s> %p<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); - - /* Make sure we found both strings. */ - if (ret1 == 0 && ret2 == 0) - { - /* If both are not found, return both "zero strings". */ - ret = 0; - } - else if (ret1 == 0) - { - /* If hsz1 is a not found, return hsz1 is "zero string". */ - ret = -1; - } - else if (ret2 == 0) - { - /* If hsz2 is a not found, return hsz2 is "zero string". */ - ret = 1; - } - else - { - /* Compare the two strings we got (case insensitive). */ - ret = lstrcmpiW(psz1, psz2); - /* Since strcmp returns any number smaller than - * 0 when the first string is found to be less than - * the second one we must make sure we are returning - * the proper values. - */ - if (ret < 0) - { - ret = -1; - } - else if (ret > 0) - { - ret = 1; - } - } - - return ret; -} - -/* ================================================================ - * - * Instance management - * - * ================================================================ */ - -/****************************************************************************** - * IncrementInstanceId - * - * generic routine to increment the max instance Id and allocate a new application instance - */ -static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) -{ - DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); - - pInstance->instanceID = id; - TRACE("New instance id %d allocated\n", id); -} - -/****************************************************************** - * WDML_EventProc - * - * - */ -static LRESULT CALLBACK WDML_EventProc(HWND hwndEvent, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - WDML_INSTANCE* pInstance; - HSZ hsz1, hsz2; - - switch (uMsg) - { - case WM_WDML_REGISTER: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - /* try calling the Callback */ - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_REGISTRATIONS)) - { - hsz1 = WDML_MakeHszFromAtom(pInstance, wParam); - hsz2 = WDML_MakeHszFromAtom(pInstance, lParam); - WDML_InvokeCallback(pInstance, XTYP_REGISTER, 0, 0, hsz1, hsz2, 0, 0, 0); - WDML_DecHSZ(pInstance, hsz1); - WDML_DecHSZ(pInstance, hsz2); - } - break; - - case WM_WDML_UNREGISTER: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_UNREGISTRATIONS)) - { - hsz1 = WDML_MakeHszFromAtom(pInstance, wParam); - hsz2 = WDML_MakeHszFromAtom(pInstance, lParam); - WDML_InvokeCallback(pInstance, XTYP_UNREGISTER, 0, 0, hsz1, hsz2, 0, 0, 0); - WDML_DecHSZ(pInstance, hsz1); - WDML_DecHSZ(pInstance, hsz2); - } - break; - - case WM_WDML_CONNECT_CONFIRM: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_CONNECT_CONFIRMS)) - { - WDML_CONV* pConv; - /* confirm connection... - * lookup for this conv handle - */ - HWND client = (HWND)wParam; - HWND server = (HWND)lParam; - for (pConv = pInstance->convs[WDML_SERVER_SIDE]; pConv != NULL; pConv = pConv->next) - { - if (pConv->hwndClient == client && pConv->hwndServer == server) - break; - } - if (pConv) - { - pConv->wStatus |= ST_ISLOCAL; - - WDML_InvokeCallback(pInstance, XTYP_CONNECT_CONFIRM, 0, (HCONV)pConv, - pConv->hszTopic, pConv->hszService, 0, 0, - (pConv->wStatus & ST_ISSELF) ? 1 : 0); - } - } - break; - default: - return DefWindowProcW(hwndEvent, uMsg, wParam, lParam); - } - return 0; -} - -/****************************************************************** - * WDML_Initialize - * - * - */ -UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode) -{ - WDML_INSTANCE* pInstance; - WDML_INSTANCE* reference_inst; - UINT ret; - WNDCLASSEXW wndclass; - - TRACE("(%p,%p,0x%x,%d,0x%x)\n", - pidInst, pfnCallback, afCmd, ulRes, bUnicode); - - if (ulRes) - { - ERR("Reserved value not zero? What does this mean?\n"); - /* trap this and no more until we know more */ - return DMLERR_INVALIDPARAMETER; - } - - /* grab enough heap for one control struct - not really necessary for re-initialise - * but allows us to use same validation routines */ - pInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_INSTANCE)); - if (pInstance == NULL) - { - /* catastrophe !! warn user & abort */ - ERR("Instance create failed - out of memory\n"); - return DMLERR_SYS_ERROR; - } - pInstance->next = NULL; - pInstance->monitor = (afCmd | APPCLASS_MONITOR); - - /* messy bit, spec implies that 'Client Only' can be set in 2 different ways, catch 1 here */ - - pInstance->clientOnly = afCmd & APPCMD_CLIENTONLY; - pInstance->instanceID = *pidInst; /* May need to add calling proc Id */ - pInstance->threadID = GetCurrentThreadId(); - pInstance->callback = *pfnCallback; - pInstance->unicode = bUnicode; - pInstance->nodeList = NULL; /* node will be added later */ - pInstance->monitorFlags = afCmd & MF_MASK; - pInstance->wStatus = 0; - pInstance->lastError = DMLERR_NO_ERROR; - pInstance->servers = NULL; - pInstance->convs[0] = NULL; - pInstance->convs[1] = NULL; - pInstance->links[0] = NULL; - pInstance->links[1] = NULL; - - /* isolate CBF flags in one go, expect this will go the way of all attempts to be clever !! */ - - pInstance->CBFflags = afCmd^((afCmd&MF_MASK)|((afCmd&APPCMD_MASK)|(afCmd&APPCLASS_MASK))); - - if (!pInstance->clientOnly) - { - /* Check for other way of setting Client-only !! */ - pInstance->clientOnly = - (pInstance->CBFflags & CBF_FAIL_ALLSVRXACTIONS) == CBF_FAIL_ALLSVRXACTIONS; - } - - ERR("instance created - checking validity\n"); - - if (*pidInst == 0) - { - /* Initialisation of new Instance Identifier */ - ERR("new instance, callback %p flags %X\n",pfnCallback,afCmd); - - EnterCriticalSection(&WDML_CritSect); - - if (WDML_InstanceList == NULL) - { - /* can't be another instance in this case, assign to the base pointer */ - WDML_InstanceList = pInstance; - - /* since first must force filter of XTYP_CONNECT and XTYP_WILDCONNECT for - * present - * ------------------------------- NOTE NOTE NOTE -------------------------- - * - * the manual is not clear if this condition - * applies to the first call to DdeInitialize from an application, or the - * first call for a given callback !!! - */ - - pInstance->CBFflags = pInstance->CBFflags|APPCMD_FILTERINITS; - ERR("First application instance detected OK\n"); - /* allocate new instance ID */ - WDML_IncrementInstanceId(pInstance); - } - else - { - /* really need to chain the new one in to the latest here, but after checking conditions - * such as trying to start a conversation from an application trying to monitor */ - reference_inst = WDML_InstanceList; - ERR("Subsequent application instance - starting checks\n"); - while (reference_inst->next != NULL) - { - /* - * This set of tests will work if application uses same instance Id - * at application level once allocated - which is what manual implies - * should happen. If someone tries to be - * clever (lazy ?) it will fail to pick up that later calls are for - * the same application - should we trust them ? - */ - if (pInstance->instanceID == reference_inst->instanceID) - { - /* Check 1 - must be same Client-only state */ - - if (pInstance->clientOnly != reference_inst->clientOnly) - { - ERR("WDML_Initialize Mustbe Client-only\n"); - ret = DMLERR_DLL_USAGE; - goto theError; - } - - /* Check 2 - cannot use 'Monitor' with any non-monitor modes */ - - if (pInstance->monitor != reference_inst->monitor) - { - ERR("WDML_Initialize cannot use monitor w/any modes\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - - /* Check 3 - must supply different callback address */ - - if (pInstance->callback == reference_inst->callback) - { - ret = DMLERR_DLL_USAGE; - goto theError; - } - } - reference_inst = reference_inst->next; - } - /* All cleared, add to chain */ - - ERR("Application Instance checks finished\n"); - WDML_IncrementInstanceId(pInstance); - reference_inst->next = pInstance; - } - LeaveCriticalSection(&WDML_CritSect); - - *pidInst = pInstance->instanceID; - - /* for deadlock issues, windows must always be created when outside the critical section */ - wndclass.cbSize = sizeof(wndclass); - wndclass.style = 0; - wndclass.lpfnWndProc = WDML_EventProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof(ULONG_PTR); - wndclass.hInstance = 0; - wndclass.hIcon = 0; - wndclass.hCursor = 0; - wndclass.hbrBackground = 0; - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = WDML_szEventClass; - wndclass.hIconSm = 0; - - RegisterClassExW(&wndclass); - - pInstance->hwndEvent = CreateWindowW(WDML_szEventClass, NULL, - WS_POPUP, 0, 0, 0, 0, - 0, 0, 0, 0); - - SetWindowLongPtrW(pInstance->hwndEvent, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); - - ERR("New application instance processing finished OK\n"); - } - else - { - /* Reinitialisation situation --- FIX */ - ERR("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); - - EnterCriticalSection(&WDML_CritSect); - - if (WDML_InstanceList == NULL) - { - ERR("WDML_Initialize No instance list\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - /* can't reinitialise if we have initialised nothing !! */ - reference_inst = WDML_InstanceList; - /* must first check if we have been given a valid instance to re-initialise !! how do we do that ? */ - /* - * MS allows initialisation without specifying a callback, should we allow addition of the - * callback by a later call to initialise ? - if so this lot will have to change - */ - while (reference_inst->next != NULL) - { - if (*pidInst == reference_inst->instanceID && pfnCallback == reference_inst->callback) - { - /* Check 1 - cannot change client-only mode if set via APPCMD_CLIENTONLY */ - - if (reference_inst->clientOnly) - { - if ((reference_inst->CBFflags & CBF_FAIL_ALLSVRXACTIONS) != CBF_FAIL_ALLSVRXACTIONS) - { - /* i.e. Was set to Client-only and through APPCMD_CLIENTONLY */ - - if (!(afCmd & APPCMD_CLIENTONLY)) - { - ERR("WDML_Initialize AppCmd Client-only 2\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - } - } - /* Check 2 - cannot change monitor modes */ - - if (pInstance->monitor != reference_inst->monitor) - { - ERR("WDML_Initialize cannot change monitor modes 2\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - - /* Check 3 - trying to set Client-only via APPCMD when not set so previously */ - - if ((afCmd&APPCMD_CLIENTONLY) && !reference_inst->clientOnly) - { - ERR("WDML_Initialize trying to set Client-only via APPCMD\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - break; - } - reference_inst = reference_inst->next; - } - if (reference_inst->next == NULL) - { - ERR("WDML_Initialize Nothing Next\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - /* All checked - change relevant flags */ - - reference_inst->CBFflags = pInstance->CBFflags; - reference_inst->clientOnly = pInstance->clientOnly; - reference_inst->monitorFlags = pInstance->monitorFlags; - - HeapFree(GetProcessHeap(), 0, pInstance); /* finished - release heap space used as work store */ - - LeaveCriticalSection(&WDML_CritSect); - } - - return DMLERR_NO_ERROR; - theError: - ERR("WDML_Initialize error %x\n",ret); - HeapFree(GetProcessHeap(), 0, pInstance); - LeaveCriticalSection(&WDML_CritSect); - return ret; -} - -/****************************************************************************** - * DdeInitializeA (USER32.@) - * - * See DdeInitializeW. - */ -UINT WINAPI DdeInitializeA(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes) -{ - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE); -} - -/****************************************************************************** - * DdeInitializeW [USER32.@] - * Registers an application with the DDEML - * - * PARAMS - * pidInst [I] Pointer to instance identifier - * pfnCallback [I] Pointer to callback function - * afCmd [I] Set of command and filter flags - * ulRes [I] Reserved - * - * RETURNS - * Success: DMLERR_NO_ERROR - * Failure: DMLERR_DLL_USAGE, DMLERR_INVALIDPARAMETER, DMLERR_SYS_ERROR - */ -UINT WINAPI DdeInitializeW(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes) -{ - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE); -} - -/***************************************************************** - * DdeUninitialize [USER32.@] Frees DDEML resources - * - * PARAMS - * idInst [I] Instance identifier - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ - -BOOL WINAPI DdeUninitialize(DWORD idInst) -{ - /* Stage one - check if we have a handle for this instance - */ - WDML_INSTANCE* pInstance; - WDML_CONV* pConv; - WDML_CONV* pConvNext; - - TRACE("(%d)\n", idInst); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - /* - * Needs something here to record NOT_INITIALIZED ready for DdeGetLastError - */ - return FALSE; - } - - /* first terminate all conversations client side - * this shall close existing links... - */ - for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv != NULL; pConv = pConvNext) - { - pConvNext = pConv->next; - DdeDisconnect((HCONV)pConv); - } - if (pInstance->convs[WDML_CLIENT_SIDE]) - FIXME("still pending conversations\n"); - - /* then unregister all known service names */ - DdeNameService(idInst, 0, 0, DNS_UNREGISTER); - - /* Free the nodes that were not freed by this instance - * and remove the nodes from the list of HSZ nodes. - */ - WDML_FreeAllHSZ(pInstance); - - DestroyWindow(pInstance->hwndEvent); - - /* OK now delete the instance handle itself */ - - if (WDML_InstanceList == pInstance) - { - /* special case - the first/only entry */ - WDML_InstanceList = pInstance->next; - } - else - { - /* general case, remove entry */ - WDML_INSTANCE* inst; - - for (inst = WDML_InstanceList; inst->next != pInstance; inst = inst->next); - inst->next = pInstance->next; - } - /* release the heap entry - */ - HeapFree(GetProcessHeap(), 0, pInstance); - - return TRUE; -} - -/****************************************************************** - * WDML_NotifyThreadExit - * - * - */ -void WDML_NotifyThreadDetach(void) -{ - WDML_INSTANCE* pInstance; - WDML_INSTANCE* next; - DWORD tid = GetCurrentThreadId(); - - EnterCriticalSection(&WDML_CritSect); - for (pInstance = WDML_InstanceList; pInstance != NULL; pInstance = next) - { - next = pInstance->next; - if (pInstance->threadID == tid) - { - LeaveCriticalSection(&WDML_CritSect); - DdeUninitialize(pInstance->instanceID); - EnterCriticalSection(&WDML_CritSect); - } - } - LeaveCriticalSection(&WDML_CritSect); -} - -/****************************************************************** - * WDML_InvokeCallback - * - * - */ -HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, HCONV hConv, - HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - ULONG_PTR dwData1, ULONG_PTR dwData2) -{ - HDDEDATA ret; - - if (pInstance == NULL) - return NULL; - - TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", - pInstance->callback, uType, uFmt, - hConv, hsz1, hsz2, hdata, dwData1, dwData2); - ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); - TRACE("done => %p\n", ret); - return ret; -} - -/***************************************************************************** - * WDML_GetInstance - * - * generic routine to return a pointer to the relevant DDE_HANDLE_ENTRY - * for an instance Id, or NULL if the entry does not exist - * - */ -WDML_INSTANCE* WDML_GetInstance(DWORD instId) -{ - WDML_INSTANCE* pInstance; - - EnterCriticalSection(&WDML_CritSect); - - for (pInstance = WDML_InstanceList; pInstance != NULL; pInstance = pInstance->next) - { - if (pInstance->instanceID == instId) - { - if (GetCurrentThreadId() != pInstance->threadID) - { - FIXME("Tried to get instance from wrong thread\n"); - continue; - } - break; - } - } - - LeaveCriticalSection(&WDML_CritSect); - - if (!pInstance) - WARN("Instance entry missing for id %04x\n", instId); - return pInstance; -} - -/****************************************************************** - * WDML_GetInstanceFromWnd - * - * - */ -WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd) -{ - return (WDML_INSTANCE*)GetWindowLongPtrW(hWnd, GWL_WDML_INSTANCE); -} - -/* ================================================================ - * - * Data handle management - * - * ================================================================ */ - -/***************************************************************** - * DdeCreateDataHandle (USER32.@) - */ -HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD cbOff, - HSZ hszItem, UINT wFmt, UINT afCmd) -{ - - /* Other than check for validity we will ignore for now idInst, hszItem. - * The purpose of these arguments still need to be investigated. - */ - - WDML_INSTANCE* pInstance; - HGLOBAL hMem; - LPBYTE pByte; - DDE_DATAHANDLE_HEAD* pDdh; - WCHAR psz[MAX_BUFFER_LEN]; - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - return NULL; - } - - if (!GetAtomNameW(HSZ2ATOM(hszItem), psz, MAX_BUFFER_LEN)) - { - psz[0] = HSZ2ATOM(hszItem); - psz[1] = 0; - } - - TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", - idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); - - if (afCmd != 0 && afCmd != HDATA_APPOWNED) - return 0; - - /* we use the first 4 bytes to store the size */ - if (!(hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cb + cbOff + sizeof(DDE_DATAHANDLE_HEAD)))) - { - ERR("GlobalAlloc failed\n"); - return 0; - } - - pDdh = GlobalLock(hMem); - if (!pDdh) - { - GlobalFree(hMem); - return 0; - } - - pDdh->cfFormat = wFmt; - pDdh->bAppOwned = (afCmd == HDATA_APPOWNED); - - pByte = (LPBYTE)(pDdh + 1); - if (pSrc) - { - memcpy(pByte, pSrc + cbOff, cb); - } - GlobalUnlock(hMem); - - TRACE("=> %p\n", hMem); - return hMem; -} - -/***************************************************************** - * - * DdeAddData (USER32.@) - */ -HDDEDATA WINAPI DdeAddData(HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff) -{ - DWORD old_sz, new_sz; - LPBYTE pDst; - - TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); - - pDst = DdeAccessData(hData, &old_sz); - if (!pDst) return 0; - - new_sz = cb + cbOff; - if (new_sz > old_sz) - { - DdeUnaccessData(hData); - hData = GlobalReAlloc(hData, new_sz + sizeof(DDE_DATAHANDLE_HEAD), - GMEM_MOVEABLE | GMEM_DDESHARE); - pDst = DdeAccessData(hData, &old_sz); - } - - if (!pDst) return 0; - - memcpy(pDst + cbOff, pSrc, cb); - DdeUnaccessData(hData); - return hData; -} - -/****************************************************************************** - * DdeGetData [USER32.@] Copies data from DDE object to local buffer - * - * - * PARAMS - * hData [I] Handle to DDE object - * pDst [I] Pointer to destination buffer - * cbMax [I] Amount of data to copy - * cbOff [I] Offset to beginning of data - * - * RETURNS - * Size of memory object associated with handle - */ -DWORD WINAPI DdeGetData(HDDEDATA hData, LPBYTE pDst, DWORD cbMax, DWORD cbOff) -{ - DWORD dwSize, dwRet; - LPBYTE pByte; - - TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); - - pByte = DdeAccessData(hData, &dwSize); - - if (pByte) - { - if (!pDst) - { - dwRet = dwSize; - } - else if (cbOff + cbMax < dwSize) - { - dwRet = cbMax; - } - else if (cbOff < dwSize) - { - dwRet = dwSize - cbOff; - } - else - { - dwRet = 0; - } - if (pDst && dwRet != 0) - { - memcpy(pDst, pByte + cbOff, dwRet); - } - DdeUnaccessData(hData); - } - else - { - dwRet = 0; - } - return dwRet; -} - -/***************************************************************** - * DdeAccessData (USER32.@) - */ -LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize) -{ - HGLOBAL hMem = hData; - DDE_DATAHANDLE_HEAD* pDdh; - - TRACE("(%p,%p)\n", hData, pcbDataSize); - - pDdh = GlobalLock(hMem); - if (pDdh == NULL) - { - ERR("Failed on GlobalLock(%p)\n", hMem); - return 0; - } - - if (pcbDataSize != NULL) - { - *pcbDataSize = GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD); - } - TRACE("=> %p (%lu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); - return (LPBYTE)(pDdh + 1); -} - -/***************************************************************** - * DdeUnaccessData (USER32.@) - */ -BOOL WINAPI DdeUnaccessData(HDDEDATA hData) -{ - HGLOBAL hMem = hData; - - TRACE("(%p)\n", hData); - - GlobalUnlock(hMem); - - return TRUE; -} - -/***************************************************************** - * DdeFreeDataHandle (USER32.@) - */ -BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) -{ - TRACE("(%p)\n", hData); - - /* 1 is the handle value returned by an asynchronous operation. */ - if (hData == (HDDEDATA)1) - return TRUE; - - return GlobalFree(hData) == 0; -} - -/****************************************************************** - * WDML_IsAppOwned - * - * - */ -BOOL WDML_IsAppOwned(HDDEDATA hData) -{ - DDE_DATAHANDLE_HEAD* pDdh; - BOOL ret = FALSE; - - pDdh = GlobalLock(hData); - if (pDdh != NULL) - { - ret = pDdh->bAppOwned; - GlobalUnlock(hData); - } - return ret; -} - -/* ================================================================ - * - * Global <=> Data handle management - * - * ================================================================ */ - -/* Note: we use a DDEDATA, but layout of DDEDATA, DDEADVISE and DDEPOKE structures is similar: - * offset size - * (bytes) (bits) comment - * 0 16 bit fields for options (release, ackreq, response...) - * 2 16 clipboard format - * 4 ? data to be used - */ -HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* p) -{ - DDEDATA* pDd; - HDDEDATA ret = 0; - DWORD size; - - if (hMem) - { - pDd = GlobalLock(hMem); - size = GlobalSize(hMem) - sizeof(WINE_DDEHEAD); - if (pDd) - { - if (p) memcpy(p, pDd, sizeof(WINE_DDEHEAD)); - switch (pDd->cfFormat) - { - default: - FIXME("Unsupported format (%04x) for data %p, passing raw information\n", - pDd->cfFormat, hMem); - /* fall through */ - case 0: - case CF_TEXT: - ret = DdeCreateDataHandle(pConv->instance->instanceID, pDd->Value, size, 0, 0, pDd->cfFormat, 0); - break; - case CF_BITMAP: - if (size >= sizeof(BITMAP)) - { - BITMAP* bmp = (BITMAP*)pDd->Value; - int count = bmp->bmWidthBytes * bmp->bmHeight * bmp->bmPlanes; - if (size >= sizeof(BITMAP) + count) - { - HBITMAP hbmp; - - if ((hbmp = CreateBitmap(bmp->bmWidth, bmp->bmHeight, - bmp->bmPlanes, bmp->bmBitsPixel, - pDd->Value + sizeof(BITMAP)))) - { - ret = DdeCreateDataHandle(pConv->instance->instanceID, (LPBYTE)&hbmp, sizeof(hbmp), - 0, 0, CF_BITMAP, 0); - } - else ERR("Can't create bmp\n"); - } - else - { - ERR("Wrong count: %u / %d\n", size, count); - } - } else ERR("No bitmap header\n"); - break; - } - GlobalUnlock(hMem); - } - } - return ret; -} - -/****************************************************************** - * WDML_DataHandle2Global - * - * - */ -HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, - BOOL fDeferUpd, BOOL fAckReq) -{ - DDE_DATAHANDLE_HEAD* pDdh; - DWORD dwSize; - HGLOBAL hMem = 0; - - dwSize = GlobalSize(hDdeData) - sizeof(DDE_DATAHANDLE_HEAD); - pDdh = GlobalLock(hDdeData); - if (dwSize && pDdh) - { - WINE_DDEHEAD* wdh = NULL; - - switch (pDdh->cfFormat) - { - default: - FIXME("Unsupported format (%04x) for data %p, passing raw information\n", - pDdh->cfFormat, hDdeData); - /* fall through */ - case 0: - case CF_TEXT: - hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(WINE_DDEHEAD) + dwSize); - if (hMem && (wdh = GlobalLock(hMem))) - { - memcpy(wdh + 1, pDdh + 1, dwSize); - } - break; - case CF_BITMAP: - if (dwSize >= sizeof(HBITMAP)) - { - BITMAP bmp; - DWORD count; - HBITMAP hbmp = *(HBITMAP*)(pDdh + 1); - - if (GetObjectW(hbmp, sizeof(bmp), &bmp)) - { - count = bmp.bmWidthBytes * bmp.bmHeight; - hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, - sizeof(WINE_DDEHEAD) + sizeof(bmp) + count); - if (hMem && (wdh = GlobalLock(hMem))) - { - memcpy(wdh + 1, &bmp, sizeof(bmp)); - GetBitmapBits(hbmp, count, ((char*)(wdh + 1)) + sizeof(bmp)); - } - } - } - break; - } - if (wdh) - { - wdh->unused = 0; - wdh->fResponse = fResponse; - wdh->fRelease = fRelease; - wdh->fDeferUpd = fDeferUpd; - wdh->fAckReq = fAckReq; - wdh->cfFormat = pDdh->cfFormat; - GlobalUnlock(hMem); - } - GlobalUnlock(hDdeData); - } - - return hMem; -} - -/* ================================================================ - * - * Server management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddServer - * - * - */ -WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - static const WCHAR fmtW[] = {'%','s','(','0','x','%','*','x',')',0}; - WDML_SERVER* pServer; - WCHAR buf1[256]; - WCHAR buf2[256]; - - pServer = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_SERVER)); - if (pServer == NULL) return NULL; - - pServer->hszService = hszService; - WDML_IncHSZ(pInstance, hszService); - - DdeQueryStringW(pInstance->instanceID, hszService, buf1, 256, CP_WINUNICODE); - snprintfW(buf2, 256, fmtW, buf1, 2*sizeof(ULONG_PTR), GetCurrentProcessId()); - pServer->hszServiceSpec = DdeCreateStringHandleW(pInstance->instanceID, buf2, CP_WINUNICODE); - - pServer->atomService = WDML_MakeAtomFromHsz(pServer->hszService); - pServer->atomServiceSpec = WDML_MakeAtomFromHsz(pServer->hszServiceSpec); - - pServer->filterOn = TRUE; - - pServer->next = pInstance->servers; - pInstance->servers = pServer; - return pServer; -} - -/****************************************************************** - * WDML_RemoveServer - * - * - */ -void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - WDML_SERVER* pPrev = NULL; - WDML_SERVER* pServer = NULL; - WDML_CONV* pConv; - WDML_CONV* pConvNext; - - pServer = pInstance->servers; - - while (pServer != NULL) - { - if (DdeCmpStringHandles(pServer->hszService, hszService) == 0) - { - WDML_BroadcastDDEWindows(WDML_szEventClass, WM_WDML_UNREGISTER, - pServer->atomService, pServer->atomServiceSpec); - /* terminate all conversations for given topic */ - for (pConv = pInstance->convs[WDML_SERVER_SIDE]; pConv != NULL; pConv = pConvNext) - { - pConvNext = pConv->next; - if (DdeCmpStringHandles(pConv->hszService, hszService) == 0) - { - HWND client = pConv->hwndClient, server = pConv->hwndServer; - WDML_RemoveConv(pConv, WDML_SERVER_SIDE); - /* don't care about return code (whether client window is present or not) */ - PostMessageW(client, WM_DDE_TERMINATE, (WPARAM)server, 0); - } - } - if (pServer == pInstance->servers) - { - pInstance->servers = pServer->next; - } - else - { - pPrev->next = pServer->next; - } - - DestroyWindow(pServer->hwndServer); - WDML_DecHSZ(pInstance, pServer->hszServiceSpec); - WDML_DecHSZ(pInstance, pServer->hszService); - - GlobalDeleteAtom(pServer->atomService); - GlobalDeleteAtom(pServer->atomServiceSpec); - - HeapFree(GetProcessHeap(), 0, pServer); - break; - } - - pPrev = pServer; - pServer = pServer->next; - } -} - -/***************************************************************************** - * WDML_FindServer - * - * generic routine to return a pointer to the relevant ServiceNode - * for a given service name, or NULL if the entry does not exist - * - */ -WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - WDML_SERVER* pServer; - - for (pServer = pInstance->servers; pServer != NULL; pServer = pServer->next) - { - if (hszService == pServer->hszService) - { - return pServer; - } - } - TRACE("Service name missing\n"); - return NULL; -} - -/* ================================================================ - * - * Link (hot & warm) management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddLink - * - * - */ -void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - UINT wType, HSZ hszItem, UINT wFmt) -{ - WDML_LINK* pLink; - - pLink = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_LINK)); - if (pLink == NULL) - { - ERR("OOM\n"); - return; - } - - pLink->hConv = hConv; - pLink->transactionType = wType; - WDML_IncHSZ(pInstance, pLink->hszItem = hszItem); - pLink->uFmt = wFmt; - pLink->next = pInstance->links[side]; - pInstance->links[side] = pLink; -} - -/****************************************************************** - * WDML_RemoveLink - * - * - */ -void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, UINT uFmt) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - pCurrent->uFmt == uFmt) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - HeapFree(GetProcessHeap(), 0, pCurrent); - break; - } - - pPrev = pCurrent; - pCurrent = pCurrent->next; - } -} - -/* this function is called to remove all links related to the conv. - It should be called from both client and server when terminating - the conversation. -*/ -/****************************************************************** - * WDML_RemoveAllLinks - * - * - */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - WDML_LINK* pNext = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == (HCONV)pConv) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - pNext = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - pNext = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - - HeapFree(GetProcessHeap(), 0, pCurrent); - pCurrent = NULL; - } - - if (pCurrent) - { - pPrev = pCurrent; - pCurrent = pCurrent->next; - } - else - { - pCurrent = pNext; - } - } -} - -/****************************************************************** - * WDML_FindLink - * - * - */ -WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, BOOL use_fmt, UINT uFmt) -{ - WDML_LINK* pCurrent = NULL; - - for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) - { - /* we don't need to check for transaction type as it can be altered */ - - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - (!use_fmt || pCurrent->uFmt == uFmt)) - { - break; - } - - } - - return pCurrent; -} - -/* ================================================================ - * - * Transaction management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AllocTransaction - * - * Alloc a transaction structure for handling the message ddeMsg - */ -WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, - UINT wFmt, HSZ hszItem) -{ - WDML_XACT* pXAct; - static WORD tid = 1; /* FIXME: wrap around */ - - pXAct = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_XACT)); - if (!pXAct) - { - pInstance->lastError = DMLERR_MEMORY_ERROR; - return NULL; - } - - pXAct->xActID = tid++; - pXAct->ddeMsg = ddeMsg; - pXAct->hDdeData = 0; - pXAct->hUser = 0; - pXAct->next = NULL; - pXAct->wType = 0; - pXAct->wFmt = wFmt; - if ((pXAct->hszItem = hszItem)) WDML_IncHSZ(pInstance, pXAct->hszItem); - pXAct->atom = 0; - pXAct->hMem = 0; - pXAct->lParam = 0; - - return pXAct; -} - -/****************************************************************** - * WDML_QueueTransaction - * - * Adds a transaction to the list of transaction - */ -void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - /* advance to last in queue */ - for (pt = &pConv->transactions; *pt != NULL; pt = &(*pt)->next); - *pt = pXAct; -} - -/****************************************************************** - * WDML_UnQueueTransaction - * - * - */ -BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - for (pt = &pConv->transactions; *pt; pt = &(*pt)->next) - { - if (*pt == pXAct) - { - *pt = pXAct->next; - return TRUE; - } - } - return FALSE; -} - -/****************************************************************** - * WDML_FreeTransaction - * - * - */ -void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) -{ - /* free pmt(s) in pXAct too. check against one for not deleting TRUE return values */ - if (doFreePmt && (ULONG_PTR)pXAct->hMem > 1) - { - GlobalFree(pXAct->hMem); - } - if (pXAct->hszItem) WDML_DecHSZ(pInstance, pXAct->hszItem); - - HeapFree(GetProcessHeap(), 0, pXAct); -} - -/****************************************************************** - * WDML_FindTransaction - * - * - */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) -{ - WDML_XACT* pXAct; - - tid = HIWORD(tid); - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { - if (pXAct->xActID == tid) - break; - } - return pXAct; -} - -/* ================================================================ - * - * Conversation management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddConv - * - * - */ -WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer) -{ - WDML_CONV* pConv; - - /* no conversation yet, add it */ - pConv = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_CONV)); - if (!pConv) return NULL; - - pConv->instance = pInstance; - WDML_IncHSZ(pInstance, pConv->hszService = hszService); - WDML_IncHSZ(pInstance, pConv->hszTopic = hszTopic); - pConv->magic = WDML_CONV_MAGIC; - pConv->hwndServer = hwndServer; - pConv->hwndClient = hwndClient; - pConv->transactions = NULL; - pConv->hUser = 0; - pConv->wStatus = (side == WDML_CLIENT_SIDE) ? ST_CLIENT : 0L; - pConv->wStatus |= pInstance->wStatus; - /* check if both side of the conversation are of the same instance */ - if (GetWindowThreadProcessId(hwndClient, NULL) == GetWindowThreadProcessId(hwndServer, NULL) && - WDML_GetInstanceFromWnd(hwndClient) == WDML_GetInstanceFromWnd(hwndServer)) - { - pConv->wStatus |= ST_ISSELF; - } - pConv->wConvst = XST_NULL; - - pConv->next = pInstance->convs[side]; - pInstance->convs[side] = pConv; - - TRACE("pConv->wStatus %04x pInstance(%p)\n", pConv->wStatus, pInstance); - - return pConv; -} - -/****************************************************************** - * WDML_FindConv - * - * - */ -WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic) -{ - WDML_CONV* pCurrent = NULL; - - for (pCurrent = pInstance->convs[side]; pCurrent != NULL; pCurrent = pCurrent->next) - { - if (DdeCmpStringHandles(pCurrent->hszService, hszService) == 0 && - DdeCmpStringHandles(pCurrent->hszTopic, hszTopic) == 0) - { - return pCurrent; - } - - } - return NULL; -} - -/****************************************************************** - * WDML_RemoveConv - * - * - */ -void WDML_RemoveConv(WDML_CONV* pRef, WDML_SIDE side) -{ - WDML_CONV* pPrev = NULL; - WDML_CONV* pCurrent; - WDML_XACT* pXAct; - WDML_XACT* pXActNext; - HWND hWnd; - - if (!pRef) - return; - - /* remove any pending transaction */ - for (pXAct = pRef->transactions; pXAct != NULL; pXAct = pXActNext) - { - pXActNext = pXAct->next; - WDML_FreeTransaction(pRef->instance, pXAct, TRUE); - } - - WDML_RemoveAllLinks(pRef->instance, pRef, side); - - /* FIXME: should we keep the window around ? it seems so (at least on client side - * to let QueryConvInfo work after conv termination, but also to implement - * DdeReconnect... - */ - /* destroy conversation window, but first remove pConv from hWnd. - * this would help the wndProc do appropriate handling upon a WM_DESTROY message - */ - hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer; - SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0); - - DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); - - WDML_DecHSZ(pRef->instance, pRef->hszService); - WDML_DecHSZ(pRef->instance, pRef->hszTopic); - - for (pCurrent = pRef->instance->convs[side]; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) - { - if (pCurrent == pRef) - { - if (pCurrent == pRef->instance->convs[side]) - { - pRef->instance->convs[side] = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - pCurrent->magic = 0; - HeapFree(GetProcessHeap(), 0, pCurrent); - break; - } - } -} - -/****************************************************************** - * WDML_EnableCallback - */ -static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) -{ - if (wCmd == EC_DISABLE) - { - pConv->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: conv %p status flags %04x\n", pConv, pConv->wStatus); - return TRUE; - } - - if (wCmd == EC_QUERYWAITING) - return pConv->transactions != NULL; - - if (wCmd != EC_ENABLEALL && wCmd != EC_ENABLEONE) - { - FIXME("Unknown command code %04x\n", wCmd); - return FALSE; - } - - if (wCmd == EC_ENABLEALL) - { - pConv->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: conv %p status flags %04x\n", pConv, pConv->wStatus); - } - - while (pConv->transactions) - { - WDML_XACT *pXAct = pConv->transactions; - - if (pConv->wStatus & ST_CLIENT) - { - /* transaction should be in the queue until handled */ - WDML_ClientHandle(pConv, pXAct, 0, NULL); - WDML_UnQueueTransaction(pConv, pXAct); - } - else - { - /* transaction should be removed from the queue before handling */ - WDML_UnQueueTransaction(pConv, pXAct); - WDML_ServerHandle(pConv, pXAct); - } - - WDML_FreeTransaction(pConv->instance, pXAct, TRUE); - - if (wCmd == EC_ENABLEONE) break; - } - return TRUE; -} - -/***************************************************************** - * DdeEnableCallback (USER32.@) - */ -BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) -{ - BOOL ret = FALSE; - WDML_CONV *pConv; - - TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); - - if (hConv) - { - pConv = WDML_GetConv(hConv, TRUE); - - if (pConv && pConv->instance->instanceID == idInst) - ret = WDML_EnableCallback(pConv, wCmd); - } - else - { - WDML_INSTANCE *pInstance = WDML_GetInstance(idInst); - - if (!pInstance) - return FALSE; - - TRACE("adding flags %04x to instance %p\n", wCmd, pInstance); - pInstance->wStatus |= wCmd; - - if (wCmd == EC_DISABLE) - { - pInstance->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: inst %p status flags %04x\n", pInstance, pInstance->wStatus); - } - else if (wCmd == EC_ENABLEALL) - { - pInstance->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: inst %p status flags %04x\n", pInstance, pInstance->wStatus); - } - - ret = TRUE; - - for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv != NULL; pConv = pConv->next) - { - ret = WDML_EnableCallback(pConv, wCmd); - if (ret && wCmd == EC_QUERYWAITING) break; - } - } - - return ret; -} - -/****************************************************************** - * WDML_GetConv - * - * - */ -WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected) -{ - WDML_CONV* pConv = (WDML_CONV*)hConv; - - /* FIXME: should do better checking */ - if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL; - - if (!pConv->instance) - { - WARN("wrong thread ID, no instance\n"); - return NULL; - } - - if (pConv->instance->threadID != GetCurrentThreadId()) - { - WARN("wrong thread ID\n"); - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */ - return NULL; - } - - if (checkConnected && !(pConv->wStatus & ST_CONNECTED)) - { - WARN("found conv but ain't connected\n"); - pConv->instance->lastError = DMLERR_NO_CONV_ESTABLISHED; - return NULL; - } - - return pConv; -} - -/****************************************************************** - * WDML_GetConvFromWnd - * - * - */ -WDML_CONV* WDML_GetConvFromWnd(HWND hWnd) -{ - return (WDML_CONV*)GetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION); -} - -/****************************************************************** - * WDML_PostAck - * - * - */ -BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg) -{ - DDEACK ddeAck; - HWND from, to; - - if (side == WDML_SERVER_SIDE) - { - from = pConv->hwndServer; - to = pConv->hwndClient; - } - else - { - to = pConv->hwndServer; - from = pConv->hwndClient; - } - - ddeAck.bAppReturnCode = appRetCode; - ddeAck.reserved = 0; - ddeAck.fBusy = fBusy; - ddeAck.fAck = fAck; - - TRACE("Posting a %s ack\n", ddeAck.fAck ? "positive" : "negative"); - - lParam = (lParam) ? ReuseDDElParam(lParam, oldMsg, WM_DDE_ACK, *(WORD*)&ddeAck, pmt) : - PackDDElParam(WM_DDE_ACK, *(WORD*)&ddeAck, pmt); - if (!PostMessageW(to, WM_DDE_ACK, (WPARAM)from, lParam)) - { - pConv->wStatus &= ~ST_CONNECTED; - pConv->instance->lastError = DMLERR_POSTMSG_FAILED; - FreeDDElParam(WM_DDE_ACK, lParam); - return FALSE; - } - return TRUE; -} - -/***************************************************************** - * DdeSetUserHandle (USER32.@) - */ -BOOL WINAPI DdeSetUserHandle(HCONV hConv, DWORD id, DWORD hUser) -{ - WDML_CONV* pConv; - - pConv = WDML_GetConv(hConv, FALSE); - if (pConv == NULL) - return FALSE; - - if (id == QID_SYNC) - { - pConv->hUser = hUser; - } - else - { - WDML_XACT* pXAct; - - pXAct = WDML_FindTransaction(pConv, id); - if (pXAct) - { - pXAct->hUser = hUser; - } - else - { - pConv->instance->lastError = DMLERR_UNFOUND_QUEUE_ID; - return FALSE; - } - } - return TRUE; -} - -/****************************************************************** - * WDML_GetLocalConvInfo - * - * - */ -static BOOL WDML_GetLocalConvInfo(WDML_CONV* pConv, CONVINFO* ci, DWORD id) -{ - BOOL ret = TRUE; - WDML_LINK* pLink; - WDML_SIDE side; - - ci->hConvPartner = (pConv->wStatus & ST_ISLOCAL) ? (HCONV)((ULONG_PTR)pConv | 1) : 0; - ci->hszSvcPartner = pConv->hszService; - ci->hszServiceReq = pConv->hszService; /* FIXME: they shouldn't be the same, should they ? */ - ci->hszTopic = pConv->hszTopic; - ci->wStatus = pConv->wStatus; - - side = (pConv->wStatus & ST_CLIENT) ? WDML_CLIENT_SIDE : WDML_SERVER_SIDE; - - for (pLink = pConv->instance->links[side]; pLink != NULL; pLink = pLink->next) - { - if (pLink->hConv == (HCONV)pConv) - { - ci->wStatus |= ST_ADVISE; - break; - } - } - - /* FIXME: non handled status flags: - ST_BLOCKED - ST_BLOCKNEXT - ST_INLIST - */ - - ci->wConvst = pConv->wConvst; /* FIXME */ - - ci->wLastError = 0; /* FIXME: note it's not the instance last error */ - ci->hConvList = 0; - ci->ConvCtxt = pConv->convContext; - if (ci->wStatus & ST_CLIENT) - { - ci->hwnd = pConv->hwndClient; - ci->hwndPartner = pConv->hwndServer; - } - else - { - ci->hwnd = pConv->hwndServer; - ci->hwndPartner = pConv->hwndClient; - } - if (id == QID_SYNC) - { - ci->hUser = pConv->hUser; - ci->hszItem = 0; - ci->wFmt = 0; - ci->wType = 0; - } - else - { - WDML_XACT* pXAct; - - pXAct = WDML_FindTransaction(pConv, id); - if (pXAct) - { - ci->hUser = pXAct->hUser; - ci->hszItem = pXAct->hszItem; - ci->wFmt = pXAct->wFmt; - ci->wType = pXAct->wType; - } - else - { - ret = 0; - pConv->instance->lastError = DMLERR_UNFOUND_QUEUE_ID; - } - } - return ret; -} - -/****************************************************************** - * DdeQueryConvInfo (USER32.@) - * - * FIXME: Set last DDE error on failure. - */ -UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) -{ - UINT ret = lpConvInfo->cb; - CONVINFO ci; - WDML_CONV* pConv; - - TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); - - if (!hConv) - { - FIXME("hConv is NULL\n"); - return 0; - } - - pConv = WDML_GetConv(hConv, FALSE); - if (pConv != NULL) - { - if (!WDML_GetLocalConvInfo(pConv, &ci, id)) - ret = 0; - } - else - { - if ((ULONG_PTR)hConv & 1) - { - pConv = WDML_GetConv((HCONV)((ULONG_PTR)hConv & ~1), FALSE); - if (pConv != NULL) - FIXME("Request on remote conversation information is not implemented yet\n"); - } - ret = 0; - } - - if (ret != 0) - memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); - return ret; -} - -/* ================================================================ - * - * Information broadcast across DDEML implementations - * - * ================================================================ */ - -struct tagWDML_BroadcastPmt -{ - LPCWSTR clsName; - UINT uMsg; - WPARAM wParam; - LPARAM lParam; -}; - -/****************************************************************** - * WDML_BroadcastEnumProc - * - * - */ -static BOOL CALLBACK WDML_BroadcastEnumProc(HWND hWnd, LPARAM lParam) -{ - struct tagWDML_BroadcastPmt* s = (struct tagWDML_BroadcastPmt*)lParam; - WCHAR buffer[128]; - - if (GetClassNameW(hWnd, buffer, 128) > 0 && - lstrcmpiW(buffer, s->clsName) == 0) - { - PostMessageW(hWnd, s->uMsg, s->wParam, s->lParam); - } - return TRUE; -} - -/****************************************************************** - * WDML_BroadcastDDEWindows - * - * - */ -void WDML_BroadcastDDEWindows(LPCWSTR clsName, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - struct tagWDML_BroadcastPmt s; - - s.clsName = clsName; - s.uMsg = uMsg; - s.wParam = wParam; - s.lParam = lParam; - EnumWindows(WDML_BroadcastEnumProc, (LPARAM)&s); -}

1 0

[aandrejevic] 65946: [FAST486] Fix a bug in UnsignedDivMod128.
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: aandrejevic Date: Sat Jan 3 03:52:50 2015 New Revision: 65946 URL: http://svn.reactos.org/svn/reactos?rev=65946&view=rev Log: [FAST486] Fix a bug in UnsignedDivMod128. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 3 03:52:50 2015 @@ -84,12 +84,14 @@ /* Initialize the quotient */ *QuotientLow = *QuotientHigh = 0ULL; + /* Exit early if the dividend is lower than the divisor */ + if ((DividendHigh == 0ULL) && (DividendLow < Divisor)) return ValueLow; + /* Normalize the current divisor */ Bits = CountLeadingZeros64(CurrentHigh); CurrentHigh <<= Bits; - /* Loop while the value is higher than or equal to the original divisor */ - while ((ValueHigh > 0ULL) || (ValueLow >= Divisor)) + while (TRUE) { /* Shift the quotient left by one bit */ *QuotientHigh <<= 1; @@ -109,6 +111,9 @@ /* Set the lowest bit of the quotient */ *QuotientLow |= 1; + + /* Stop if the value is lower than the original divisor */ + if ((ValueHigh == 0ULL) && (ValueLow < Divisor)) break; } /* Shift the current divisor right by one bit */

1 0

[aandrejevic] 65945: [FAST486] Halfplement floating point division. Halfplement opcode 0xD9.
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: aandrejevic Date: Sat Jan 3 03:26:31 2015 New Revision: 65945 URL: http://svn.reactos.org/svn/reactos?rev=65945&view=rev Log: [FAST486] Halfplement floating point division. Halfplement opcode 0xD9. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -1528,12 +1528,17 @@ } else { - /* Make it denormalized */ - Data->Mantissa <<= Data->Exponent - 1; - Data->Exponent = 1; - - /* Underflow */ - State->FpuStatus.Ue = TRUE; + if (State->FpuControl.Um) + { + /* Make it denormalized */ + Data->Mantissa <<= Data->Exponent - 1; + Data->Exponent = 1; + } + else + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + } } } @@ -1560,7 +1565,7 @@ FPU_ST(0) = *Data; FPU_SET_TAG(0, Fast486GetValueTag(Data)); } - else State->FpuStatus.Ie = TRUE; + else State->FpuStatus.Sf = TRUE; } FORCEINLINE @@ -1573,7 +1578,7 @@ FPU_SET_TAG(0, FPU_TAG_EMPTY); State->FpuStatus.Top++; } - else State->FpuStatus.Ie = TRUE; + else State->FpuStatus.Sf = TRUE; } #endif Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -66,6 +66,77 @@ return LowProduct; } +static ULONGLONG +UnsignedDivMod128(ULONGLONG DividendLow, + ULONGLONG DividendHigh, + ULONGLONG Divisor, + PULONGLONG QuotientLow, + PULONGLONG QuotientHigh) +{ + ULONGLONG ValueLow = DividendLow; + ULONGLONG ValueHigh = DividendHigh; + ULONGLONG CurrentLow = 0ULL; + ULONGLONG CurrentHigh = Divisor; + ULONG Bits; + + ASSERT(Divisor != 0ULL); + + /* Initialize the quotient */ + *QuotientLow = *QuotientHigh = 0ULL; + + /* Normalize the current divisor */ + Bits = CountLeadingZeros64(CurrentHigh); + CurrentHigh <<= Bits; + + /* Loop while the value is higher than or equal to the original divisor */ + while ((ValueHigh > 0ULL) || (ValueLow >= Divisor)) + { + /* Shift the quotient left by one bit */ + *QuotientHigh <<= 1; + *QuotientHigh |= *QuotientLow >> 63; + *QuotientLow <<= 1; + + /* Check if the value is higher than or equal to the current divisor */ + if ((ValueHigh > CurrentHigh) + || ((ValueHigh == CurrentHigh) && (ValueLow >= CurrentLow))) + { + BOOLEAN Carry = ValueLow < CurrentLow; + + /* Subtract the current divisor from the value */ + ValueHigh -= CurrentHigh; + ValueLow -= CurrentLow; + if (Carry) ValueHigh--; + + /* Set the lowest bit of the quotient */ + *QuotientLow |= 1; + } + + /* Shift the current divisor right by one bit */ + CurrentLow >>= 1; + CurrentLow |= (CurrentHigh & 1) << 63; + CurrentHigh >>= 1; + } + + /* + * Calculate the number of significant bits the current + * divisor has more than the original divisor + */ + Bits = CountLeadingZeros64(Divisor) + 64; + Bits -= (CurrentHigh > 0ULL) ? CountLeadingZeros64(CurrentHigh) : 64; + Bits -= (CurrentLow > 0ULL) ? CountLeadingZeros64(CurrentLow) : 64; + + if (Bits) + { + /* Shift the quotient left by that amount */ + *QuotientHigh <<= Bits; + *QuotientHigh |= *QuotientLow >> (64 - Bits); + *QuotientLow <<= Bits; + } + + /* Return the remainder */ + return ValueLow; +} + static inline VOID FASTCALL Fast486FpuFromInteger(PFAST486_STATE State, LONGLONG Value, @@ -557,8 +628,31 @@ PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; - - if (FPU_IS_ZERO(SecondOperand)) + ULONGLONG QuotientLow, QuotientHigh, Remainder; + LONG Exponent; + + if (FPU_IS_INDEFINITE(FirstOperand) + || FPU_IS_INDEFINITE(SecondOperand) + || (FPU_IS_INFINITY(FirstOperand) && FPU_IS_INFINITY(SecondOperand)) + || (FPU_IS_ZERO(FirstOperand) && FPU_IS_ZERO(SecondOperand))) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + + if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) { if (State->FpuControl.Zm) { @@ -571,16 +665,75 @@ { /* Raise the division by zero exception */ State->FpuStatus.Ze = TRUE; + } + + return; + } + + /* Calculate the sign of the result */ + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + if (FPU_IS_ZERO(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) + { + /* Return zero */ + Result->Sign = TempResult.Sign; + Result->Mantissa = 0ULL; + Result->Exponent = 0; + return; + } + + /* Calculate the exponent of the result */ + Exponent = (LONG)FirstOperand->Exponent - (LONG)SecondOperand->Exponent - 64; + + /* Divide the two mantissas */ + Remainder = UnsignedDivMod128(0ULL, + /* Notice the 64 above - this is the high part */ + FirstOperand->Mantissa, + SecondOperand->Mantissa, + &QuotientLow, + &QuotientHigh); + UNREFERENCED_PARAMETER(Remainder); // TODO: Rounding + + TempResult.Mantissa = QuotientLow; + + if (QuotientHigh > 0ULL) + { + ULONG BitsToShift = 64 - CountLeadingZeros64(QuotientHigh); + + if (!State->FpuControl.Pm) + { + /* Raise the precision expection */ + State->FpuStatus.Pe = TRUE; return; } - } - - TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; - TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; - - // TODO: NOT IMPLEMENTED - UNREFERENCED_PARAMETER(TempResult); - UNIMPLEMENTED; + + TempResult.Mantissa >>= BitsToShift; + TempResult.Mantissa |= QuotientHigh << (64 - BitsToShift); + Exponent += BitsToShift; + + // TODO: Rounding + } + + if (Exponent < -FPU_REAL10_BIAS) + { + TempResult.Mantissa >>= -(Exponent + FPU_REAL10_BIAS); + Exponent = -FPU_REAL10_BIAS; + + if ((TempResult.Mantissa == 0ULL) && !State->FpuControl.Um) + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + return; + } + + // TODO: Rounding + } + + TempResult.Exponent = (USHORT)(Exponent + FPU_REAL10_BIAS); + + /* Normalize the result */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; } static inline VOID FASTCALL @@ -853,10 +1006,86 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; -#else - /* Do nothing */ + + if (ModRegRm.Memory) + { + switch (ModRegRm.Register) + { + /* FLD */ + case 0: + { + ULONG Value; + FAST486_FPU_DATA_REG MemoryData; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromSingleReal(State, Value, &MemoryData); + Fast486FpuPush(State, &MemoryData); + + break; + } + + /* FST */ + case 2: + /* FSTP */ + case 3: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FLDENV */ + case 4: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FLDCW */ + case 5: + { + Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, &State->FpuControl.Value); + break; + } + + /* FSTENV */ + case 6: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSTCW */ + case 7: + { + Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuControl.Value); + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + } + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + } + #endif } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -59,6 +59,7 @@ #define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && ((x)->Mantissa == FPU_MANTISSA_HIGH_BIT)) #define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) #define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) +#define FPU_IS_INDEFINITE(x) (FPU_IS_NAN(x) && !FPU_IS_INFINITY(x)) enum {

1 0

[hbelusca] 65944: Remove unneeded .cvsignore files.
by hbelusca＠svn.reactos.org 02 Jan '15

02 Jan '15

Author: hbelusca Date: Fri Jan 2 23:44:04 2015 New Revision: 65944 URL: http://svn.reactos.org/svn/reactos?rev=65944&view=rev Log: Remove unneeded .cvsignore files. Removed: trunk/reactos/boot/freeldr/tools/.cvsignore trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore Removed: trunk/reactos/boot/freeldr/tools/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/tools/.cvsign… ============================================================================== --- trunk/reactos/boot/freeldr/tools/.cvsignore [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/tools/.cvsignore (removed) @@ -1,7 +0,0 @@ -bin2c -deptool -hosttype -rcopy -rdel -rmkdir -rrmdir Removed: trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/mkdo… ============================================================================== --- trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore (removed) @@ -1 +0,0 @@ -mkdosfs

1 0

[hbelusca] 65943: Fix member size in the SETUP_LOADER_BLOCK structure.
by hbelusca＠svn.reactos.org 02 Jan '15

02 Jan '15

Author: hbelusca Date: Fri Jan 2 23:10:44 2015 New Revision: 65943 URL: http://svn.reactos.org/svn/reactos?rev=65943&view=rev Log: Fix member size in the SETUP_LOADER_BLOCK structure. Modified: trunk/reactos/include/reactos/arc/setupblk.h Modified: trunk/reactos/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/setupb… ============================================================================== --- trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] Fri Jan 2 23:10:44 2015 @@ -149,7 +149,7 @@ PCHAR MachineDirectoryPath; PCHAR NetBootSifPath; PVOID NetBootSecret; - CHAR NetBootIMirrorFilePath[26]; + CHAR NetBootIMirrorFilePath[260]; PCHAR ASRPnPSifFile; ULONG ASRPnPSifFileLength; CHAR NetBootAdministratorPassword[64];

1 0

[aandrejevic] 65942: [FAST486] Implement the FWAIT instruction. Fix FPU exception handling. Implement exception masking. Fix several other bugs and wrong definitions.
by aandrejevic＠svn.reactos.org 02 Jan '15

02 Jan '15

Author: aandrejevic Date: Fri Jan 2 21:19:31 2015 New Revision: 65942 URL: http://svn.reactos.org/svn/reactos?rev=65942&view=rev Log: [FAST486] Implement the FWAIT instruction. Fix FPU exception handling. Implement exception masking. Fix several other bugs and wrong definitions. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -107,8 +107,16 @@ if (FPU_IS_NAN(Value) || !FPU_IS_NORMALIZED(Value) || (UnbiasedExp < 0) || (UnbiasedExp > 63)) { - State->FpuStatus.Ie = TRUE; - return FALSE; + if (State->FpuControl.Im) + { + *Result = 0LL; + return TRUE; + } + else + { + State->FpuStatus.Ie = TRUE; + return FALSE; + } } Bits = 63 - UnbiasedExp; @@ -223,22 +231,42 @@ if (FPU_IS_NAN(Value)) { - *Result |= 0x3FF0000000000000ULL; + *Result |= 0x7FFULL << 52; goto SetSign; } /* Check for underflow */ if (!FPU_IS_NORMALIZED(Value) || (UnbiasedExp < -1023)) { - State->FpuStatus.Ue = TRUE; - return FALSE; + if (State->FpuControl.Um) + { + /* The result is zero due to underflow */ + *Result = 0ULL; + return TRUE; + } + else + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + return FALSE; + } } /* Check for overflow */ if (UnbiasedExp > 1023) { - State->FpuStatus.Oe = TRUE; - return FALSE; + if (State->FpuControl.Om) + { + /* The result is infinity due to overflow */ + *Result = FPU_REAL8_INFINITY; + goto SetSign; + } + else + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + return FALSE; + } } /* Calculate the remainder */ @@ -291,7 +319,7 @@ return TRUE; } -static inline BOOLEAN FASTCALL +static inline VOID FASTCALL Fast486FpuFromPackedBcd(PFAST486_STATE State, PUCHAR Value, PFAST486_FPU_DATA_REG Result) @@ -301,13 +329,6 @@ for (i = 8; i >= 0; i--) { - if (((Value[i] & 0x0F) > 9) || ((Value[i] >> 4) > 9)) - { - /* Invalid BCD */ - State->FpuStatus.Ie = TRUE; - return FALSE; - } - IntVal *= 100LL; IntVal += (Value[i] >> 4) * 10 + (Value[i] & 0x0F); } @@ -317,7 +338,6 @@ /* Now convert the integer to FP80 */ Fast486FpuFromInteger(State, IntVal, Result); - return TRUE; } static inline BOOLEAN FASTCALL @@ -356,10 +376,12 @@ FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; FAST486_FPU_DATA_REG TempResult; - if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) - { - /* Denormalized */ + if (!State->FpuControl.Dm + && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + { + /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; + return; } /* Find the largest exponent */ @@ -405,12 +427,18 @@ { if (TempResult.Exponent == FPU_MAX_EXPONENT) { - /* Total overflow, return infinity */ - TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; - TempResult.Exponent = FPU_MAX_EXPONENT + 1; - - /* Update flags */ - State->FpuStatus.Oe = TRUE; + if (State->FpuControl.Om) + { + /* Total overflow, return infinity */ + TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent = FPU_MAX_EXPONENT + 1; + } + else + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + return; + } } else { @@ -438,7 +466,7 @@ NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; /* And perform an addition instead */ - Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); + Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); } static inline VOID FASTCALL @@ -502,10 +530,12 @@ { FAST486_FPU_DATA_REG TempResult; - if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) - { - /* Denormalized */ + if (!State->FpuControl.Dm + && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + { + /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; + return; } UnsignedMult128(FirstOperand->Mantissa, @@ -530,9 +560,19 @@ if (FPU_IS_ZERO(SecondOperand)) { - /* Division by zero */ - State->FpuStatus.Ze = TRUE; - return; + if (State->FpuControl.Zm) + { + /* Return infinity */ + Result->Sign = FirstOperand->Sign; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else + { + /* Raise the division by zero exception */ + State->FpuStatus.Ze = TRUE; + return; + } } TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; @@ -631,10 +671,26 @@ #ifndef FAST486_NO_FPU + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + return; } @@ -651,24 +707,31 @@ Fast486FpuFromSingleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + return; } /* Load the source operand from an FPU register */ SourceOperand = &FPU_ST(ModRegRm.SecondRegister); - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } /* Perform the requested operation */ @@ -695,18 +758,34 @@ #ifndef FAST486_NO_FPU - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - if (ModRegRm.Memory) { + ULONGLONG Value; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + /* Load the source operand from memory */ - ULONGLONG Value; - if (!Fast486ReadMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) ? State->SegmentOverride : FAST486_REG_DS, @@ -721,24 +800,35 @@ Fast486FpuFromDoubleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - /* The source operand is ST0 */ SourceOperand = &FPU_ST(0); /* Load the destination operand from an FPU register */ DestOperand = &FPU_ST(ModRegRm.SecondRegister); + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } } /* Perform the requested operation */ @@ -800,8 +890,8 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(1) == FPU_TAG_EMPTY)) { - /* FPU Exception */ - State->FpuStatus.Ie = TRUE; + /* Raise the invalid operation exception, if unmasked */ + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; return; } @@ -822,22 +912,35 @@ return; } + /* The destination operand is always ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); SourceOperand = &MemoryData; - /* The destination operand is always ST0 */ - DestOperand = &FPU_ST(0); - - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - /* Perform the requested operation */ Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); - + #endif } @@ -884,16 +987,18 @@ /* FISTP */ case 3: { - LONGLONG Temp; + LONGLONG Temp = 0; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -952,15 +1057,26 @@ { UCHAR Buffer[10]; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - *((PULONGLONG)Buffer) = FPU_ST(0).Mantissa; - *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = FPU_ST(0).Exponent | (FPU_ST(0).Sign ? 0x8000 : 0); + if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) + { + *((PULONGLONG)Buffer) = FPU_ST(0).Mantissa; + *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = FPU_ST(0).Exponent + | (FPU_ST(0).Sign ? 0x8000 : 0); + } + else + { + if (State->FpuControl.Im) + { + *((PULONGLONG)Buffer) = FPU_INDEFINITE_MANTISSA; + *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = 0x8000 | (FPU_MAX_EXPONENT + 1); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } if (!Fast486WriteMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -981,6 +1097,7 @@ default: { Fast486Exception(State, FAST486_EXCEPTION_UD); + return; } } } @@ -1030,6 +1147,7 @@ default: { Fast486Exception(State, FAST486_EXCEPTION_UD); + return; } } } @@ -1086,16 +1204,18 @@ /* FSTP */ case 3: { - ULONGLONG Value; + ULONGLONG Value = FPU_REAL8_INDEFINITE; if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToDoubleReal(State, &FPU_ST(0), &Value)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToDoubleReal(State, &FPU_ST(0), &Value)) { /* Exception occurred */ return; @@ -1167,7 +1287,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; break; } @@ -1202,7 +1322,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; return; } @@ -1228,7 +1348,6 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; PFAST486_FPU_DATA_REG SourceOperand, DestOperand; - BOOLEAN PopStack = FALSE; /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1241,18 +1360,34 @@ #ifndef FAST486_NO_FPU - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - if (ModRegRm.Memory) { SHORT Value; FAST486_FPU_DATA_REG MemoryData; + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + /* Load the source operand from memory */ if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, (PUSHORT)&Value)) { @@ -1262,9 +1397,6 @@ Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { @@ -1282,19 +1414,19 @@ /* Load the destination operand from a register */ DestOperand = &FPU_ST(ModRegRm.SecondRegister); - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + /* Raise the invalid operation exception, if unmasked */ + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + return; } - - PopStack = TRUE; } /* Perform the requested operation */ Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); - if (PopStack) Fast486FpuPop(State); + if (!ModRegRm.Memory) Fast486FpuPop(State); #endif } @@ -1342,16 +1474,18 @@ /* FISTP */ case 3: { - LONGLONG Temp; + LONGLONG Temp = 0LL; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -1397,13 +1531,9 @@ return; } - if (!Fast486FpuFromPackedBcd(State, Buffer, &Value)) - { - /* Exception occurred */ - return; - } - - Fast486FpuPush(State, &Value); + Fast486FpuFromPackedBcd(State, Buffer, &Value); + Fast486FpuPush(State, &Value); + break; } @@ -1434,16 +1564,18 @@ /* FBSTP */ case 6: { - UCHAR Buffer[10]; + UCHAR Buffer[10] = {0}; if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToPackedBcd(State, &FPU_ST(0), Buffer)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToPackedBcd(State, &FPU_ST(0), Buffer)) { /* Exception occurred */ return; @@ -1467,16 +1599,18 @@ /* FISTP (64-bit int) */ case 7: { - LONGLONG Temp; + LONGLONG Temp = 0LL; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -1527,7 +1661,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -42,18 +42,23 @@ } #define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486GetValueTag(&FPU_ST(i))) -#define FPU_REAL4_BIAS 0x7F -#define FPU_REAL8_BIAS 0x3FF -#define FPU_REAL10_BIAS 0x3FFF -#define FPU_MAX_EXPONENT 0x7FFE -#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL +#define FPU_REAL4_BIAS 0x7F +#define FPU_REAL8_BIAS 0x3FF +#define FPU_REAL10_BIAS 0x3FFF +#define FPU_MAX_EXPONENT 0x7FFE +#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL +#define FPU_INDEFINITE_MANTISSA 0xC000000000000000ULL +#define FPU_REAL4_INFINITY 0x7F800000 +#define FPU_REAL4_INDEFINITE 0xFFC00000 +#define FPU_REAL8_INFINITY 0x7FF0000000000000ULL +#define FPU_REAL8_INDEFINITE 0xFFF8000000000000ULL -#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) -#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) -#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) -#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && (x)->Mantissa & FPU_MANTISSA_HIGH_BIT) -#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) -#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) +#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) +#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) +#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) +#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && ((x)->Mantissa == FPU_MANTISSA_HIGH_BIT)) +#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) +#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) enum { Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -4116,8 +4116,20 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeWait) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; +#ifndef FAST486_NO_FPU + + if ((!State->FpuControl.Pm && State->FpuStatus.Pe) + || (!State->FpuControl.Um && State->FpuStatus.Ue) + || (!State->FpuControl.Om && State->FpuStatus.Oe) + || (!State->FpuControl.Zm && State->FpuStatus.Ze) + || (!State->FpuControl.Dm && State->FpuStatus.De) + || (!State->FpuControl.Im && State->FpuStatus.Ie)) + { + /* Call the #MF handler */ + Fast486Exception(State, FAST486_EXCEPTION_MF); + } + +#endif } FAST486_OPCODE_HANDLER(Fast486OpcodePushFlags)

1 0

[hbelusca] 65941: [CONSRV]: We can return the real NTSTATUS code instead of a STATUS_UNSUCCESSFUL. Noticed by Thomas some time ago. I kept the STATUS_UNSUCCESSFUL first because I didn't want to cha...
by hbelusca＠svn.reactos.org 02 Jan '15

02 Jan '15

Author: hbelusca Date: Fri Jan 2 20:32:44 2015 New Revision: 65941 URL: http://svn.reactos.org/svn/reactos?rev=65941&view=rev Log: [CONSRV]: We can return the real NTSTATUS code instead of a STATUS_UNSUCCESSFUL. Noticed by Thomas some time ago. I kept the STATUS_UNSUCCESSFUL first because I didn't want to change the returned status code as it was before the changes of r65449. But I changed my mind since then! d8^) Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri Jan 2 20:32:44 2015 @@ -212,10 +212,7 @@ Status = NtCreateEvent(&Console->InputBuffer.ActiveEvent, EVENT_ALL_ACCESS, &ObjectAttributes, NotificationEvent, FALSE); if (!NT_SUCCESS(Status)) - { - return STATUS_UNSUCCESSFUL; - // return Status; - } + return Status; Console->InputBuffer.InputBufferSize = InputBufferSize; InitializeListHead(&Console->InputBuffer.InputEvents);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs