Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 53779: Sync the recent changes from the themes merge to all languages, sync all the settings from the english rc file to all other languages. Fix some sizes and lengths
by dreimer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: dreimer Date: Tue Sep 20 20:43:42 2011 New Revision: 53779 URL: http://svn.reactos.org/svn/reactos?rev=53779&view=rev Log: Sync the recent changes from the themes merge to all languages, sync all the settings from the english rc file to all other languages. Fix some sizes and lengths Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc…

1 0

[gadamopoulos] 53778: [win32k] - Replace long file headers with short headers - Minor cleanup
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 19:41:33 2011 New Revision: 53778 URL: http://svn.reactos.org/svn/reactos?rev=53778&view=rev Log: [win32k] - Replace long file headers with short headers - Minor cleanup Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/debug.c trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/eng/gradient.c trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c trunk/reactos/subsystems/win32/win32k/eng/lineto.c trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/paint.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c trunk/reactos/subsystems/win32/win32k/eng/sort.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/transblt.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/session.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bezier.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/polyfill.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/rect.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c trunk/reactos/subsystems/win32/win32k/pch.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bezier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc…

1 0

[gadamopoulos] 53777: [win32k] - move function definitions from c files to headers
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 18:04:14 2011 New Revision: 53777 URL: http://svn.reactos.org/svn/reactos?rev=53777&view=rev Log: [win32k] - move function definitions from c files to headers Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -189,6 +189,13 @@ NTSTATUS NTAPI PsGetProcessExitStatus( + PEPROCESS Process +); + +NTKERNELAPI +BOOLEAN +NTAPI +PsGetProcessExitProcessCalled( PEPROCESS Process ); Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -1,7 +1,4 @@ #pragma once - -#include "window.h" -#include <include/win32.h> typedef struct _CLIP { @@ -16,7 +13,5 @@ VOID FASTCALL UserClipboardFreeWindow(PWND pWindow); -struct _WINSTATION_OBJECT; - VOID NTAPI UserEmptyClipboardData(struct _WINSTATION_OBJECT *pWinSta); Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -3,3 +3,4 @@ INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); +int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -51,7 +51,8 @@ BOOL UserInitDefaultKeyboardLayout(VOID); PKBL UserHklToKbl(HKL hKl); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); - +VOID FASTCALL DoTheScreenSaver(VOID); +WORD FASTCALL get_key_state(void); #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -69,3 +69,7 @@ PMENU_OBJECT FASTCALL IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu); + +UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget ); +UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); + Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -145,6 +145,9 @@ IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest, PUNICODE_STRING Source); +HBITMAP NTAPI UserLoadImage(PCWSTR); + +BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -5,3 +5,5 @@ BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL); +VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); +BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -175,3 +175,6 @@ } SPIBUFFER; extern SPIVALUES gspv; + +BOOL InitSysParams(); + Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -177,4 +177,6 @@ #define UNIMPLEMENTED #endif +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) + BOOL DbgInitDebugChannels(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -38,10 +38,6 @@ DBG_DEFAULT_CHANNEL(UserAccel); -UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget ); -HMENU FASTCALL IntGetSubMenu( HMENU hMenu, int nPos); -UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); - /* FUNCTIONS *****************************************************************/ PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -10,9 +10,6 @@ /* INCLUDES ******************************************************************/ #include <win32k.h> - -#define NDEBUG -#include <debug.h> /* CALLPROC ******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -11,8 +11,6 @@ #include <intrin.h> DBG_DEFAULT_CHANNEL(UserDisplay); - -BOOL InitSysParams(); BOOL gbBaseVideo = 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -19,11 +19,6 @@ PKBL KBLList = NULL; // Keyboard layout list. typedef PVOID (*KbdLayerDescriptor)(VOID); -NTSTATUS APIENTRY LdrGetProcedureAddress(PVOID module, - PANSI_STRING import_name, - DWORD flags, - PVOID *func_addr); - /* PRIVATE FUNCTIONS ******************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -13,8 +13,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMsg); - -BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -15,8 +15,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMsgQ); - -VOID FASTCALL DoTheScreenSaver(VOID); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -12,8 +12,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); - -BOOL InitSysParams(); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -13,13 +13,8 @@ #include <win32k.h> -#include <winsta.h> - DBG_DEFAULT_CHANNEL(UserSysparams); -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) -HBITMAP NTAPI UserLoadImage(PCWSTR); -BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); SPIVALUES gspv; BOOL gbSpiInitialized = FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -15,8 +15,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserTimer); - -WORD FASTCALL get_key_state(void); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -12,8 +12,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDce); - -int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -30,12 +30,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserWinpos); - -VOID FASTCALL -co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); - -BOOL FASTCALL -IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -457,9 +457,6 @@ return TRUE; } -int FASTCALL -CLIPPING_UpdateGCRegion(DC* Dc); - static void DC_vUpdateDC(PDC pdc)

1 0

[tkreuzer] 53776: [RTL] - Remove qsort, its already in crt. - Fix a number of MSVC/64 bit issues
by tkreuzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: tkreuzer Date: Tue Sep 20 17:33:51 2011 New Revision: 53776 URL: http://svn.reactos.org/svn/reactos?rev=53776&view=rev Log: [RTL] - Remove qsort, its already in crt. - Fix a number of MSVC/64 bit issues Removed: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/acl.c trunk/reactos/lib/rtl/bitmap.c trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/env.c trunk/reactos/lib/rtl/path.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -42,7 +42,6 @@ ppb.c process.c propvar.c - qsort.c random.c rangelist.c registry.c Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -461,7 +461,7 @@ { PACE Ace; PACE Current; - ULONG NewAceCount; + WORD NewAceCount; ULONG Index; PAGED_CODE_RTL(); @@ -515,7 +515,7 @@ (ULONG)((ULONG_PTR)Ace - (ULONG_PTR)Current)); Acl->AceCount = Acl->AceCount + NewAceCount; - Acl->AclRevision = AclRevision; + Acl->AclRevision = (BYTE)AclRevision; return STATUS_SUCCESS; } @@ -737,8 +737,8 @@ } AclSize = ROUND_UP(AclSize, 4); - Acl->AclSize = AclSize; - Acl->AclRevision = AclRevision; + Acl->AclSize = (WORD)AclSize; + Acl->AclRevision = (BYTE)AclRevision; Acl->AceCount = 0; Acl->Sbz1 = 0; Acl->Sbz2 = 0; @@ -850,7 +850,7 @@ return STATUS_INVALID_PARAMETER; } - Acl->AclRevision = Info->AclRevision; + Acl->AclRevision = (BYTE)Info->AclRevision; } break; Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=53776… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -81,7 +81,7 @@ BitScanForward(&BitPos, Value); /* Calculate length up to where we read */ - Length = (Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; + Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; Length += BitPos - 32; /* Make sure we don't go past the last bit */ @@ -130,7 +130,7 @@ BitScanForward(&BitPos, InvValue); /* Calculate length up to where we read */ - Length = (Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; + Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; Length += BitPos - 32; /* Make sure we don't go past the last bit */ Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -407,7 +407,7 @@ RtlSetCriticalSectionSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) { - ULONG OldCount = CriticalSection->SpinCount; + ULONG OldCount = (ULONG)CriticalSection->SpinCount; /* Set to parameter if MP, or to 0 if this is Uniprocessor */ CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=53… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -36,7 +36,7 @@ } Buf->ViewBaseClient = Buf; - Buf->ViewSize = ViewSize; + Buf->ViewSize = (ULONG)ViewSize; DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); @@ -203,7 +203,7 @@ p = strrchr(ModulePtr->FullPathName, '\\'); if (p != NULL) - ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; + ModulePtr->OffsetToFileName = (USHORT)(p - ModulePtr->FullPathName + 1); else ModulePtr->OffsetToFileName = 0; @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; + ULONG Pid = (ULONG)(ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=53776&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -57,7 +57,7 @@ NTSTATUS Status; STRING DebugString; CHAR Buffer[512]; - ULONG Length, PrefixLength; + SIZE_T Length, PrefixLength; EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ @@ -110,7 +110,7 @@ } /* Build the string */ - DebugString.Length = Length; + DebugString.Length = (USHORT)Length; DebugString.Buffer = Buffer; /* First, let the debugger know as well */ @@ -281,7 +281,7 @@ Input.Buffer = Response; /* Setup the output string */ - Output.Length = strlen(Prompt); + Output.Length = (USHORT)strlen(Prompt); Output.Buffer = (PCHAR)Prompt; /* Call the system service */ @@ -380,9 +380,9 @@ /* Setup the strings */ NameString.Buffer = (PCHAR)Name; - NameString.Length = strlen(Name); + NameString.Length = (USHORT)strlen(Name); CommandString.Buffer = (PCHAR)Command; - CommandString.Length = strlen(Command); + CommandString.Length = (USHORT)strlen(Command); /* Send them to the debugger */ DebugService2(&NameString, &CommandString, BREAKPOINT_COMMAND_STRING); Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -119,7 +119,7 @@ { c = 0; RtlUpcaseUnicodeToOemN(&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - if (Count != 1 || c == 0 || RtlpIsShortIllegal(Name->Buffer[i])) + if (Count != 1 || c == 0 || RtlpIsShortIllegal(c)) { ExtBuffer[ExtLength++] = L'_'; } @@ -211,12 +211,12 @@ j += IndexLength + 1; memcpy(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); - Name8dot3->Length = (j + ExtLength) * sizeof(WCHAR); + Name8dot3->Length = (USHORT)(j + ExtLength) * sizeof(WCHAR); DPRINT("Name8dot3: '%wZ'\n", Name8dot3); /* Update context */ - Context->NameLength = CopyLength; + Context->NameLength = (UCHAR)CopyLength; Context->ExtensionLength = ExtLength; memcpy(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); memcpy(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -163,11 +163,11 @@ if (Tail != 0) { Variable.MaximumLength = - Variable.Length = (VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR); + Variable.Length = (USHORT)(VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR); Variable.Buffer = SourceBuffer + 1; Value.Length = 0; - Value.MaximumLength = DestMax * sizeof(WCHAR); + Value.MaximumLength = (USHORT)DestMax * sizeof(WCHAR); Value.Buffer = DestBuffer; Status = RtlQueryEnvironmentVariable_U(Environment, &Variable, @@ -227,7 +227,7 @@ else ReturnStatus = STATUS_BUFFER_TOO_SMALL; - Destination->Length = (DestBuffer - Destination->Buffer) * sizeof(WCHAR); + Destination->Length = (USHORT)(DestBuffer - Destination->Buffer) * sizeof(WCHAR); if (Length != NULL) *Length = TotalLength * sizeof(WCHAR); @@ -271,7 +271,7 @@ { MEMORY_BASIC_INFORMATION mbi; UNICODE_STRING var; - int hole_len, new_len, env_len = 0; + size_t hole_len, new_len, env_len = 0; WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0; PWSTR head = NULL; SIZE_T size = 0, new_size; @@ -328,7 +328,7 @@ } if (*wcs) { - var.Length = (wcs - var.Buffer) * sizeof(WCHAR); + var.Length = (USHORT)(wcs - var.Buffer) * sizeof(WCHAR); var.MaximumLength = var.Length; val = ++wcs; wcs += wcslen(wcs); @@ -532,14 +532,14 @@ } if (*wcs) { - var.Length = var.MaximumLength = (wcs - var.Buffer) * sizeof(WCHAR); + var.Length = var.MaximumLength = (USHORT)(wcs - var.Buffer) * sizeof(WCHAR); val = ++wcs; wcs += wcslen(wcs); DPRINT("Search at :%S\n", wcs); if (RtlEqualUnicodeString(&var, Name, TRUE)) { - Value->Length = (wcs - val) * sizeof(WCHAR); + Value->Length = (USHORT)(wcs - val) * sizeof(WCHAR); if (Value->Length <= Value->MaximumLength) { memcpy(Value->Buffer, val, Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=53776&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -47,7 +47,7 @@ { UNICODE_STRING DeviceName; PWCHAR Start, End, Ptr; - ULONG DeviceNameLength; + SIZE_T DeviceNameLength; /* Validate the input */ if (!PathString) return 0; @@ -363,9 +363,9 @@ } /* Build the final NT path string */ - NtPath->Length = DosLength; + NtPath->Length = (USHORT)DosLength; NtPath->Buffer = NewBuffer; - NtPath->MaximumLength = DosLength + sizeof(UNICODE_NULL); + NtPath->MaximumLength = (USHORT)DosLength + sizeof(UNICODE_NULL); return STATUS_SUCCESS; } @@ -502,8 +502,8 @@ /* Setup the actual NT path string and terminate it */ NtName->Buffer = NewBuffer; - NtName->Length = Length; - NtName->MaximumLength = MaxLength; + NtName->Length = (USHORT)Length; + NtName->MaximumLength = (USHORT)MaxLength; NewBuffer[LengthChars] = UNICODE_NULL; DPRINT("new buffer: %S\n", NewBuffer); DPRINT("NT Name: %wZ\n", NtName); @@ -550,7 +550,7 @@ { Length = ((cd->DosPath.Length / sizeof(WCHAR)) - PrefixCut) + ((InputPathType == 1) ? 8 : 4); RelativeName->RelativeName.Buffer = NewBuffer + Length; - RelativeName->RelativeName.Length = NtName->Length - (Length * sizeof(WCHAR)); + RelativeName->RelativeName.Length = NtName->Length - (USHORT)(Length * sizeof(WCHAR)); RelativeName->RelativeName.MaximumLength = RelativeName->RelativeName.Length; RelativeName->ContainingDirectory = cd->Handle; } @@ -875,7 +875,7 @@ IO_STATUS_BLOCK iosb; PCURDIR cd; NTSTATUS Status; - ULONG size; + USHORT size; HANDLE handle = NULL; PWSTR ptr; @@ -1055,7 +1055,7 @@ LPWSTR buffer, ULONG size) { - ULONG reqsize = 0, mark = 0, dep = 0, deplen; + SIZE_T reqsize = 0, mark = 0, dep = 0, deplen; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -1103,7 +1103,7 @@ var.MaximumLength = 4 * sizeof(WCHAR); var.Buffer = tmp; val.Length = 0; - val.MaximumLength = size; + val.MaximumLength = (USHORT)size; val.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, size); if (val.Buffer == NULL) { @@ -1221,12 +1221,12 @@ if (ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str); - collapse_path( buffer, mark ); + collapse_path( buffer, (ULONG)mark ); reqsize = wcslen(buffer) * sizeof(WCHAR); done: RtlReleasePebLock(); - return reqsize; + return (ULONG)reqsize; } Removed: trunk/reactos/lib/rtl/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/qsort.c?rev=53775&… ============================================================================== --- trunk/reactos/lib/rtl/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/qsort.c (removed) @@ -1,220 +1,0 @@ -/* - * COPYRIGHT: - *- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * PROJECT: ReactOS system libraries - * PURPOSE: Unicode Conversion Routines - * FILE: lib/rtl/qsort.c - * PROGRAMMER: Adapted from CygWin newlib 2000-03-12. - */ -#include <rtl.h> - -/* FIXME: these types should be from the default includes */ - -typedef int (__cdecl* _pfunccmp_t) (const void *, const void *); - -/* - * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". - */ -#define swapcode(TYPE, parmi, parmj, n) { \ - long i = (n) / sizeof (TYPE); \ - register TYPE *pi = (TYPE *) (parmi); \ - register TYPE *pj = (TYPE *) (parmj); \ - do { \ - register TYPE t = *pi; \ - *pi++ = *pj; \ - *pj++ = t; \ - } while (--i > 0); \ -} - -#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ - es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; - -static __inline void -swapfunc ( - char * a, - char * b, - int n, - int swaptype - ) -{ - if(swaptype <= 1) - swapcode(long, a, b, n) - else - swapcode(char, a, b, n) -} - -#define swap(a, b) \ - if (swaptype == 0) { \ - long t = *(long *)(a); \ - *(long *)(a) = *(long *)(b); \ - *(long *)(b) = t; \ - } else \ - swapfunc(a, b, es, swaptype) - -#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) - -static __inline char * -med3 ( - char * a, - char * b, - char * c, - _pfunccmp_t cmp - ) -{ - return cmp(a, b) < 0 ? - (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a )) - :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c )); -} - - -/* EXPORTED */ -void -__cdecl -qsort ( - void * a, - size_t n, - size_t es, - _pfunccmp_t cmp - ) -{ - char *pa, *pb, *pc, *pd, *pl, *pm, *pn; - int d, r, swaptype, swap_cnt; - -loop: SWAPINIT(a, es); - swap_cnt = 0; - if (n < 7) - { - for ( pm = (char *) a + es; - pm < (char *) a + n * es; - pm += es - ) - { - for ( pl = pm; - pl > (char *) a && cmp(pl - es, pl) > 0; - pl -= es - ) - { - swap(pl, pl - es); - } - } - return; - } - pm = (char *) a + (n / 2) * es; - if (n > 7) - { - pl = (char *) a; - pn = (char *) a + (n - 1) * es; - if (n > 40) - { - d = (n / 8) * es; - pl = med3(pl, pl + d, pl + 2 * d, cmp); - pm = med3(pm - d, pm, pm + d, cmp); - pn = med3(pn - 2 * d, pn - d, pn, cmp); - } - pm = med3(pl, pm, pn, cmp); - } - swap(a, pm); - pa = pb = (char *) a + es; - - pc = pd = (char *) a + (n - 1) * es; - for (;;) - { - while (pb <= pc && (r = cmp(pb, a)) <= 0) - { - if (r == 0) - { - swap_cnt = 1; - swap(pa, pb); - pa += es; - } - pb += es; - } - while (pb <= pc && (r = cmp(pc, a)) >= 0) - { - if (r == 0) - { - swap_cnt = 1; - swap(pc, pd); - pd -= es; - } - pc -= es; - } - if (pb > pc) - { - break; - } - swap(pb, pc); - swap_cnt = 1; - pb += es; - pc -= es; - } - if (swap_cnt == 0) /* Switch to insertion sort */ - { - for ( pm = (char *) a + es; - pm < (char *) a + n * es; - pm += es - ) - { - for ( pl = pm; - pl > (char *) a && cmp(pl - es, pl) > 0; - pl -= es - ) - { - swap(pl, pl - es); - } - } - return; - } - - pn = (char *) a + n * es; - r = min(pa - (char *)a, pb - pa); - vecswap(a, pb - r, r); - r = min(pd - pc, pn - pd - es); - vecswap(pb, pn - r, r); - if ((r = pb - pa) > es) - { - qsort(a, r / es, es, cmp); - } - if ((r = pd - pc) > es) - { - /* Iterate rather than recurse to save stack space */ - a = pn - r; - n = r / es; - goto loop; - } -/* qsort(pn - r, r / es, es, cmp);*/ -} - - -/* EOF */ Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -81,7 +81,6 @@ <file>ppb.c</file> <file>process.c</file> <file>propvar.c</file> - <file>qsort.c</file> <file>random.c</file> <file>rangelist.c</file> <file>registry.c</file> Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=53776&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -120,7 +120,7 @@ return STATUS_UNKNOWN_REVISION; } - pSD->Revision = Revision; + pSD->Revision = SECURITY_DESCRIPTOR_REVISION1; pSD->Sbz1 = 0; pSD->Control = 0; pSD->Owner = NULL; @@ -144,10 +144,10 @@ DWORD OwnerLength, GroupLength; PISECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor; PISECURITY_DESCRIPTOR destSD = pDestinationSecurityDescriptor; - + if (srcSD->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; - + /* Copy non relative dependent data */ destSD->Revision = srcSD->Revision; destSD->Sbz1 = srcSD->Sbz1; @@ -230,7 +230,7 @@ return STATUS_UNKNOWN_REVISION; } - SecurityDescriptor->Revision = Revision; + SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION1; SecurityDescriptor->Sbz1 = 0; SecurityDescriptor->Control = SE_SELF_RELATIVE; SecurityDescriptor->Owner = 0; Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -332,7 +332,7 @@ { WCHAR Buffer[256]; PWSTR wcs; - ULONG Length; + SIZE_T Length; ULONG i; PISID Sid = Sid_; @@ -387,7 +387,7 @@ if (Length > String->MaximumLength) return STATUS_BUFFER_TOO_SMALL; - String->Length = Length; + String->Length = (USHORT)Length; RtlCopyMemory (String->Buffer, Buffer, Length);

1 0

[gadamopoulos] 53775: [win32k] - Remove a defined but not used definition of POINT_IN_RECT
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 15:21:29 2011 New Revision: 53775 URL: http://svn.reactos.org/svn/reactos?rev=53775&view=rev Log: [win32k] - Remove a defined but not used definition of POINT_IN_RECT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Sep 20 15:21:29 2011 @@ -13,8 +13,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserWnd); - -#define POINT_IN_RECT(p, r) (((r.bottom >= p.y) && (r.top <= p.y))&&((r.left <= p.x )&&( r.right >= p.x ))) /* HELPER FUNCTIONS ***********************************************************/

1 0

[pschweitzer] 53774: [SYSSETUP] Fix broken logic in CreateShortcut() and add an explicit overall
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 14:21:21 2011 New Revision: 53774 URL: http://svn.reactos.org/svn/reactos?rev=53774&view=rev Log: [SYSSETUP] Fix broken logic in CreateShortcut() and add an explicit overall Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Sep 20 14:21:21 2011 @@ -153,20 +153,21 @@ &lpFilePart); if (dwLen != 0 && dwLen <= sizeof(szWorkingDir) / sizeof(szWorkingDir[0])) { + /* Since those should only be called with (.exe) files, + lpFilePart has not to be NULL */ + ASSERT(lpFilePart != NULL); + /* Save the file name */ _tcscpy(exeName, lpFilePart); - if (lpFilePart != NULL) - { - /* We're only interested in the path. Cut the file name off. - Also remove the trailing backslash unless the working directory - is only going to be a drive, ie. C:\ */ - *(lpFilePart--) = _T('\0'); - if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && - szWorkingDir[2] == _T('\\'))) - { - *lpFilePart = _T('\0'); - } + /* We're only interested in the path. Cut the file name off. + Also remove the trailing backslash unless the working directory + is only going to be a drive, ie. C:\ */ + *(lpFilePart--) = _T('\0'); + if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && + szWorkingDir[2] == _T('\\'))) + { + *lpFilePart = _T('\0'); } lpWorkingDir = szWorkingDir;

1 0

[gadamopoulos] 53773: [uxtheme] - Fix double includes
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 13:55:35 2011 New Revision: 53773 URL: http://svn.reactos.org/svn/reactos?rev=53773&view=rev Log: [uxtheme] - Fix double includes Modified: trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -21,8 +21,6 @@ #include "uxthemep.h" #include "wine/debug.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /***********************************************************************/ Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -20,9 +20,7 @@ #include "uxthemep.h" #include "wine/debug.h" - #include "wine/unicode.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

1 0

[pschweitzer] 53772: [KERNEL32] Fix wrong sizeof usage
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 13:53:25 2011 New Revision: 53772 URL: http://svn.reactos.org/svn/reactos?rev=53772&view=rev Log: [KERNEL32] Fix wrong sizeof usage Modified: trunk/reactos/dll/win32/kernel32/client/power.c Modified: trunk/reactos/dll/win32/kernel32/client/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] Tue Sep 20 13:53:25 2011 @@ -40,7 +40,7 @@ return FALSE; } - RtlZeroMemory(PowerStatus, sizeof(LPSYSTEM_POWER_STATUS)); + RtlZeroMemory(PowerStatus, sizeof(SYSTEM_POWER_STATUS)); PowerStatus->BatteryLifeTime = BATTERY_LIFE_UNKNOWN; PowerStatus->BatteryFullLifeTime = BATTERY_LIFE_UNKNOWN;

1 0

[gadamopoulos] 53771: [uxtheme] - Use precompiled headers
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 13:08:36 2011 New Revision: 53771 URL: http://svn.reactos.org/svn/reactos?rev=53771&view=rev Log: [uxtheme] - Use precompiled headers Added: trunk/reactos/dll/win32/uxtheme/uxthemep.h (with props) Removed: trunk/reactos/dll/win32/uxtheme/msstyles.h trunk/reactos/dll/win32/uxtheme/ncthm.h trunk/reactos/dll/win32/uxtheme/uxthemedll.h Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/ncscrollbar.c trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/property.c trunk/reactos/dll/win32/uxtheme/stylemap.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -27,5 +27,6 @@ target_link_libraries(uxtheme wine) add_delay_importlibs(uxtheme msimg32) add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) +add_pch(uxtheme uxthemep.h) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) add_importlib_target(uxtheme.spec) Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,17 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdlib.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,21 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdlib.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" -#include "uxthemedll.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" @@ -1881,7 +1868,7 @@ hbmp = UXTHEME_DrawThemePartToDib(hTheme, hdc, iPartId, iStateId, pRect); /* Retrieve the info of the dib section */ - GetObject(hbmp, sizeof (DIBSECTION), &dib); + GetObjectW(hbmp, sizeof (DIBSECTION), &dib); /* Convert the bits of the dib section to a region */ *pRegion = UXTHEME_RegionFromDibBits((RGBQUAD*)dib.dsBm.bmBits, &clrTransparent, pRect); Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,13 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "uxthemedll.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,19 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,21 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/unicode.h" #include "wine/debug.h" Removed: trunk/reactos/dll/win32/uxtheme/msstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.h (removed) @@ -1,118 +1,0 @@ -/* - * Internal msstyles related defines & declarations - * - * Copyright (C) 2003 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_MSSTYLES_H -#define __WINE_MSSTYLES_H - -#define TMT_ENUM 200 - -#define MAX_THEME_APP_NAME 60 -#define MAX_THEME_CLASS_NAME 60 -#define MAX_THEME_VALUE_NAME 60 - -typedef struct _THEME_PROPERTY { - int iPrimitiveType; - int iPropertyId; - PROPERTYORIGIN origin; - - LPCWSTR lpValue; - DWORD dwValueLen; - - struct _THEME_PROPERTY *next; -} THEME_PROPERTY, *PTHEME_PROPERTY; - -typedef struct _THEME_PARTSTATE { - int iPartId; - int iStateId; - PTHEME_PROPERTY properties; - - struct _THEME_PARTSTATE *next; -} THEME_PARTSTATE, *PTHEME_PARTSTATE; - -struct _THEME_FILE; - -typedef struct _THEME_CLASS { - HMODULE hTheme; - struct _THEME_FILE* tf; - WCHAR szAppName[MAX_THEME_APP_NAME]; - WCHAR szClassName[MAX_THEME_CLASS_NAME]; - PTHEME_PARTSTATE partstate; - struct _THEME_CLASS *overrides; - - struct _THEME_CLASS *next; -} THEME_CLASS, *PTHEME_CLASS; - -typedef struct _THEME_IMAGE { - WCHAR name[MAX_PATH]; - HBITMAP image; - BOOL hasAlpha; - - struct _THEME_IMAGE *next; -} THEME_IMAGE, *PTHEME_IMAGE; - -typedef struct _THEME_FILE { - DWORD dwRefCount; - HMODULE hTheme; - WCHAR szThemeFile[MAX_PATH]; - LPWSTR pszAvailColors; - LPWSTR pszAvailSizes; - - LPWSTR pszSelectedColor; - LPWSTR pszSelectedSize; - - PTHEME_CLASS classes; - PTHEME_PROPERTY metrics; - PTHEME_IMAGE images; -} THEME_FILE, *PTHEME_FILE; - -typedef struct _UXINI_FILE *PUXINI_FILE; - -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); -BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); -BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); -BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); -PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); -PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); -HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); - -HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); -HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); -HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); -HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); -HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); -HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); -HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); -HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); -HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); - -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); -void UXINI_CloseINI(PUXINI_FILE uf); -LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); -BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); -LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); -BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); - -#endif Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -9,14 +9,7 @@ * Copyright 1994, 1996 Alexandre Julliard */ -#include <windows.h> -#include "undocuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include <tmschema.h> -#include <windowsx.h> -#include "ncthm.h" -#include <assert.h> +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Removed: trunk/reactos/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncthm.h?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncthm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncthm.h (removed) @@ -1,106 +1,0 @@ - -typedef struct _WND_CONTEXT -{ - BOOL HasAppDefinedRgn; - BOOL HasThemeRgn; - BOOL UpdatingRgn; -} WND_CONTEXT, *PWND_CONTEXT; - -typedef struct _DRAW_CONTEXT -{ - HWND hWnd; - HDC hDC; - HTHEME theme; - HTHEME scrolltheme; - HTHEME hPrevTheme; - WINDOWINFO wi; - BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ - HRGN hRgn; - int CaptionHeight; - - /* for double buffering */ - HDC hDCScreen; - HBITMAP hbmpOld; -} DRAW_CONTEXT, *PDRAW_CONTEXT; - -typedef enum -{ - CLOSEBUTTON, - MAXBUTTON, - MINBUTTON, - HELPBUTTON -} CAPTIONBUTTON; - -/* -The following values specify all possible vutton states -Note that not all of them are documented but it is easy to -find them by opening a theme file -*/ -typedef enum { - BUTTON_NORMAL = 1 , - BUTTON_HOT , - BUTTON_PRESSED , - BUTTON_DISABLED , - BUTTON_INACTIVE -} THEME_BUTTON_STATES; - - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - -#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ - ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ - ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ - (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ - (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) - -#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) - -#define BUTTON_GAP_SIZE 2 - -#define MENU_BAR_ITEMS_SPACE (12) - -#define SCROLL_TIMER 0 /* Scroll timer id */ - - /* Overlap between arrows and thumb */ -#define SCROLL_ARROW_THUMB_OVERLAP 0 - - /* Delay (in ms) before first repetition when holding the button down */ -#define SCROLL_FIRST_DELAY 200 - - /* Delay (in ms) between scroll repetitions */ -#define SCROLL_REPEAT_DELAY 50 - -/* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 6 - -/* Minimum size of the rectangle between the arrows */ -#define SCROLL_MIN_RECT 4 - -void -ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); - -VOID -NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); - -void -ThemeInitDrawContext(PDRAW_CONTEXT pcontext, - HWND hWnd, - HRGN hRgn); - -void -ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); - -PWND_CONTEXT -ThemeGetWndContext(HWND hWnd); - -extern ATOM atWindowTheme; -extern ATOM atWndContrext; - Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,14 +6,7 @@ * PROGRAMMER: Giannis Adamopoulos */ -#include <windows.h> -#include <windowsx.h> -#include "undocuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include <tmschema.h> -#include "ncthm.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/stylemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/stylemap… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,16 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "tmschema.h" - -#define TMT_ENUM 200 +#include "uxthemep.h" +#include "wine/debug.h" typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" -#include "uxundoc.h" - -#include "uxthemedll.h" -#include "msstyles.h" -#include "ncthm.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,15 +6,7 @@ * PROGRAMMER: Giannis Adamopoulos */ -#include <windows.h> -#include <undocuser.h> - -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "ncthm.h" -#include "tmschema.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -42,7 +35,7 @@ LPCWSTR lpIni; LPCWSTR lpCurLoc; LPCWSTR lpEnd; -} UXINI_FILE, *PUXINI_FILE; +} UXINI_FILE; /***********************************************************************/ Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,6 +6,7 @@ <include base="uxtheme">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <pch>uxthemep.h</pch> <file>buffer.c</file> <file>draw.c</file> <file>main.c</file> Removed: trunk/reactos/dll/win32/uxtheme/uxthemedll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemed… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemedll.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemedll.h (removed) @@ -1,35 +1,0 @@ -/* - * Internal uxtheme defines & declarations - * - * Copyright (C) 2003 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_UXTHEMEDLL_H -#define __WINE_UXTHEMEDLL_H - -extern void UXTHEME_InitSystem(HINSTANCE hInst); -extern void UXTHEME_LoadTheme(BOOL bLoad); -extern BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); - -/* No alpha blending */ -#define ALPHABLEND_NONE 0 -/* "Cheap" binary alpha blending - but possibly faster */ -#define ALPHABLEND_BINARY 1 -/* Full alpha blending */ -#define ALPHABLEND_FULL 2 - -#endif /* __WINE_UXTHEMEDLL_H */ Added: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h (added) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -1,0 +1,212 @@ +#include <windows.h> +#include <windowsx.h> +#include <undocuser.h> +#include <uxtheme.h> +#include <uxundoc.h> +#include <vfwmsgs.h> +#include <tmschema.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> + +#define TMT_ENUM 200 + +#define MAX_THEME_APP_NAME 60 +#define MAX_THEME_CLASS_NAME 60 +#define MAX_THEME_VALUE_NAME 60 + +typedef struct _THEME_PROPERTY { + int iPrimitiveType; + int iPropertyId; + PROPERTYORIGIN origin; + + LPCWSTR lpValue; + DWORD dwValueLen; + + struct _THEME_PROPERTY *next; +} THEME_PROPERTY, *PTHEME_PROPERTY; + +typedef struct _THEME_PARTSTATE { + int iPartId; + int iStateId; + PTHEME_PROPERTY properties; + + struct _THEME_PARTSTATE *next; +} THEME_PARTSTATE, *PTHEME_PARTSTATE; + +struct _THEME_FILE; + +typedef struct _THEME_CLASS { + HMODULE hTheme; + struct _THEME_FILE* tf; + WCHAR szAppName[MAX_THEME_APP_NAME]; + WCHAR szClassName[MAX_THEME_CLASS_NAME]; + PTHEME_PARTSTATE partstate; + struct _THEME_CLASS *overrides; + + struct _THEME_CLASS *next; +} THEME_CLASS, *PTHEME_CLASS; + +typedef struct _THEME_IMAGE { + WCHAR name[MAX_PATH]; + HBITMAP image; + BOOL hasAlpha; + + struct _THEME_IMAGE *next; +} THEME_IMAGE, *PTHEME_IMAGE; + +typedef struct _THEME_FILE { + DWORD dwRefCount; + HMODULE hTheme; + WCHAR szThemeFile[MAX_PATH]; + LPWSTR pszAvailColors; + LPWSTR pszAvailSizes; + + LPWSTR pszSelectedColor; + LPWSTR pszSelectedSize; + + PTHEME_CLASS classes; + PTHEME_PROPERTY metrics; + PTHEME_IMAGE images; +} THEME_FILE, *PTHEME_FILE; + +typedef struct _UXINI_FILE *PUXINI_FILE; + +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); +HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); +BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); +BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); +BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); +PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); +PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); +PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); +PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); +HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); + +HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); +HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); +HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); +HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); +HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); +HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); +HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); +HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); +HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); + +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); +void UXINI_CloseINI(PUXINI_FILE uf); +LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); +BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); +LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); +BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); + + + +typedef struct _WND_CONTEXT +{ + BOOL HasAppDefinedRgn; + BOOL HasThemeRgn; + BOOL UpdatingRgn; +} WND_CONTEXT, *PWND_CONTEXT; + +typedef struct _DRAW_CONTEXT +{ + HWND hWnd; + HDC hDC; + HTHEME theme; + HTHEME scrolltheme; + HTHEME hPrevTheme; + WINDOWINFO wi; + BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ + HRGN hRgn; + int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; +} DRAW_CONTEXT, *PDRAW_CONTEXT; + +typedef enum +{ + CLOSEBUTTON, + MAXBUTTON, + MINBUTTON, + HELPBUTTON +} CAPTIONBUTTON; + +/* +The following values specify all possible vutton states +Note that not all of them are documented but it is easy to +find them by opening a theme file +*/ +typedef enum { + BUTTON_NORMAL = 1 , + BUTTON_HOT , + BUTTON_PRESSED , + BUTTON_DISABLED , + BUTTON_INACTIVE +} THEME_BUTTON_STATES; + + /* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + +#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ + ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ + ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ + (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ + (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) + +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) + +#define BUTTON_GAP_SIZE 2 + +#define MENU_BAR_ITEMS_SPACE (12) + +#define SCROLL_TIMER 0 /* Scroll timer id */ + + /* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + + /* Delay (in ms) before first repetition when holding the button down */ +#define SCROLL_FIRST_DELAY 200 + + /* Delay (in ms) between scroll repetitions */ +#define SCROLL_REPEAT_DELAY 50 + +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + +void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); +VOID NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); +void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn); +void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); +PWND_CONTEXT ThemeGetWndContext(HWND hWnd); + +extern ATOM atWindowTheme; +extern ATOM atWndContrext; + +void UXTHEME_InitSystem(HINSTANCE hInst); +void UXTHEME_LoadTheme(BOOL bLoad); +BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); + +/* No alpha blending */ +#define ALPHABLEND_NONE 0 +/* "Cheap" binary alpha blending - but possibly faster */ +#define ALPHABLEND_BINARY 1 +/* Full alpha blending */ +#define ALPHABLEND_FULL 2 Propchange: trunk/reactos/dll/win32/uxtheme/uxthemep.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 53770: [OBJ2BIN] - Fix memory leaks - Fix resources leaks - Fix wrong if statement
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 12:29:47 2011 New Revision: 53770 URL: http://svn.reactos.org/svn/reactos?rev=53770&view=rev Log: [OBJ2BIN] - Fix memory leaks - Fix resources leaks - Fix wrong if statement Modified: trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Tue Sep 20 12:29:47 2011 @@ -97,6 +97,7 @@ pData = malloc(nFileSize); if (!pData) { + fclose(pSourceFile); fprintf(stderr, "Failed to allocate %ld bytes\n", nFileSize); return -3; } @@ -104,6 +105,8 @@ /* Read the whole source file */ if (!fread(pData, nFileSize, 1, pSourceFile)) { + free(pData); + fclose(pSourceFile); fprintf(stderr, "Failed to read source file: %ld\n", nFileSize); return -4; } @@ -113,8 +116,9 @@ /* Open the destination file */ pDestFile = fopen(pszDestFile, "wb"); - if (!pszDestFile) + if (!pDestFile) { + free(pData); fprintf(stderr, "Couldn't open dest file '%s'\n", pszDestFile); return -5; } @@ -140,6 +144,8 @@ if (!fwrite(pData + pSectionHeader->PointerToRawData, pSectionHeader->SizeOfRawData, 1, pDestFile)) { + free(pData); + fclose(pDestFile); fprintf(stderr, "Failed to write data %ld\n", pSectionHeader->SizeOfRawData); return -6; @@ -151,6 +157,7 @@ pSectionHeader++; } + free(pData); fclose(pDestFile); return 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs