Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[hpoussin] 31780: Add missing constants/prototypes Reformat winerror.h to looks more like Wine one
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 18:18:47 2008 New Revision: 31780 URL: http://svn.reactos.org/svn/reactos?rev=31780&view=rev Log: Add missing constants/prototypes Reformat winerror.h to looks more like Wine one Modified: trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/msiquery.h trunk/reactos/include/psdk/rpcdcep.h trunk/reactos/include/psdk/winerror.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=317… Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re… Modified: trunk/reactos/include/psdk/rpcdcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdcep.h?rev… Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re…

1 0

[hpoussin] 31779: Add more UUIDs
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 17:52:14 2008 New Revision: 31779 URL: http://svn.reactos.org/svn/reactos?rev=31779&view=rev Log: Add more UUIDs Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=31… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Mon Jan 14 17:52:14 2008 @@ -16,17 +16,19 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> #define COM_NO_WINDOWS_H +#include "windef.h" #include "initguid.h" /* GUIDs defined in uuids.lib */ -#include "windef.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + #include "winbase.h" #include "wingdi.h" #include "winuser.h" @@ -39,31 +41,40 @@ #include "objidl.h" #include "olectl.h" -#include "mshtmhst.h" +#include "ocidl.h" + #include "docobj.h" #include "exdisp.h" -#include "htiframe.h" -#include "urlhist.h" -#include "hlink.h" -#include "mlang.h" #include "shlguid.h" #include "shlobj.h" #include "shldisp.h" #include "comcat.h" #include "urlmon.h" -#include "objsel.h" +#include "mapiguid.h" +#include "activscp.h" +#include "dispex.h" +#include "mlang.h" +#include "mshtml.h" +#include "mshtmhst.h" #include "richole.h" #include "xmldom.h" #include "xmldso.h" +#include "downloadmgr.h" +#include "objsel.h" +#include "hlink.h" +#include "optary.h" +#include "indexsrv.h" +#include "htiframe.h" +#include "urlhist.h" +#include "hlguids.h" +#include "isguids.h" /* FIXME: cguids declares GUIDs but does not define their values */ /* other GUIDs */ #include "vfw.h" -#include "mapiguid.h" -#include "hlguids.h" #if 0 /* FIXME */ #include "uuids.h" @@ -90,14 +101,28 @@ DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); -DEFINE_GUID(CLSID_HTMLDocument, 0x25336920, 0x03f9, 0x11cf, 0x8f,0xd0, 0x00,0xaa,0x00,0x68,0x6f,0x13); - -DEFINE_GUID(GUID_NULL, 0L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - +/* COM CLSIDs not declared in an exported header file */ +DEFINE_GUID(CLSID_StdMarshal, 0x00000017,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_IdentityUnmarshal, 0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSGenObject, 0x0000030c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSClientSite, 0x0000030d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSClassObject, 0x0000030e,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSInPlaceActive, 0x0000030f,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSInPlaceFrame, 0x00000310,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSDragDrop, 0x00000311,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSBindCtx, 0x00000312,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_PSEnumerators, 0x00000313,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StaticMetafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StaticDib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_DCOMAccessControl, 0x0000031d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - +DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC);

1 0

[winesync] 31778: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 16:04:25 2008 New Revision: 31778 URL: http://svn.reactos.org/svn/reactos?rev=31778&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/mapi32.rbuild trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/sendmail.c Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c Mon Jan 14 16:04:25 2008 @@ -127,9 +127,9 @@ return LocalAlloc(LMEM_FIXED, cb); if (cb) - return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE); + return LocalReAlloc(pv, cb, LMEM_MOVEABLE); - LocalFree((HANDLE) pv); + LocalFree(pv); return NULL; } @@ -139,7 +139,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - LocalFree((HANDLE) pv); + LocalFree(pv); } /************************************************************************** @@ -148,7 +148,7 @@ static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - return LocalSize((HANDLE) pv); + return LocalSize(pv); } /************************************************************************** Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rb… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.rbuild (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild Mon Jan 14 16:04:25 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll" allowwarnings="true"> <importlibrary definition="mapi32.spec.def" /> <include base="mapi32">.</include> @@ -10,11 +11,9 @@ <library>wine</library> <library>shlwapi</library> <library>shell32</library> - <library>ole32</library> - <library>user32</library> <library>kernel32</library> + <library>uuid</library> <library>ntdll</library> - <library>uuid</library> <file>imalloc.c</file> <file>mapi32_main.c</file> <file>prop.c</file> @@ -22,3 +21,4 @@ <file>util.c</file> <file>mapi32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c (original) +++ trunk/reactos/dll/win32/mapi32/prop.c Mon Jan 14 16:04:25 2008 @@ -928,7 +928,7 @@ LPVOID lpNew, ULONG *lpCount) { static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */ - LPSPropValue lpDest = (LPSPropValue)lpProps; + LPSPropValue lpDest = lpProps; ULONG ulCount = cValues * sizeof(SPropValue); ULONG ulLen, i; int iter; @@ -964,7 +964,7 @@ break; case PT_STRING8: ulLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.lpszA) + 1u; - lpDest->Value.lpszA = (LPSTR)RELOC_PTR(lpDest->Value.lpszA); + lpDest->Value.lpszA = RELOC_PTR(lpDest->Value.lpszA); if (bBadPtr) ulLen = lstrlenA(lpDest->Value.lpszA) + 1u; ulCount += ulLen; @@ -999,7 +999,7 @@ { ULONG ulStrLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; - lpDest->Value.MVszA.lppszA[i] = (LPSTR)RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); + lpDest->Value.MVszA.lppszA[i] = RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); if (bBadPtr) ulStrLen = lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; ulCount += ulStrLen; @@ -1331,7 +1331,7 @@ return FBadRglpszW(lpProp->Value.MVszW.lppszW, lpProp->Value.MVszW.cValues); case PT_MV_BINARY: - return FBadEntryList((LPENTRYLIST)&lpProp->Value.MVbin); + return FBadEntryList(&lpProp->Value.MVbin); } return FALSE; } Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c Mon Jan 14 16:04:25 2008 @@ -67,6 +67,7 @@ static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL; + char empty_string[] = ""; HRESULT res; DWORD size; @@ -127,16 +128,19 @@ { to = HeapAlloc( GetProcessHeap(), 0, to_size ); if (!to) goto exit; + to[0] = 0; } if (cc_size) { cc = HeapAlloc( GetProcessHeap(), 0, cc_size ); if (!cc) goto exit; + cc[0] = 0; } if (bcc_size) { bcc = HeapAlloc( GetProcessHeap(), 0, bcc_size ); if (!bcc) goto exit; + bcc[0] = 0; } if (message->lpOriginator) @@ -175,8 +179,8 @@ sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); - size = 0; - res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); + size = 1; + res = UrlEscapeA( mailto, empty_string, &size, URL_ESCAPE_SPACES_ONLY ); if (res != E_POINTER) goto exit; escape = HeapAlloc( GetProcessHeap(), 0, size );

1 0

[winesync] 31777: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 16:00:47 2008 New Revision: 31777 URL: http://svn.reactos.org/svn/reactos?rev=31777&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.rbuild Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c (original) +++ trunk/reactos/dll/win32/imm32/imm.c Mon Jan 14 16:00:47 2008 @@ -240,6 +240,9 @@ TRACE("%s, %i\n",debugstr_wn(compstr,len),len); + if (old == NULL && compstr == NULL && len == 0) + return NULL; + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -373,6 +376,9 @@ TRACE("%s, %i\n",debugstr_wn(resultstr,len),len); + if (old == NULL && resultstr == NULL && len == 0) + return NULL; + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -1076,7 +1082,7 @@ TRACE("Default created (%p)\n",hwndDefault); } - return (HWND)hwndDefault; + return hwndDefault; } /*********************************************************************** @@ -1400,15 +1406,18 @@ case CPS_CANCEL: TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); { - HIMCC newCompStr; + BOOL send; + if (pX11DRV_ForceXIMReset) pX11DRV_ForceXIMReset(root_context->IMC.hWnd); - newCompStr = updateCompStr(root_context->IMC.hCompStr, NULL, 0); + send = (root_context->IMC.hCompStr!=NULL); + ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = newCompStr; - - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + root_context->IMC.hCompStr = NULL; + + if (send) + ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, GCS_COMPSTR); rc = TRUE; } @@ -1419,7 +1428,7 @@ pX11DRV_ForceXIMReset(root_context->IMC.hWnd); { HIMCC newCompStr; - DWORD cplen; + DWORD cplen = 0; LPWSTR cpstr; LPCOMPOSITIONSTRING cs = NULL; LPBYTE cdata = NULL; @@ -1429,11 +1438,14 @@ ImmDestroyIMCC(root_context->IMC.hCompStr); root_context->IMC.hCompStr = newCompStr; - cdata = ImmLockIMCC(root_context->IMC.hCompStr); - cs = (LPCOMPOSITIONSTRING)cdata; - cplen = cs->dwCompStrLen; - cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); - ImmUnlockIMCC(root_context->IMC.hCompStr); + if (root_context->IMC.hCompStr) + { + cdata = ImmLockIMCC(root_context->IMC.hCompStr); + cs = (LPCOMPOSITIONSTRING)cdata; + cplen = cs->dwCompStrLen; + cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); + ImmUnlockIMCC(root_context->IMC.hCompStr); + } if (cplen > 0) { WCHAR param = cpstr[0]; Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.rbuild (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild Mon Jan 14 16:00:47 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true"> <importlibrary definition="imm32.spec.def" /> <include base="imm32">.</include> @@ -16,3 +17,4 @@ <file>version.rc</file> <file>imm32.spec</file> </module> +</group>

1 0

[winesync] 31776: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:56:22 2008 New Revision: 31776 URL: http://svn.reactos.org/svn/reactos?rev=31776&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/content.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/chm.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c Mon Jan 14 15:56:22 2008 @@ -39,10 +39,10 @@ if(chm->strings_size <= (offset >> BLOCK_BITS)) { if(chm->strings) - chm->strings = hhctrl_realloc_zero(chm->strings, + chm->strings = heap_realloc_zero(chm->strings, chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); else - chm->strings = hhctrl_alloc_zero( + chm->strings = heap_alloc_zero( chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); } @@ -59,13 +59,13 @@ return NULL; } - chm->strings[offset >> BLOCK_BITS] = hhctrl_alloc(BLOCK_SIZE); + chm->strings[offset >> BLOCK_BITS] = heap_alloc(BLOCK_SIZE); hres = IStream_Read(chm->strings_stream, chm->strings[offset >> BLOCK_BITS], BLOCK_SIZE, &read); if(FAILED(hres)) { WARN("Read failed: %08x\n", hres); - hhctrl_free(chm->strings[offset >> BLOCK_BITS]); + heap_free(chm->strings[offset >> BLOCK_BITS]); chm->strings[offset >> BLOCK_BITS] = NULL; return NULL; } @@ -97,7 +97,7 @@ IStream_Read(stream, &ver, sizeof(ver), &read); TRACE("version is %x\n", ver); - buf = hhctrl_alloc(8*sizeof(DWORD)); + buf = heap_alloc(8*sizeof(DWORD)); buf_size = 8*sizeof(DWORD); while(1) { @@ -106,7 +106,7 @@ break; if(entry.len > buf_size) - buf = hhctrl_realloc(buf, buf_size=entry.len); + buf = heap_realloc(buf, buf_size=entry.len); hres = IStream_Read(stream, buf, entry.len, &read); if(hres != S_OK) @@ -142,7 +142,7 @@ } } - hhctrl_free(buf); + heap_free(buf); IStream_Release(stream); return SUCCEEDED(hres); @@ -171,12 +171,12 @@ return NULL; } - buf = hhctrl_alloc(size); + buf = heap_alloc(size); hres = IStream_Read(ivb_stream, buf, size, &read); IStream_Release(ivb_stream); if(FAILED(hres)) { WARN("Read failed: %08x\n", hres); - hhctrl_free(buf); + heap_free(buf); return NULL; } @@ -189,7 +189,7 @@ } } - hhctrl_free(buf); + heap_free(buf); TRACE("returning %s\n", debugstr_a(ret)); return strdupAtoW(ret); @@ -200,10 +200,10 @@ * FIXME: There may be more than one window type in the file, so * add the ability to choose a certain window type */ -BOOL LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) +BOOL LoadWinTypeFromCHM(HHInfo *info) { LARGE_INTEGER liOffset; - IStorage *pStorage = pChmInfo->pStorage; + IStorage *pStorage = info->pCHMInfo->pStorage; IStream *pStream; HRESULT hr; DWORD cbRead; @@ -221,26 +221,26 @@ if (FAILED(hr)) goto done; /* read the HH_WINTYPE struct data */ - hr = IStream_Read(pStream, pHHWinType, sizeof(*pHHWinType), &cbRead); + hr = IStream_Read(pStream, &info->WinType, sizeof(info->WinType), &cbRead); if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - pHHWinType->pszType = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszType)); - pHHWinType->pszCaption = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszCaption)); - pHHWinType->pszToc = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszToc)); - pHHWinType->pszIndex = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszIndex)); - pHHWinType->pszFile = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszFile)); - pHHWinType->pszHome = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszHome)); - pHHWinType->pszJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump1)); - pHHWinType->pszJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump2)); - pHHWinType->pszUrlJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump1)); - pHHWinType->pszUrlJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump2)); - + info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); + info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); + info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); + info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); + info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); + info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); + info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); + info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case */ #if 0 - pHHWinType->pszCustomTabs = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszCustomTabs); + info->WinType.pszCustomTabs = info->pszCustomTabs = CHM_ReadString(pChmInfo, (DWORD_PTR)info->WinType.pszCustomTabs); #endif done: @@ -340,7 +340,7 @@ static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; - CHMInfo *ret = hhctrl_alloc_zero(sizeof(CHMInfo)); + CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); res = GetFullPathNameW(szFile, sizeof(file), file, NULL); ret->szFile = strdupW(file); @@ -389,11 +389,11 @@ int i; for(i=0; i<chm->strings_size; i++) - hhctrl_free(chm->strings[i]); - } - - hhctrl_free(chm->strings); - hhctrl_free(chm); + heap_free(chm->strings[i]); + } + + heap_free(chm->strings); + heap_free(chm); return NULL; } Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conte… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/content.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/content.c Mon Jan 14 15:56:22 2008 @@ -41,10 +41,10 @@ free_content_item(item->child); - hhctrl_free(item->name); - hhctrl_free(item->local); - hhctrl_free(item->merge.chm_file); - hhctrl_free(item->merge.chm_index); + heap_free(item->name); + heap_free(item->local); + heap_free(item->merge.chm_file); + heap_free(item->merge.chm_index); item = next; } @@ -60,7 +60,7 @@ { buf->size = 8; buf->len = 0; - buf->buf = hhctrl_alloc(buf->size); + buf->buf = heap_alloc(buf->size); } static void strbuf_zero(strbuf_t *buf) @@ -70,14 +70,14 @@ static void strbuf_free(strbuf_t *buf) { - hhctrl_free(buf->buf); + heap_free(buf->buf); } static void strbuf_append(strbuf_t *buf, const char *data, int len) { if(buf->len+len > buf->size) { buf->size = buf->len+len; - buf->buf = hhctrl_realloc(buf->buf, buf->size); + buf->buf = heap_realloc(buf->buf, buf->size); } memcpy(buf->buf+buf->len, data, len); @@ -208,13 +208,13 @@ } wlen = MultiByteToWideChar(CP_ACP, 0, ptr, len, NULL, 0); - *param = hhctrl_alloc((wlen+1)*sizeof(WCHAR)); + *param = heap_alloc((wlen+1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ptr, len, *param, wlen); (*param)[wlen] = 0; if(param == &merge) { SetChmPath(&item->merge, hhc_root->merge.chm_file, merge); - hhctrl_free(merge); + heap_free(merge); } } @@ -258,7 +258,7 @@ strbuf_init(&node); strbuf_init(&node_name); - item = hhctrl_alloc_zero(sizeof(ContentItem)); + item = heap_alloc_zero(sizeof(ContentItem)); while(next_node(stream, &node)) { get_node_name(&node, &node_name); @@ -421,7 +421,7 @@ IStream *stream; insert_type_t insert_type; - info->content = hhctrl_alloc_zero(sizeof(ContentItem)); + info->content = heap_alloc_zero(sizeof(ContentItem)); SetChmPath(&info->content->merge, info->pCHMInfo->szFile, info->WinType.pszToc); stream = GetChmStream(info->pCHMInfo, info->pCHMInfo->szFile, &info->content->merge); Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c Mon Jan 14 15:56:22 2008 @@ -56,7 +56,7 @@ iSize = LoadStringW(hhctrl_hinstance, dwID, NULL, 0); iSize += 2; /* some strings (tab text) needs double-null termination */ - string = hhctrl_alloc(iSize * sizeof(WCHAR)); + string = heap_alloc(iSize * sizeof(WCHAR)); LoadStringW(hhctrl_hinstance, dwID, string, iSize); return string; @@ -95,8 +95,8 @@ SetChmPath(&chm_path, info->pCHMInfo->szFile, surl); ret = NavigateToChm(info, chm_path.chm_file, chm_path.chm_index); - hhctrl_free(chm_path.chm_file); - hhctrl_free(chm_path.chm_index); + heap_free(chm_path.chm_file); + heap_free(chm_path.chm_index); return ret; } @@ -577,7 +577,7 @@ szBuf[dwLen + 2] = 0; /* Double-null terminate */ buttons[dwIndex].iString = (DWORD)SendMessageW(hToolbar, TB_ADDSTRINGW, 0, (LPARAM)szBuf); - hhctrl_free(szBuf); + heap_free(szBuf); } SendMessageW(hToolbar, TB_ADDBUTTONSW, dwNumButtons, (LPARAM)&buttons); @@ -623,7 +623,7 @@ ret = SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, index, (LPARAM)&tie ); - hhctrl_free(tabText); + heap_free(tabText); return ret; } @@ -922,16 +922,16 @@ return; /* Free allocated strings */ - hhctrl_free((LPWSTR)info->WinType.pszType); - hhctrl_free((LPWSTR)info->WinType.pszCaption); - hhctrl_free((LPWSTR)info->WinType.pszToc); - hhctrl_free((LPWSTR)info->WinType.pszIndex); - hhctrl_free((LPWSTR)info->WinType.pszFile); - hhctrl_free((LPWSTR)info->WinType.pszHome); - hhctrl_free((LPWSTR)info->WinType.pszJump1); - hhctrl_free((LPWSTR)info->WinType.pszJump2); - hhctrl_free((LPWSTR)info->WinType.pszUrlJump1); - hhctrl_free((LPWSTR)info->WinType.pszUrlJump2); + heap_free(info->pszType); + heap_free(info->pszCaption); + heap_free(info->pszToc); + heap_free(info->pszIndex); + heap_free(info->pszFile); + heap_free(info->pszHome); + heap_free(info->pszJump1); + heap_free(info->pszJump2); + heap_free(info->pszUrlJump1); + heap_free(info->pszUrlJump2); if (info->pCHMInfo) CloseCHM(info->pCHMInfo); @@ -942,13 +942,13 @@ if(info->WinType.hwndHelp) DestroyWindow(info->WinType.hwndHelp); - hhctrl_free(info); + heap_free(info); OleUninitialize(); } HHInfo *CreateHelpViewer(LPCWSTR filename) { - HHInfo *info = hhctrl_alloc_zero(sizeof(HHInfo)); + HHInfo *info = heap_alloc_zero(sizeof(HHInfo)); OleInitialize(NULL); @@ -958,7 +958,7 @@ return NULL; } - if (!LoadWinTypeFromCHM(info->pCHMInfo, &info->WinType)) { + if (!LoadWinTypeFromCHM(info)) { ReleaseHelpViewer(info); return NULL; } Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c Mon Jan 14 15:56:22 2008 @@ -147,7 +147,7 @@ return NULL; NavigateToUrl(info, url); - hhctrl_free(url); + heap_free(url); return NULL; /* FIXME */ } @@ -180,7 +180,7 @@ if (filename) { len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); - wfile = hhctrl_alloc(len*sizeof(WCHAR)); + wfile = heap_alloc(len*sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); } @@ -205,7 +205,7 @@ case HH_GET_WIN_HANDLE: case HH_SAFE_DISPLAY_TOPIC: len = MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, NULL, 0 ); - wdata = hhctrl_alloc(len*sizeof(WCHAR)); + wdata = heap_alloc(len*sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, wdata, len ); break; @@ -227,8 +227,8 @@ result = HtmlHelpW( caller, wfile, command, wdata ? (DWORD_PTR)wdata : data ); - hhctrl_free(wfile); - hhctrl_free(wdata); + heap_free(wfile); + heap_free(wdata); return result; } Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h Mon Jan 14 15:56:22 2008 @@ -92,6 +92,19 @@ IOleObject *wb_object; HH_WINTYPEW WinType; + + LPWSTR pszType; + LPWSTR pszCaption; + LPWSTR pszToc; + LPWSTR pszIndex; + LPWSTR pszFile; + LPWSTR pszHome; + LPWSTR pszJump1; + LPWSTR pszJump2; + LPWSTR pszUrlJump1; + LPWSTR pszUrlJump2; + LPWSTR pszCustomTabs; + CHMInfo *pCHMInfo; ContentItem *content; HWND hwndTabCtrl; @@ -111,7 +124,7 @@ void ReleaseContent(HHInfo*); CHMInfo *OpenCHM(LPCWSTR szFile); -BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); +BOOL LoadWinTypeFromCHM(HHInfo *info); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); @@ -124,27 +137,27 @@ /* memory allocation functions */ -static inline void *hhctrl_alloc(size_t len) +static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void *hhctrl_alloc_zero(size_t len) +static inline void *heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void *hhctrl_realloc(void *mem, size_t len) +static inline void *heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } -static inline void *hhctrl_realloc_zero(void *mem, size_t len) +static inline void *heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL hhctrl_free(void *mem) +static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } @@ -158,7 +171,7 @@ return NULL; size = (strlenW(str)+1)*sizeof(WCHAR); - ret = hhctrl_alloc(size); + ret = heap_alloc(size); memcpy(ret, str, size); return ret; @@ -173,7 +186,7 @@ return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = hhctrl_alloc(len*sizeof(WCHAR)); + ret = heap_alloc(len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Mon Jan 14 15:56:22 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="hhctrl.ocx.spec.def" /> @@ -13,7 +14,6 @@ <library>wine</library> <library>advapi32</library> <library>comctl32</library> - <library>shell32</library> <library>shlwapi</library> <library>ole32</library> <library>oleaut32</library> @@ -31,3 +31,4 @@ <file>hhctrl.rc</file> <file>hhctrl.ocx.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c Mon Jan 14 15:56:22 2008 @@ -74,7 +74,7 @@ if (refCount) return refCount; - hhctrl_free(This); + heap_free(This); return 0; } @@ -576,7 +576,7 @@ HRESULT hr; RECT rc; - iOleClientSiteImpl = hhctrl_alloc_zero(sizeof(IOleClientSiteImpl)); + iOleClientSiteImpl = heap_alloc_zero(sizeof(IOleClientSiteImpl)); if (!iOleClientSiteImpl) return FALSE; @@ -625,7 +625,7 @@ error: ReleaseWebBrowser(info); - hhctrl_free(iOleClientSiteImpl); + heap_free(iOleClientSiteImpl); return FALSE; }

1 0

[winesync] 31775: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:51:35 2008 New Revision: 31775 URL: http://svn.reactos.org/svn/reactos?rev=31775&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild Mon Jan 14 15:51:35 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="cryptnet.spec.def" /> @@ -16,3 +17,4 @@ <file>cryptnet_main.c</file> <file>cryptnet.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Mon Jan 14 15:51:35 2008 @@ -476,18 +476,16 @@ memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->dwHostNameLength = 1; - components->dwUrlPathLength = 1; + components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); + components->dwHostNameLength = MAX_PATH; + components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components->dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - LPWSTR hostname = strndupW(components->lpszHostName, - components->dwHostNameLength); - LPWSTR path = strndupW(components->lpszUrlPath, - components->dwUrlPathLength); - - components->lpszHostName = hostname; - components->lpszUrlPath = path; + if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || + (components->dwHostNameLength == MAX_PATH - 1)) + FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -873,11 +871,15 @@ *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.dwUrlPathLength = 1; + components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components.dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; + + if (components.dwUrlPathLength == 2 * MAX_PATH - 1) + FIXME("Buffers are too small\n"); /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); @@ -932,6 +934,7 @@ CryptMemFree(path); } } + CryptMemFree(components.lpszUrlPath); return ret; } @@ -952,7 +955,7 @@ *pFunc = NULL; *phFunc = 0; components.dwSchemeLength = 1; - ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); + ret = InternetCrackUrlW(pszURL, 0, 0, &components); if (ret) { /* Microsoft always uses CryptInitOIDFunctionSet/ @@ -1136,7 +1139,7 @@ ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED, CERT_QUERY_FORMAT_FLAG_BINARY, - 0, NULL, NULL, NULL, (HCERTSTORE *)ppvContext, NULL, NULL); + 0, NULL, NULL, NULL, ppvContext, NULL, NULL); else { FIXME("multiple messages unimplemented\n");

1 0

[winesync] 31774: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:43:19 2008 New Revision: 31774 URL: http://svn.reactos.org/svn/reactos?rev=31774&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/finddlg32.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg.c Mon Jan 14 15:43:19 2008 @@ -337,24 +337,29 @@ ClientToScreen(hDlg, &point); hwnd = GetDlgItem( hDlg, dlgitem ); GetWindowRect(hwnd, &rect); - if (PtInRect(&rect, point)) - { - GetClientRect(hwnd, &rect); - ScreenToClient(hwnd, &point); - - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; - - if (hori) - *hori = x; - if (vert) - *vert = y; - return 1; - } - else + + if (!PtInRect(&rect, point)) return 0; + + GetClientRect(hwnd, &rect); + ScreenToClient(hwnd, &point); + + x = (long) point.x * MAXHORI; + x /= rect.right; + y = (long) (rect.bottom - point.y) * MAXVERT; + y /= rect.bottom; + + if (x < 0) x = 0; + if (y < 0) y = 0; + if (x > MAXHORI) x = MAXHORI; + if (y > MAXVERT) y = MAXVERT; + + if (hori) + *hori = x; + if (vert) + *vert = y; + + return 1; } /*********************************************************************** * CC_MouseCheckResultWindow [internal] @@ -436,16 +441,8 @@ hBrush = CreateSolidBrush(cr); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, rect.right/2, rect.bottom); - DeleteObject ( SelectObject(hdc, hBrush) ) ; - hBrush = CreateSolidBrush( GetNearestColor(hdc, cr) ); - if (hBrush) - { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.right/2-1, rect.top, rect.right, rect.bottom); - DeleteObject(SelectObject(hdc, hBrush)) ; - } + FillRect(hdc, &rect, hBrush); + DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); } ReleaseDC(hwnd, hdc); } @@ -458,7 +455,7 @@ { HDC hDC; long temp; - int w = LOWORD(GetDialogBaseUnits()); + int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; int oben; @@ -479,6 +476,7 @@ oben = points[0].y; /* | \ | */ /* | \| */ temp = (long)height * (long)y; + points[0].x += 1; points[0].y = oben + height - temp / (long)MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; @@ -491,7 +489,11 @@ lpp->old3angle.right = points[1].x + 1; lpp->old3angle.top = points[2].y - 1; lpp->old3angle.bottom= points[1].y + 1; + + hbr = SelectObject(hDC, GetStockObject(BLACK_BRUSH)); Polygon(hDC, points, 3); + SelectObject(hDC, hbr); + ReleaseDC(hDlg, hDC); } } @@ -503,7 +505,8 @@ void CC_PaintCross( HWND hDlg, int x, int y) { HDC hDC; - int w = GetDialogBaseUnits(); + int w = GetDialogBaseUnits() - 1; + int wc = GetDialogBaseUnits() * 3 / 4; HWND hwnd = GetDlgItem(hDlg, 0x2c6); LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); RECT rect; @@ -515,8 +518,7 @@ GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); - hPen = CreatePen(PS_SOLID, 2, 0xffffff); /* -white- color */ - hPen = SelectObject(hDC, hPen); + point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; if ( lpp->oldcross.left != lpp->oldcross.right ) @@ -529,11 +531,18 @@ lpp->oldcross.top = point.y - w - 1; lpp->oldcross.bottom = point.y + w + 1; + hPen = CreatePen(PS_SOLID, 3, 0x000000); /* -black- color */ + hPen = SelectObject(hDC, hPen); MoveToEx(hDC, point.x - w, point.y, &p); + LineTo(hDC, point.x - wc, point.y); + MoveToEx(hDC, point.x + wc, point.y, &p); LineTo(hDC, point.x + w, point.y); MoveToEx(hDC, point.x, point.y - w, &p); + LineTo(hDC, point.x, point.y - wc); + MoveToEx(hDC, point.x, point.y + wc, &p); LineTo(hDC, point.x, point.y + w); - DeleteObject( SelectObject(hDC, hPen)) ; + DeleteObject( SelectObject(hDC, hPen)); + ReleaseDC(hwnd, hDC); } } @@ -642,7 +651,7 @@ rect.bottom = rect.top; } GetClientRect(hwnd, &rect); - FrameRect(hDC, &rect, GetStockObject(BLACK_BRUSH) ); + DrawEdge(hDC, &rect, BDR_SUNKENOUTER, BF_RECT); ReleaseDC(hwnd, hDC); } } @@ -730,7 +739,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) { HWND hwnd = GetDlgItem(hDlg, 0x2d0); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -753,14 +762,17 @@ hBrush = CreateSolidBrush(predefcolors[j][i]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush); - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject(SelectObject(hdc, hBrush)) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -774,7 +786,7 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ) { HWND hwnd = GetDlgItem(hDlg, 0x2d1); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -799,14 +811,17 @@ hBrush = CreateSolidBrush(lpcr[i+j*cols]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject( SelectObject(hdc, hBrush) ) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -814,7 +829,6 @@ if (lpp->hwndFocus == hwnd) CC_DrawCurrentFocusRect(lpp); } - /*********************************************************************** @@ -1075,10 +1089,10 @@ CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); CC_PaintLumBar(hDlg, lpp->h, lpp->s); - CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_PaintColorGraph(hDlg); + CC_PaintCross(hDlg, lpp->h, lpp->s); EndPaint(hDlg, &ps); return TRUE; @@ -1346,7 +1360,7 @@ lpcc->lpCustColors = lpChCol->lpCustColors; lpcc->Flags = lpChCol->Flags; lpcc->lCustData = lpChCol->lCustData; - lpcc->lpfnHook = (LPCCHOOKPROC) lpChCol->lpfnHook; + lpcc->lpfnHook = lpChCol->lpfnHook; if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if (HIWORD(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Mon Jan 14 15:43:19 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> @@ -30,3 +31,4 @@ <file>rsrc.rc</file> <file>comdlg32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c Mon Jan 14 15:43:19 2008 @@ -2140,7 +2140,6 @@ if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile - ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0)) { - LPWSTR lpszTemp; /* fill destination buffer */ if (fodInfos->ofnInfos->lpstrFile) @@ -2164,13 +2163,31 @@ } } - /* set filename offset */ - lpszTemp = PathFindFileNameW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); - - /* set extension offset */ - lpszTemp = PathFindExtensionW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + if(fodInfos->unicode) + { + LPWSTR lpszTemp; + + /* set filename offset */ + lpszTemp = PathFindFileNameW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + } + else + { + LPSTR lpszTemp; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; + + /* set filename offset */ + lpszTemp = PathFindFileNameA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - ofn->lpstrFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - ofn->lpstrFile) + 1 : 0; + } /* set the lpstrFileTitle */ if(fodInfos->ofnInfos->lpstrFileTitle) @@ -3658,12 +3675,20 @@ if (priv->ofnA) { + LPSTR lpszTemp; if (ofnW->nMaxFile && !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; - priv->ofnA->nFileOffset = ofnW->nFileOffset; - priv->ofnA->nFileExtension = ofnW->nFileExtension; + + /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */ + /* set filename offset */ + lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile); + priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionA(priv->ofnA->lpstrFile); + priv->ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - priv->ofnA->lpstrFile) + 1 : 0; } } Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg31.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg31.c Mon Jan 14 15:43:19 2008 @@ -113,59 +113,8 @@ } /*********************************************************************** - * FD31_ScanDir [internal] - */ -static BOOL FD31_ScanDir(HWND hWnd, LPCWSTR newPath) -{ - WCHAR buffer[BUFFILE]; - HWND hdlg, hdlgDir; - LRESULT lRet = TRUE; - HCURSOR hCursorWait, oldCursor; - - TRACE("Trying to change to %s\n", debugstr_w(newPath)); - if ( newPath[0] && !SetCurrentDirectoryW( newPath )) - return FALSE; - lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR)); - - /* get the list of spec files */ - GetDlgItemTextW(hWnd, edt1, buffer, sizeof(buffer)/sizeof(WCHAR)); - - hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT); - oldCursor = SetCursor(hCursorWait); - - /* list of files */ - if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) { - WCHAR* scptr; /* ptr on semi-colon */ - WCHAR* filter = buffer; - - TRACE("Using filter %s\n", debugstr_w(filter)); - SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); - while (filter) { - scptr = strchrW(filter, ';'); - if (scptr) *scptr = 0; - while (*filter == ' ') filter++; - TRACE("Using file spec %s\n", debugstr_w(filter)); - if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR) - return FALSE; - if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; - } - } - - /* list of directories */ - strcpyW(buffer, FILE_star); - - if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { - lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); - } - SetCursor(oldCursor); - return lRet; -} - -/*********************************************************************** * FD31_GetFileType [internal] */ - static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) { int n, i; @@ -187,6 +136,55 @@ fptr += lstrlenW(fptr) + 1; } return FILE_star; /* FIXME */ +} + +/*********************************************************************** + * FD31_ScanDir [internal] + */ +static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) +{ + WCHAR buffer[BUFFILE]; + HWND hdlg, hdlgDir; + LRESULT lRet = TRUE; + HCURSOR hCursorWait, oldCursor; + + TRACE("Trying to change to %s\n", debugstr_w(newPath)); + if ( newPath[0] && !SetCurrentDirectoryW( newPath )) + return FALSE; + + /* get the list of spec files */ + lstrcpynW(buffer, FD31_GetFileType(ofn->lpstrCustomFilter, + ofn->lpstrFilter, ofn->nFilterIndex - 1), BUFFILE); + + hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT); + oldCursor = SetCursor(hCursorWait); + + /* list of files */ + if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) { + WCHAR* scptr; /* ptr on semi-colon */ + WCHAR* filter = buffer; + + TRACE("Using filter %s\n", debugstr_w(filter)); + SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); + while (filter) { + scptr = strchrW(filter, ';'); + if (scptr) *scptr = 0; + while (*filter == ' ') filter++; + TRACE("Using file spec %s\n", debugstr_w(filter)); + SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); + if (scptr) *scptr = ';'; + filter = (scptr) ? (scptr + 1) : 0; + } + } + + /* list of directories */ + strcpyW(buffer, FILE_star); + + if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { + lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); + } + SetCursor(oldCursor); + return lRet; } /*********************************************************************** @@ -375,7 +373,7 @@ } strcatW(tmpstr, FILE_bslash); - FD31_ScanDir(hWnd, tmpstr); + FD31_ScanDir(lfs->ofnW, hWnd, tmpstr); /* notify the app */ if (lfs->hook) { @@ -450,7 +448,7 @@ TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); - FD31_ScanDir(hWnd, path); + FD31_ScanDir(lfs->ofnW, hWnd, path); return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE; } @@ -462,7 +460,7 @@ strcatW(path, FILE_bslash); /* if ScanDir succeeds, we have changed the directory */ - if (FD31_ScanDir(hWnd, path)) + if (FD31_ScanDir(lfs->ofnW, hWnd, path)) return FALSE; /* and path is not a valid file name */ /* if not, this must be a filename */ @@ -477,7 +475,7 @@ lstrcpynW(tmpstr2, pBeginFileName + 1, sizeof(tmpstr2)/sizeof(WCHAR) ); /* Should we MessageBox() if this fails? */ - if (!FD31_ScanDir(hWnd, path)) + if (!FD31_ScanDir(lfs->ofnW, hWnd, path)) { return FALSE; } @@ -531,7 +529,7 @@ FD31_UpdateFileTitle(lfs); if (lfs->hook) { - lRet = (BOOL)FD31_CallWindowProc(lfs, lfs->fileokstring, + lRet = FD31_CallWindowProc(lfs, lfs->fileokstring, 0, lfs->lParam ); if (lRet) { @@ -543,7 +541,7 @@ { if (ofnW->lpstrFile) { - LPWSTR str = (LPWSTR)ofnW->lpstrFile; + LPWSTR str = ofnW->lpstrFile; LPWSTR ptr = strrchrW(str, '\\'); str[lstrlenW(str) + 1] = '\0'; *ptr = 0; @@ -590,7 +588,6 @@ return TRUE; pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0); TRACE("Selected filter : %s\n", debugstr_w(pstr)); - SetDlgItemTextW( lfs->hwnd, edt1, pstr ); return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE ); } @@ -871,11 +868,19 @@ if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL) ofn->nFilterIndex = 1; SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0); - lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter, + if (ofn->lpstrFile && ofn->lpstrFile[0]) + { + TRACE( "SetText of edt1 to %s\n", debugstr_w(ofn->lpstrFile) ); + SetDlgItemTextW( hWnd, edt1, ofn->lpstrFile ); + } + else + { + lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter, ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); - TRACE("nFilterIndex = %d, SetText of edt1 to %s\n", + TRACE("nFilterIndex = %d, SetText of edt1 to %s\n", ofn->nFilterIndex, debugstr_w(tmpstr)); - SetDlgItemTextW( hWnd, edt1, tmpstr ); + SetDlgItemTextW( hWnd, edt1, tmpstr ); + } /* get drive list */ *tmpstr = 0; DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE); @@ -896,9 +901,9 @@ } else *tmpstr = 0; - if (!FD31_ScanDir(hWnd, tmpstr)) { + if (!FD31_ScanDir(ofn, hWnd, tmpstr)) { *tmpstr = 0; - if (!FD31_ScanDir(hWnd, tmpstr)) + if (!FD31_ScanDir(ofn, hWnd, tmpstr)) WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr)); } /* select current drive in combo 2, omit missing drives */ @@ -919,7 +924,7 @@ if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return (BOOL) FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c Mon Jan 14 15:43:19 2008 @@ -117,11 +117,11 @@ FE(SBSP_INITIATEDBYHLINKFRAME), }; #undef FE - DPRINTF("SBSP Flags: %08x =", uflags); + TRACE("SBSP Flags: %08x =", uflags); for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & uflags) - DPRINTF("%s ", flags[i].name); - DPRINTF("\n"); + TRACE("%s ", flags[i].name); + TRACE("\n"); } } @@ -375,8 +375,7 @@ return hRes; } /* create an absolute pidl */ - pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, - (LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidl); } else if(wFlags & SBSP_PARENT) { @@ -388,7 +387,7 @@ else /* SBSP_ABSOLUTE is 0x0000 */ { /* An absolute pidl (relative from the desktop) */ - pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILClone(pidl); psfTmp = GetShellFolderFromPidl(pidlTmp); } Modified: trunk/reactos/dll/win32/comdlg32/finddlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/finddlg32.c (original) +++ trunk/reactos/dll/win32/comdlg32/finddlg32.c Mon Jan 14 15:43:19 2008 @@ -382,7 +382,7 @@ HRSRC htemplate; if(pdata->fr.Flags & FR_ENABLETEMPLATE) { - hmod = (HMODULE)pdata->fr.hInstance; + hmod = pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Mon Jan 14 15:43:19 2008 @@ -223,7 +223,7 @@ /*********************************************************************** * ChooseFontA (COMDLG32.@) * - * See ChosseFontW. + * See ChooseFontW. */ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) { Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Mon Jan 14 15:43:19 2008 @@ -2340,6 +2340,7 @@ typedef struct { LPPAGESETUPDLGW dlga; PRINTDLGW pdlg; + PAGESETUPDLGW curdlg; /* Current dialog state */ } PageSetupDataW; @@ -2683,6 +2684,46 @@ return TRUE; } +static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda) +{ + WCHAR PaperName[64]; + + GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); + PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize); + pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x); + pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y); + + if(IsDlgButtonChecked(hDlg, rad2)) + { + DWORD tmp = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + } +} + +static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda, HWND hDlg) +{ + DEVMODEW* dm; + DWORD sel; + + dm = GlobalLock(pda->pdlg.hDevMode); + + if(!dm) + return; + + if(pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x) + dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; + else + dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + + sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); + + if(sel != CB_ERR) + dm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, sel, 0); + + GlobalUnlock(pda->pdlg.hDevMode); +} + static BOOL PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { DEVNAMES *dn; @@ -2695,8 +2736,18 @@ portname = ((WCHAR*)dn)+dn->wOutputOffset; PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm); + + /* Landscape orientation */ + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); + + PRINTDLG_PS_SetOrientationW(hDlg, pda); + return TRUE; } @@ -2791,21 +2842,30 @@ } return TRUE; case rad1: - if (pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } + case rad2: + if((id == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (id == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + char TmpText[25]; + char TmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.x; + + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + + GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt5, TmpText); + SetDlgItemTextA(hDlg, edt4, TmpText2); + + GetDlgItemTextA(hDlg, edt6, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt7, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt7, TmpText); + SetDlgItemTextA(hDlg, edt6, TmpText2); + PRINTDLG_PS_ChangePaperPrev(pda); + } break; - case rad2: - if (pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } - PRINTDLG_PS_ChangePaperPrev(pda); - break; case cmb1: /* Printer combo */ if(msg == CBN_SELCHANGE){ char crPrinterName[256]; @@ -2890,10 +2950,10 @@ GETVAL(id, pda->curdlg.rtMargin.left); break; case edt5: - GETVAL(id, pda->curdlg.rtMargin.right); + GETVAL(id, pda->curdlg.rtMargin.top); break; case edt6: - GETVAL(id, pda->curdlg.rtMargin.top); + GETVAL(id, pda->curdlg.rtMargin.right); break; case edt7: GETVAL(id, pda->curdlg.rtMargin.bottom); @@ -2921,9 +2981,34 @@ EndDialog(hDlg, FALSE); return FALSE ; + case rad1: + case rad2: + if((LOWORD(wParam) == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (LOWORD(wParam) == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + WCHAR tmpText[25]; + WCHAR tmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.y; + + pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = tmp; + + GetDlgItemTextW(hDlg, edt4, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt5, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt5, tmpText); + SetDlgItemTextW(hDlg, edt4, tmpText2); + + GetDlgItemTextW(hDlg, edt6, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt7, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt7, tmpText); + SetDlgItemTextW(hDlg, edt6, tmpText2); + } + break; + case psh3: { pda->pdlg.Flags = 0; pda->pdlg.hwndOwner = hDlg; + PRINTDLG_PS_UpdatePrintDlgW(pda, hDlg); if (PrintDlgW(&(pda->pdlg))) PRINTDLG_PS_ChangePrinterW(hDlg,pda); return TRUE; @@ -3069,12 +3154,12 @@ scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x; scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y; rcMargin = rcClient; - - rcMargin.left += (LONG)pda->curdlg.rtMargin.left * scalx; - rcMargin.top += (LONG)pda->curdlg.rtMargin.top * scalx; - rcMargin.right -= (LONG)pda->curdlg.rtMargin.right * scaly; - rcMargin.bottom -= (LONG)pda->curdlg.rtMargin.bottom * scaly; - + + rcMargin.left += pda->curdlg.rtMargin.left * scalx; + rcMargin.top += pda->curdlg.rtMargin.top * scalx; + rcMargin.right -= pda->curdlg.rtMargin.right * scaly; + rcMargin.bottom -= pda->curdlg.rtMargin.bottom * scaly; + /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom); @@ -3268,12 +3353,12 @@ { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; - LPDEVMODEW dm; BOOL res = FALSE; if (uMsg==WM_INITDIALOG) { res = TRUE; pda = (PageSetupDataW*)lParam; + memcpy(&pda->curdlg, pda, sizeof(pda->curdlg)); SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); @@ -3295,16 +3380,7 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - if(pda->dlga->hDevMode) - { - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); - } + PRINTDLG_PS_ChangePrinterW(hDlg,pda); if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); @@ -3331,7 +3407,7 @@ SetDlgItemTextW(hDlg,edt6,str); SetDlgItemTextW(hDlg,edt7,str); } - PRINTDLG_PS_ChangePrinterW(hDlg,pda); + if (pda->dlga->Flags & PSD_DISABLEPAPER) { EnableWindow(GetDlgItem(hDlg,cmb2),FALSE); EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);

1 0

[winesync] 31773: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:40:24 2008 New Revision: 31773 URL: http://svn.reactos.org/svn/reactos?rev=31773&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Mon Jan 14 15:40:24 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> @@ -54,3 +55,4 @@ <file>rsrc.rc</file> <file>comctl32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Jan 14 15:40:24 2008 @@ -86,7 +86,7 @@ =================================================================== --- tooltips.c (revision 25790) +++ tooltips.c (working copy) -@@ -2440,7 +2440,34 @@ +@@ -2433,7 +2433,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); @@ -125,7 +125,7 @@ =================================================================== --- treeview.c (revision 27134) +++ treeview.c (working copy) -@@ -2844,8 +2844,6 @@ +@@ -2834,8 +2834,6 @@ } } Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Mon Jan 14 15:40:24 2008 @@ -207,7 +207,7 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); - COMCTL32_hModule = (HMODULE)hinstDLL; + COMCTL32_hModule = hinstDLL; /* add global subclassing atom (used by 'tooltip' and 'updown') */ COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo); @@ -715,7 +715,7 @@ * * NOTES * Probaly all versions of comctl32 initializes the Win95 controls in DllMain - * during DLL initializaiton. Starting from comctl32 v5.82 all the controls + * during DLL initialization. Starting from comctl32 v5.82 all the controls * are initialized there. We follow this behaviour and this function is just * a dummy. * @@ -885,7 +885,7 @@ return 0; RtlMoveMemory (lpBitmapInfo, lpBitmap, nSize); - pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo)+(UINT)lpBitmapInfo->biSize); + pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo) + lpBitmapInfo->biSize); for (iColor = 0; iColor < nColorTableSize; iColor++) { for (i = 0; i < iMaps; i++) { @@ -907,8 +907,8 @@ } } } - nWidth = (INT)lpBitmapInfo->biWidth; - nHeight = (INT)lpBitmapInfo->biHeight; + nWidth = lpBitmapInfo->biWidth; + nHeight = lpBitmapInfo->biHeight; hdcScreen = GetDC (NULL); hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight); if (hbm) { Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c Mon Jan 14 15:40:24 2008 @@ -1072,7 +1072,7 @@ TRACE("got focus from %p\n", lostFocus); /* if monthcal is open and it loses focus, close monthcal */ - if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && \ + if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); @@ -1108,7 +1108,7 @@ MONTHCAL_CopyTime (&infoPtr->date, &dtdtc.st); return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); + dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); } @@ -1123,7 +1123,7 @@ nmhdr.code = code; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + nmhdr.idFrom, (LPARAM)&nmhdr); } static LRESULT Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c (original) +++ trunk/reactos/dll/win32/comctl32/header.c Mon Jan 14 15:40:24 2008 @@ -783,7 +783,7 @@ nmhdr->code = code; return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + nmhdr->idFrom, (LPARAM)nmhdr); } static BOOL @@ -909,9 +909,7 @@ dispInfo.lParam = lpItem->lParam; TRACE("Sending HDN_GETDISPINFO%c\n", infoPtr->nNotifyFormat == NFR_UNICODE?'W':'A'); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) dispInfo.hdr.idFrom, - (LPARAM) &dispInfo); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, dispInfo.hdr.idFrom, (LPARAM)&dispInfo); TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", dispInfo.mask, Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c Mon Jan 14 15:40:24 2008 @@ -100,8 +100,7 @@ nmip.iField = field; nmip.iValue = value; - SendMessageW (infoPtr->Notify, WM_NOTIFY, - (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip); + SendMessageW (infoPtr->Notify, WM_NOTIFY, nmip.hdr.idFrom, (LPARAM)&nmip); TRACE("<-- %d\n", nmip.iValue); Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Mon Jan 14 15:40:24 2008 @@ -735,8 +735,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); TRACE(" <= %ld\n", result); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Mon Jan 14 15:40:24 2008 @@ -1305,8 +1305,7 @@ nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1336,8 +1335,7 @@ nmds.prgDayState = Alloc (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1490,10 +1488,10 @@ nmsc.nmhdr.code = MCN_SELCHANGE; MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); nmsc.nmhdr.code = MCN_SELECT; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); return 0; } if(hit == MCHT_CALENDARDATE) { @@ -1511,8 +1509,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel,&nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel,&nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); /* redraw both old and new days if the selected day changed */ @@ -1577,7 +1574,7 @@ nmhdr.code = NM_RELEASEDCAPTURE; TRACE("Sent notification from %p to %p\n", infoPtr->hwndSelf, infoPtr->hwndNotify); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); /* redraw if necessary */ if(redraw) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -1589,7 +1586,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); } return 0; Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c (original) +++ trunk/reactos/dll/win32/comctl32/pager.c Mon Jan 14 15:40:24 2008 @@ -352,8 +352,7 @@ nmpgcs.dwFlag = getWidth ? PGF_CALCWIDTH : PGF_CALCHEIGHT; nmpgcs.iWidth = getWidth ? *size : 0; nmpgcs.iHeight = getWidth ? 0 : *size; - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); *size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight; @@ -763,8 +762,7 @@ } nmpgScroll.iScroll -= 2*infoPtr->nButtonSize; - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll); TRACE("[%p] PGN_SCROLL returns iScroll=%d\n", infoPtr->hwndSelf, nmpgScroll.iScroll); @@ -1076,8 +1074,7 @@ nmhdr.hwndFrom = infoPtr->hwndSelf; nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); } if (IsWindow(infoPtr->hwndSelf)) KillTimer(infoPtr->hwndSelf, TIMERID1); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Mon Jan 14 15:40:24 2008 @@ -522,7 +522,7 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; } @@ -536,14 +536,14 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; } /* Extract the caption */ - psInfo->proppage[index].pszText = (LPCWSTR)p; - TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + psInfo->proppage[index].pszText = p; + TRACE("Tab %d %s\n",index,debugstr_w( p )); + p += lstrlenW( p ) + 1; if (dwFlags & PSP_USETITLE) { @@ -632,7 +632,7 @@ return -1; } - if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes))) + if(!(template = LoadResource(COMCTL32_hModule, hRes))) return -1; /* @@ -1288,8 +1288,8 @@ p += 2; break; default: - TRACE("menu %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("menu %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } @@ -1303,22 +1303,22 @@ p += 2; /* 0xffff plus predefined window class ordinal value */ break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } /* title */ - TRACE("title %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + TRACE("title %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; /* font, if DS_SETFONT set */ if ((DS_SETFONT & ((istemplateex)? ((const MyDLGTEMPLATEEX*)pTemplate)->style : pTemplate->style))) { p+=(istemplateex)?3:1; - TRACE("font %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name */ + TRACE("font %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; /* the font name */ } /* now process the DLGITEMTEMPLATE(EX) structs (plus custom data) @@ -1342,8 +1342,8 @@ p += 2; break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } @@ -1358,8 +1358,8 @@ p += 2; break; default: - TRACE("text %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("text %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } p += *p / sizeof(WORD) + 1; /* Skip extra data */ Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Mon Jan 14 15:40:24 2008 @@ -511,7 +511,7 @@ TRACE("window %p, code=%08x, via %s\n", parent, code, (infoPtr->bUnicode)?"Unicode":"ANSI"); - return SendMessageW(parent, WM_NOTIFY, (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(parent, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); } static INT Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c (original) +++ trunk/reactos/dll/win32/comctl32/status.c Mon Jan 14 15:40:24 2008 @@ -1019,8 +1019,7 @@ nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = infoPtr->hwndToolTip; - SendMessageW (lpCreate->hwndParent, WM_NOTIFY, - (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc); + SendMessageW (lpCreate->hwndParent, WM_NOTIFY, nmttc.hdr.idFrom, (LPARAM)&nmttc); } } Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c Mon Jan 14 15:40:24 2008 @@ -1314,7 +1314,7 @@ nml.item.szUrl[0] = 0; } - return SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)nml.hdr.idFrom, (LPARAM)&nml); + return SendMessageW(infoPtr->Notify, WM_NOTIFY, nml.hdr.idFrom, (LPARAM)&nml); } /*********************************************************************** Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c (original) +++ trunk/reactos/dll/win32/comctl32/tab.c Mon Jan 14 15:40:24 2008 @@ -178,7 +178,7 @@ nmhdr.code = code; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr); + nmhdr.idFrom, (LPARAM) &nmhdr); } static void Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Mon Jan 14 15:40:24 2008 @@ -341,8 +341,7 @@ TRACE("to window %p, code=%08x, %s\n", infoPtr->hwndNotify, code, (infoPtr->bUnicode) ? "via Unicode" : "via ANSI"); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); } /*********************************************************************** @@ -3918,7 +3917,7 @@ { TBADDBITMAP tbab; tbab.hInst = (HINSTANCE)lParam; - tbab.nID = (UINT_PTR)wParam; + tbab.nID = wParam; TRACE("hwnd = %p, hInst = %p, nID = %lu\n", hwnd, tbab.hInst, tbab.nID); @@ -4231,7 +4230,7 @@ if (!res) { nmtbr.pData = Alloc(dwSize); - nmtbr.cbData = (UINT)dwSize; + nmtbr.cbData = dwSize; if (!nmtbr.pData) res = ERROR_OUTOFMEMORY; } if (!res) @@ -6374,7 +6373,7 @@ /* last resort: send notification on to app */ /* FIXME: find out what is really used here */ - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); } Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Mon Jan 14 15:40:24 2008 @@ -320,8 +320,7 @@ ttnmdi.lParam = toolPtr->lParam; TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -351,8 +350,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) { - SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -378,8 +376,7 @@ ttnmdi.lParam = toolPtr->lParam; TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -409,8 +406,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) { - SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -563,8 +559,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); TRACE("%s\n", debugstr_w(infoPtr->szTipText)); @@ -792,8 +787,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); infoPtr->nCurrentTool = -1; @@ -825,8 +819,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE); @@ -1922,7 +1915,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCSTR pszTitle = (LPCSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size; TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_a(pszTitle), @@ -1955,7 +1948,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCWSTR pszTitle = (LPCWSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size; TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_w(pszTitle), Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Mon Jan 14 15:40:24 2008 @@ -119,8 +119,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); TRACE(" <= %ld\n", result); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Mon Jan 14 15:40:24 2008 @@ -518,8 +518,7 @@ nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code); - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); } static VOID @@ -582,9 +581,7 @@ nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -614,9 +611,7 @@ nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); } @@ -644,9 +639,7 @@ nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)&nmcdhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); } @@ -691,11 +684,9 @@ nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - retval = TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)nmcdhdr); - - return (BOOL)retval; + retval = TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); + + return retval; } static BOOL @@ -750,8 +741,7 @@ if (mask & TVIF_TEXT) wineItem->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)callback.hdr.idFrom, (LPARAM)&callback); + TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, (LPARAM)&callback); /* It may have changed due to a call to SetItem. */ mask &= wineItem->callbackMask; @@ -3782,8 +3772,7 @@ tvdi.item.cchTextMax = 0; } - bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)tvdi.hdr.idFrom, (LPARAM)&tvdi); + bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); if (!bCancel && bCommit) /* Apply the changes */ { Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c (original) +++ trunk/reactos/dll/win32/comctl32/updown.c Mon Jan 14 15:40:24 2008 @@ -627,7 +627,7 @@ ni.hdr.hwndFrom = infoPtr->Self; ni.hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); ni.hdr.code = UDN_DELTAPOS; - if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)ni.hdr.idFrom, (LPARAM)&ni)) { + if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, ni.hdr.idFrom, (LPARAM)&ni)) { /* Parent said: OK to adjust */ /* Now adjust value with (maybe new) delta */

1 0

[fireball] 31772: - Fix a bug in %SystemRoot% substitution branch.
by fireball＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: fireball Date: Mon Jan 14 15:31:35 2008 New Revision: 31772 URL: http://svn.reactos.org/svn/reactos?rev=31772&view=rev Log: - Fix a bug in %SystemRoot% substitution branch. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Jan 14 15:31:35 2008 @@ -1294,7 +1294,7 @@ if (dwStartType == SERVICE_BOOT_START) wcscpy(*lpCanonName, L"\\SystemRoot\\"); - wcscat(*lpCanonName, lpServiceName); + wcscat(*lpCanonName, lpServiceName + 13); DPRINT("Canonicalized name %S\n", *lpCanonName); return NO_ERROR;

1 0

[winesync] 31771: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:29:35 2008 New Revision: 31771 URL: http://svn.reactos.org/svn/reactos?rev=31771&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet.rbuild trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h Mon Jan 14 15:29:35 2008 @@ -403,11 +403,11 @@ #define FDI_INT_MAGIC 0xfdfdfd05 #define REALLY_IS_FCI(hfci) ( \ - (((void *) hfci) != NULL) && \ + ((hfci) != NULL) && \ (PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) ) #define REALLY_IS_FDI(hfdi) ( \ - (((void *) hfdi) != NULL) && \ + ((hfdi) != NULL) && \ (PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) ) /* Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild Mon Jan 14 15:29:35 2008 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="cabinet" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> +<group> +<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -16,3 +17,4 @@ <file>cabinet.rc</file> <file>cabinet.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Mon Jan 14 15:29:35 2008 @@ -229,7 +229,11 @@ file_in_list(pDestination->FileList, pfdin->psz1, &node); if (node && !node->DoExtract) + { + HeapFree(GetProcessHeap(), 0, szFullPath); + HeapFree(GetProcessHeap(), 0, szDirectory); return 0; + } /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES) Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Mon Jan 14 15:29:35 2008 @@ -188,7 +188,7 @@ return NULL; } - if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) { + if (!((hfci = (*pfnalloc)(sizeof(FCI_Int))))) { perf->erfOper = FCIERR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Mon Jan 14 15:29:35 2008 @@ -377,7 +377,7 @@ return NULL; } - if (!((rv = ((HFDI) (*pfnalloc)(sizeof(FDI_Int)))))) { + if (!((rv = (*pfnalloc)(sizeof(FDI_Int))))) { perf->erfOper = FDIERROR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; @@ -461,7 +461,7 @@ } /* otherwise, set the stream to just after the string and return */ - PFDI_SEEK(hfdi, hf, base + ((cab_off_t) strlen((char *) buf)) + 1, SEEK_SET); + PFDI_SEEK(hfdi, hf, base + strlen((char *)buf) + 1, SEEK_SET); return (char *) buf; } @@ -1138,7 +1138,7 @@ for(;;) { ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) + if((e = (t = tl + (b & ml))->e) > 16) do { if (e == 99) @@ -1146,7 +1146,7 @@ ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) if (e == 16) /* then it's a literal */ CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; @@ -1158,22 +1158,22 @@ /* get length of block to copy */ ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); + n = t->v.n + (b & Zipmask[e]); ZIPDUMPBITS(e); /* decode distance of block to copy */ ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) + if ((e = (t = td + (b & md))->e) > 16) do { if (e == 99) return 1; ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); + d = w - t->v.n - (b & Zipmask[e]); ZIPDUMPBITS(e) do { @@ -1217,10 +1217,10 @@ /* get the length and its complement */ ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); + n = (b & 0xffff); ZIPDUMPBITS(16) ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) + if (n != ((~b) & 0xffff)) return 1; /* error in compressed data */ ZIPDUMPBITS(16) @@ -1312,13 +1312,13 @@ /* read in table lengths */ ZIPNEEDBITS(5) - nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */ + nl = 257 + (b & 0x1f); /* number of literal/length codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(5) - nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */ + nd = 1 + (b & 0x1f); /* number of distance codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(4) - nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */ + nb = 4 + (b & 0xf); /* number of bit length codes */ ZIPDUMPBITS(4) if(nl > 288 || nd > 32) return 1; /* bad lengths */ @@ -1327,7 +1327,7 @@ for(j = 0; j < nb; j++) { ZIPNEEDBITS(3) - ll[Zipborder[j]] = (cab_ULONG)b & 7; + ll[Zipborder[j]] = b & 7; ZIPDUMPBITS(3) } for(; j < 19; j++) @@ -1349,7 +1349,7 @@ while((cab_ULONG)i < n) { ZIPNEEDBITS((cab_ULONG)bl) - j = (td = tl + ((cab_ULONG)b & m))->b; + j = (td = tl + (b & m))->b; ZIPDUMPBITS(j) j = td->v.n; if (j < 16) /* length of code in bits (0..15) */ @@ -1357,7 +1357,7 @@ else if (j == 16) /* repeat last length 3 to 6 times */ { ZIPNEEDBITS(2) - j = 3 + ((cab_ULONG)b & 3); + j = 3 + (b & 3); ZIPDUMPBITS(2) if((cab_ULONG)i + j > n) return 1; @@ -1367,7 +1367,7 @@ else if (j == 17) /* 3 to 10 zero length codes */ { ZIPNEEDBITS(3) - j = 3 + ((cab_ULONG)b & 7); + j = 3 + (b & 7); ZIPDUMPBITS(3) if ((cab_ULONG)i + j > n) return 1; @@ -1378,7 +1378,7 @@ else /* j == 18: 11 to 138 zero length codes */ { ZIPNEEDBITS(7) - j = 11 + ((cab_ULONG)b & 0x7f); + j = 11 + (b & 0x7f); ZIPDUMPBITS(7) if ((cab_ULONG)i + j > n) return 1; @@ -1436,7 +1436,7 @@ /* read in block type */ ZIPNEEDBITS(2) - t = (cab_ULONG)b & 3; + t = b & 3; ZIPDUMPBITS(2) /* restore the global bit buffer */

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008