From: Casper Hornstrup Date: Sat, 14 May 2005 12:37:12 +0000 (+0000) Subject: Merge 14981:15268 from trunk X-Git-Tag: backups/xmlbuildsystem@15601~41 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9d474ab0bd76eb7095b6c632fd1b404c6ea12c07 Merge 14981:15268 from trunk svn path=/branches/xmlbuildsystem/; revision=15273 --- 9d474ab0bd76eb7095b6c632fd1b404c6ea12c07 diff --cc reactos/drivers/dd/sound/dsp.c index bae086c91ff,8c6ab11575a..51668b4b7b0 --- a/reactos/drivers/dd/sound/dsp.c +++ b/reactos/drivers/dd/sound/dsp.c @@@ -4,15 -4,15 +4,15 @@@ * FILE: drivers/dd/sound/dsp.c * PURPOSE: Digital Signal Processing ? * PROGRAMMER: Snatched from ? - * - * UPDATE HISTORY: + * + * UPDATE HISTORY: * ??/??/??: Created * 10/23/02: Steven Edwards (Steven_Ed4153@yahoo.com) - * Minor build fix + * Minor build fix */ -#include "dsp.h" #include "sb16.h" +#include "dsp.h" /************************************ * unsigned char read_dsp(void) diff --cc reactos/drivers/dd/sound/mixer.c index 4b678e93013,dc3dc0d1287..30152610c18 --- a/reactos/drivers/dd/sound/mixer.c +++ b/reactos/drivers/dd/sound/mixer.c @@@ -4,15 -4,15 +4,15 @@@ * FILE: drivers/dd/sound/mixer.c * PURPOSE: Wave Mixer? * PROGRAMMER: ? - * - * UPDATE HISTORY: + * + * UPDATE HISTORY: * ??/??/??: Created * 10/23/02: Steven Edwards (Steven_Ed4153@yahoo.com) - * Minor build fixes + * Minor build fixes */ -#include "dsp.h" #include "sb16.h" +#include "dsp.h" #include "mixer.h" unsigned char read_mixer(unsigned short base,unsigned char reg) diff --cc reactos/drivers/dd/sound/sound.c index d084a5516af,2e51da97ff3..d85dfdaa4b9 --- a/reactos/drivers/dd/sound/sound.c +++ b/reactos/drivers/dd/sound/sound.c @@@ -77,20 -77,19 +77,20 @@@ NTSTATUS ModuleEntry(PDRIVER_OBJECT Dri * RETURNS: Success or failure */ { +#if 0 PDEVICE_OBJECT DeviceObject; NTSTATUS ret; - + DPRINT1("SoundBlaster 16 Driver 0.0.1\n"); if(sb16_getenvironment()!=SB_TRUE) { DPRINT1("Soundblaster 16 not found\n"); return 0; } -- ret = IoCreateDevice(DriverObject,0,"\\Device\\WaveOut",FILE_DEVICE_WAVE_OUT,0,FALSE,&DeviceObject); ++ ret = IoCreateDevice(DriverObject,0,L"\\Device\\WaveOut",FILE_DEVICE_WAVE_OUT,0,FALSE,&DeviceObject); if (ret!=STATUS_SUCCESS) return(ret); - + DeviceObject->Flags=0; DriverObject->MajorFunction[IRP_MJ_CLOSE] = Dispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] =Dispatch; diff --cc reactos/drivers/dd/sound/wave.c index 2f86adb41dd,b5d44266857..0b30da3b0ff --- a/reactos/drivers/dd/sound/wave.c +++ b/reactos/drivers/dd/sound/wave.c @@@ -42,8 -42,8 +42,8 @@@ void sb16_play(WAVE_HDR* wave KIRQL Dirql; KAFFINITY Affinity; PKINTERRUPT IrqObject; - unsigned int mask,newmask; + unsigned int newmask; - + unsigned int i; unsigned int tmp[255]; i=0; diff --cc reactos/lib/ntdll/rtl/intrlck.c index 597e8a09bac,7cc71987ffe..9504cb30dcb --- a/reactos/lib/ntdll/rtl/intrlck.c +++ b/reactos/lib/ntdll/rtl/intrlck.c @@@ -116,13 -116,14 +116,14 @@@ InterlockedExchange(LPLONG target, LON * RETURNS * Prior value of value pointed to by Destination */ -PVOID +LONG STDCALL - InterlockedCompareExchange(PLONG Destination, + InterlockedCompareExchange( - PVOID *Destination, - PVOID Exchange, - PVOID Comperand ) ++ PLONG Destination, + LONG Exchange, + LONG Comperand) - { + { - PVOID ret; + LONG ret; __asm__ ( /* lock for SMP systems */ "lock\n\t" "cmpxchgl %2,(%1)" diff --cc reactos/lib/ole32/ole32.xml index 6cddd5cf4e2,00000000000..54e1d2f00e0 mode 100644,000000..100644 --- a/reactos/lib/ole32/ole32.xml +++ b/reactos/lib/ole32/ole32.xml @@@ -1,52 -1,0 +1,54 @@@ + + + . + include/wine + + + + + 0x600 + 0x501 + 0x501 ++ + wine + uuid + ntdll + kernel32 + advapi32 + gdi32 + user32 + rpcrt4 + antimoniker.c + bindctx.c + clipboard.c + compobj.c + compositemoniker.c + datacache.c ++ dictionary.c + defaulthandler.c + errorinfo.c + filemoniker.c + ftmarshal.c + git.c + hglobalstream.c + ifs.c + itemmoniker.c + marshal.c + memlockbytes.c + moniker.c + ole2.c + ole2stubs.c + ole2impl.c + ole32_main.c + oleobj.c + oleproxy.c + regsvr.c + rpc.c + stg_bigblockfile.c + stg_prop.c + stg_stream.c + storage32.c + stubmanager.c + ole32res.rc + ole32.spec + diff --cc reactos/lib/riched20/riched20.xml index e3e97fc2578,00000000000..e67762220b5 mode 100644,000000..100644 --- a/reactos/lib/riched20/riched20.xml +++ b/reactos/lib/riched20/riched20.xml @@@ -1,33 -1,0 +1,34 @@@ + + + . + include/wine + + + + + 0x600 + 0x501 + 0x501 + uuid + wine + ntdll + kernel32 + user32 + gdi32 + caret.c + context.c + editor.c + list.c + paint.c + para.c + reader.c + richole.c + row.c + run.c + string.c + style.c + undo.c + wrap.c ++ writer.c + riched20.spec + diff --cc reactos/lib/rtl/rtl.xml index 189d2881222,00000000000..0e0082fcab9 mode 100644,000000..100644 --- a/reactos/lib/rtl/rtl.xml +++ b/reactos/lib/rtl/rtl.xml @@@ -1,48 -1,0 +1,49 @@@ + ++ . + + allshl.s + aulldiv.s + aullrem.s + allshr.s + allmul.s + aullshr.s + alldiv.s + allrem.s + chkstk.s + except.s + exception.c + + access.c + acl.c + bit.c + bitmap.c + bootdata.c + compress.c + dos8dot3.c + encode.c + env.c + error.c + exception.c + generictable.c + heap.c + image.c + largeint.c + luid.c + mem.c + network.c + nls.c + ppb.c + process.c + random.c + registry.c + sd.c + security.c + sid.c + splaytree.c + thread.c + time.c + timezone.c + unicode.c + unicodeprefix.c + version.c + diff --cc reactos/lib/shell32/document.ico index 8e2824e127d,00000000000..2173cbc4702 mode 100644,000000..100644 Binary files differ diff --cc reactos/lib/shell32/drive.ico index 62743306d7f,00000000000..48faa32a4bd mode 100644,000000..100644 Binary files differ diff --cc reactos/lib/shell32/folder.ico index 4a1e77f7664,00000000000..11ac83d299a mode 100644,000000..100644 Binary files differ diff --cc reactos/lib/shell32/folder_open.ico index 9aa4fbac664,00000000000..59fea026de2 mode 100644,000000..100644 Binary files differ diff --cc reactos/lib/shell32/mycomputer.ico index 68e81e42210,00000000000..2fa7be31219 mode 100644,000000..100644 Binary files differ diff --cc reactos/lib/shell32/printer.ico index 00000000000,00000000000..5d2e999a424 new file mode 100644 Binary files differ diff --cc reactos/ntoskrnl/kd/wrappers/gdbstub.c index b74e401f063,49e5d20c3d5..5574b2336c6 --- a/reactos/ntoskrnl/kd/wrappers/gdbstub.c +++ b/reactos/ntoskrnl/kd/wrappers/gdbstub.c @@@ -165,18 -165,67 +165,18 @@@ static CPU_REGISTER GspRegisters[NUMREG { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Fs), FIELD_OFFSET (CONTEXT, SegFs), TRUE }, { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Gs), FIELD_OFFSET (CONTEXT, SegGs), TRUE } }; - + static PCHAR GspThreadStates[DeferredReady+1] = - { "Initialized", - "Ready", + { "Initialized", + "Ready", "Running", - "Standby", - "Terminated", + "Standby", + "Terminated", "Waiting", - "Transition", - "DeferredReady" + "Transition", + "DeferredReady" }; -char * -strtok(char *s, const char *delim) -{ - const char *spanp; - int c, sc; - char *tok; - static char *last; - - - if (s == NULL && (s = last) == NULL) - return (NULL); - - /* - * Skip (span) leading delimiters (s += strspn(s, delim), sort of). - */ - cont: - c = *s++; - for (spanp = delim; (sc = *spanp++) != 0;) { - if (c == sc) - goto cont; - } - - if (c == 0) { /* no non-delimiter characters */ - last = NULL; - return (NULL); - } - tok = s - 1; - - /* - * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). - * Note that delim must have one NUL; we stop if we see that, too. - */ - for (;;) { - c = *s++; - spanp = delim; - do { - if ((sc = *spanp++) == c) { - if (c == 0) - s = NULL; - else - s[-1] = 0; - last = s; - return (tok); - } - } while (sc != 0); - } - /* NOTREACHED */ -} - LONG HexValue (CHAR ch) diff --cc reactos/ntoskrnl/ntoskrnl.xml index 50a97cb71c8,00000000000..b200bdf1a29 mode 100644,000000..100644 --- a/reactos/ntoskrnl/ntoskrnl.xml +++ b/reactos/ntoskrnl/ntoskrnl.xml @@@ -1,348 -1,0 +1,348 @@@ + + + + + + + + include + include + csq + hal + kjs + pseh + rtl + rosrtl + string + rossym + + ntoskrnl.h + + + + + main.S + bios.c + brkpoint.c + ctxswitch.S + exp.c + fpu.c + gdt.c + idt.c + irq.c + irqhand.s + kernel.c + ldt.c + stkswitch.S + syscall.S + thread.c + tlbflush.S + trap.s + tss.c + usercall.S + usertrap.c + v86m.c + v86m_sup.S + vdm.c + + + apc.c + bug.c + catch.c + clock.c + device.c + dpc.c + event.c + gate.c + gmutex.c + ipi.c + kqueue.c + kthread.c + main.c + mutex.c + process.c + profile.c + queue.c + sem.c + spinlock.c + timer.c + usercall.c + wait.c + + + cacheman.c + copy.c + fs.c + mdl.c + pin.c + view.c + + + import.c + ntfunc.c + regfile.c + registry.c + regobj.c + + + + + + + i386-dis.c + kdb_help.S + longjmp.S + setjmp.S + + + + + + kdb.c + kdb_cli.c + kdb_expr.c + kdb_keyboard.c + kdb_serial.c + kdb_string.c + + + kdb_symbols.c + + + + dbgkutil.c + debug.c + + + + + interlck.c + + + callback.c + dbgctrl.c + error.c + event.c + evtpair.c + fmutex.c + handle.c + init.c + interlck.c + list.c + lookas.c + mutant.c + power.c + profile.c + resource.c + rundown.c + sem.c + synch.c + sysinfo.c + time.c + timer.c + util.c + uuid.c + win32k.c + work.c + zone.c + zw.S + + - dbcsname.c ++ context.c ++ fastio.c + filelock.c + mcb.c - mdl.c + name.c + notify.c + oplock.c + pool.c + tunnel.c + unc.c + util.c + + + inbv.c + + + adapter.c + arcname.c + bootlog.c + controller.c + device.c + deviface.c + disk.c + driver.c + efi.c + error.c + event.c + file.c + fs.c + iocomp.c + iomgr.c + iowork.c + irp.c + irq.c + mdl.c + plugplay.c + pnpdma.c + pnpmgr.c + pnpnotify.c + pnpreport.c + pnproot.c + rawfs.c + remlock.c + resource.c + share.c + symlink.c + timer.c + vpb.c + wmi.c + + + + bochs.c + gdbstub.c + + kdinit.c + kdio.c + kdmain.c + + + init.c + loader.c + resource.c + rtl.c + sysdll.c + userldr.c + + + close.c + complete.c + connect.c + create.c + listen.c + port.c + query.c + queue.c + receive.c + reply.c + send.c + + + + + memsafe.s + page.c + pfault.c + + + anonmem.c + aspace.c + balance.c + cont.c + drvlck.c + elf32.c + elf64.c + freelist.c + iospace.c + kmap.c + marea.c + mdl.c + mm.c + process.c + mminit.c + mpw.c + ncache.c + npool.c + pagefile.c + pageop.c + pager.c + pagfault.c + paging.c + pe.c + physical.c + pool.c + ppool.c + region.c + rmap.c + section.c + verifier.c + virtual.c + wset.c + + + dirobj.c + handle.c + namespc.c + ntobj.c + object.c + sdcache.c + security.c + symlink.c + wait.c + + + power.c + + + + + continue.c + + + cid.c + debug.c + idle.c + job.c + kill.c + locale.c + notify.c + process.c + psmgr.c + query.c + quota.c + security.c + suspend.c + thread.c + win32.c + + + + + exception.c + seh.s + + + atom.c + capture.c + ctype.c + debug.c + handle.c + libsupp.c + message.c + misc.c + nls.c + purecall.c + rangelist.c + regio.c + sprintf.c + stdlib.c + string.c + strtok.c + swprintf.c + wstring.c + + + access.c + acl.c + audit.c + lsa.c + luid.c + priv.c + sd.c + semgr.c + sid.c + token.c + + ntoskrnl.rc + diff --cc reactos/subsys/system/regedit/hexedit.c index c305922322d,68c3e1286f4..a0596ed8719 --- a/reactos/subsys/system/regedit/hexedit.c +++ b/reactos/subsys/system/regedit/hexedit.c @@@ -21,8 -21,7 +21,8 @@@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include - #include +#include + #include #include #include "hexedit.h" @@@ -224,16 -223,16 +224,16 @@@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, H while(First <= Last && current < end) { DWORD dh; - + dx = hed->LeftMargin; - + /* draw address */ - _stprintf(addr, _T("%04X"), linestart); + _stprintf(addr, _T("%04lX"), linestart); TextOut(hDC, dx, dy, addr, 4); - + dx += ((4 + hed->AddressSpacing) * hed->CharWidth); dh = (3 * hed->CharWidth); - + rct.left = dx; rct.top = dy; rct.right = rct.left + dh; @@@ -275,8 -274,9 +275,8 @@@ static DWORD HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt) { - WINDOWINFO wi; int d; - + if(pt.x <= hed->LeftMargin) { return HEHT_LEFTMARGIN; diff --cc reactos/subsys/system/regedit/security.c index 74669b91d2d,25f4c5ef31a..2eb421a5a56 --- a/reactos/subsys/system/regedit/security.c +++ b/reactos/subsys/system/regedit/security.c @@@ -35,24 -35,7 +35,24 @@@ /****************************************************************************** Implementation of the CRegKeySecurity interface ******************************************************************************/ - + + static ifaceCRegKeySecurityVbtl efvt = +{ + /* IUnknown methods */ + CRegKeySecurity_fnQueryInterface, + CRegKeySecurity_fnAddRef, + CRegKeySecurity_fnRelease, + + /* CRegKeySecurity methods */ + CRegKeySecurity_fnGetObjectInformation, + CRegKeySecurity_fnGetSecurity, + CRegKeySecurity_fnSetSecurity, + CRegKeySecurity_fnGetAccessRights, + CRegKeySecurity_fnMapGeneric, + CRegKeySecurity_fnGetInheritTypes, + CRegKeySecurity_fnPropertySheetPageCallback +}; + SI_ACCESS RegAccess[] = { {&GUID_NULL, KEY_ALL_ACCESS, (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_FULLCONTROL), SI_ACCESS_GENERAL | SI_ACCESS_SPECIFIC}, {&GUID_NULL, KEY_READ, (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READ), SI_ACCESS_GENERAL}, diff --cc reactos/subsys/system/setup/setup.xml index 6d854af0b31,00000000000..988dd7a3da0 mode 100644,000000..100644 --- a/reactos/subsys/system/setup/setup.xml +++ b/reactos/subsys/system/setup/setup.xml @@@ -1,8 -1,0 +1,9 @@@ + + . + + 0x0400 + kernel32 ++ userenv + setup.c + setup.rc + diff --cc reactos/subsys/system/winefile/winefile.xml index e2809e68bde,00000000000..7a987c89bf7 mode 100644,000000..100644 --- a/reactos/subsys/system/winefile/winefile.xml +++ b/reactos/subsys/system/winefile/winefile.xml @@@ -1,21 -1,0 +1,22 @@@ + + . + + + 0x0501 + 0x0501 + + uuid + ntdll + kernel32 + gdi32 + user32 + comctl32 + comdlg32 + shell32 + ole32 + oleaut32 ++ mpr + license.c + winefile.c + winefile.rc + diff --cc reactos/subsys/win32k/main/dllmain.c index 494508aa4f2,8ac1f9a3b35..e0a3a17e912 --- a/reactos/subsys/win32k/main/dllmain.c +++ b/reactos/subsys/win32k/main/dllmain.c @@@ -388,7 -392,9 +388,7 @@@ DriverEntry used by win32 applications */ CreateStockObjects(); CreateSysColorObjects(); - + - PREPARE_TESTS - return STATUS_SUCCESS; }