10 Aug
2014
10 Aug
'14
9:33 p.m.
Author: hbelusca
Date: Sun Aug 10 21:33:21 2014
New Revision: 63858
URL: http://svn.reactos.org/svn/reactos?rev=63858&view=rev
Log:
Sync to trunk revision 63857.
Added:
branches/condrv_restructure/subsystems/ntvdm/hardware/mouse.c
- copied unchanged from r63857, trunk/reactos/subsystems/ntvdm/hardware/mouse.c
branches/condrv_restructure/subsystems/ntvdm/hardware/mouse.h
- copied unchanged from r63857, trunk/reactos/subsystems/ntvdm/hardware/mouse.h
Modified:
branches/condrv_restructure/ (props changed)
branches/condrv_restructure/base/applications/charmap/about.c
branches/condrv_restructure/base/applications/charmap/charmap.c
branches/condrv_restructure/base/applications/charmap/lrgcell.c
branches/condrv_restructure/base/applications/charmap/map.c
branches/condrv_restructure/base/applications/charmap/settings.c
branches/condrv_restructure/base/applications/notepad/lang/sq-AL.rc
branches/condrv_restructure/base/shell/explorer/explorer-sq.rc
branches/condrv_restructure/boot/bootdata/CMakeLists.txt
branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt
branches/condrv_restructure/cmake/CMakeMacros.cmake
branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc
branches/condrv_restructure/dll/cpl/desk/lang/sq-AL.rc
branches/condrv_restructure/dll/win32/browseui/internettoolbar.cpp
branches/condrv_restructure/dll/win32/browseui/internettoolbar.h
branches/condrv_restructure/dll/win32/kernel32/client/dosdev.c
branches/condrv_restructure/dll/win32/serialui/lang/sq-AL.rc
branches/condrv_restructure/dll/win32/shell32/folders.cpp
branches/condrv_restructure/dll/win32/shell32/iconcache.cpp
branches/condrv_restructure/dll/win32/shell32/lang/sq-AL.rc
branches/condrv_restructure/dll/win32/shell32/shfldr.h
branches/condrv_restructure/dll/win32/shell32/shlfolder.cpp
branches/condrv_restructure/dll/win32/syssetup/security.c
branches/condrv_restructure/ntoskrnl/ob/oblife.c
branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt
branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.c
branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.h
branches/condrv_restructure/subsystems/ntvdm/hardware/vga.c
branches/condrv_restructure/win32ss/user/ntuser/clipboard.c
branches/condrv_restructure/win32ss/user/ntuser/cursoricon.c
branches/condrv_restructure/win32ss/user/ntuser/cursoricon_new.c
Propchange: branches/condrv_restructure/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 10 21:33:21 2014
@@ -17,4 +17,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:63104-63831
+/trunk/reactos:63104-63857
Modified: branches/condrv_restructure/base/applications/charmap/about.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/charmap/about.c [iso-8859-1] (original)
+++ branches/condrv_restructure/base/applications/charmap/about.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -7,7 +7,7 @@
*
*/
-#include <precomp.h>
+#include "precomp.h"
static
INT_PTR
Modified: branches/condrv_restructure/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/charmap/charmap.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/base/applications/charmap/charmap.c [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -7,7 +7,7 @@
*
*/
-#include <precomp.h>
+#include "precomp.h"
#include <commctrl.h>
#include <richedit.h>
Modified: branches/condrv_restructure/base/applications/charmap/lrgcell.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/charmap/lrgcell.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/base/applications/charmap/lrgcell.c [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -7,7 +7,7 @@
*
*/
-#include <precomp.h>
+#include "precomp.h"
static
HFONT
Modified: branches/condrv_restructure/base/applications/charmap/map.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/charmap/map.c [iso-8859-1] (original)
+++ branches/condrv_restructure/base/applications/charmap/map.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -7,7 +7,7 @@
*
*/
-#include <precomp.h>
+#include "precomp.h"
#include <stdlib.h>
Modified: branches/condrv_restructure/base/applications/charmap/settings.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/charmap/settings.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/base/applications/charmap/settings.c [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -7,7 +7,7 @@
*
*/
-#include <precomp.h>
+#include "precomp.h"
#include <winreg.h>
#include <windowsx.h>
Modified: branches/condrv_restructure/base/applications/notepad/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica…
==============================================================================
--- branches/condrv_restructure/base/applications/notepad/lang/sq-AL.rc [iso-8859-1]
(original)
+++ branches/condrv_restructure/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] Sun
Aug 10 21:33:21 2014
@@ -128,7 +128,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur
<mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack
<Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle
<spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1,
"Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39
- CONTROL " ", -1, "Statik", 0x50000000, 8, 48, 272, 11
+ CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11
DEFPUSHBUTTON "Mbyll", IDOK, 114, 149, 44, 15, WS_GROUP
ICON IDI_NPICON, -1, 12, 9, 20, 30
EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL
Modified: branches/condrv_restructure/base/shell/explorer/explorer-sq.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e…
==============================================================================
--- branches/condrv_restructure/base/shell/explorer/explorer-sq.rc [iso-8859-1]
(original)
+++ branches/condrv_restructure/base/shell/explorer/explorer-sq.rc [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -117,8 +117,8 @@
CAPTION "Ekzekuto"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", 101, "Statik", SS_SIMPLE | SS_NOPREFIX, 3, 6, 150,
10
- CONTROL "&Comanda:", -1, "Statik", SS_LEFTNOWORDWRAP |
WS_GROUP, 3, 18, 60, 10
+ CONTROL "", 101, "Static", SS_SIMPLE | SS_NOPREFIX, 3, 6, 150,
10
+ CONTROL "&Comanda:", -1, "Static", SS_LEFTNOWORDWRAP |
WS_GROUP, 3, 18, 60, 10
EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL
CONTROL "Si &Simbol", 214, "Button", BS_AUTOCHECKBOX |
WS_TABSTOP, 3, 45, 71, 12
DEFPUSHBUTTON "&OK", 1, 158, 6, 47, 14
Modified: branches/condrv_restructure/boot/bootdata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat…
==============================================================================
--- branches/condrv_restructure/boot/bootdata/CMakeLists.txt [iso-8859-1] (original)
+++ branches/condrv_restructure/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -18,10 +18,14 @@
COMMAND native-utf16le ${_hive} ${_converted_hive}
DEPENDS native-utf16le ${_hive})
list(APPEND _converted_common_hives ${_converted_hive})
- add_cd_file(FILE ${_converted_hive} DESTINATION reactos NO_CAB FOR bootcd regtest)
endforeach()
add_custom_target(converted_hives DEPENDS ${_converted_common_hives})
+add_cd_file(TARGET converted_hives
+ FILE ${_converted_common_hives}
+ DESTINATION reactos
+ NO_CAB
+ FOR bootcd regtest)
# livecd hives
list(APPEND _livecd_hives
@@ -84,7 +88,7 @@
add_link(NAME ${name} CMD_LINE_ARGS ${app} ICON ${app} PATH livecd_start.cmd GUID
"{450D8FBA-AD25-11D0-98A8-0800361B1103}" MINIMIZE)
list(APPEND LIVECD_SHORTCUTS "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk")
add_cd_file(FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk"
- TARGET livecd_links
+ TARGET livecd_links
DESTINATION ${dest}
FOR livecd)
endmacro(add_livecd_shortcut)
Modified: branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat…
==============================================================================
--- branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -15,12 +15,18 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn "")
+# This finalizes reactos.dff by concat-ing the two files: one generated and one static
containing the optional file.
+# please keep it this way as it permits to add files to reactos.dff.in without having to
run cmake again
+# and also avoids rebuilding reactos.cab in case nothing changes after a cmake run
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
-D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
- -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
+ -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
-P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
+ ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
)
@@ -34,10 +40,15 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman)
# Then we create the actual cab file using a custom target
-# Please do not change this into custom command + custom target. This breaks reactos.cab
dependencies on modules
-# and you can't do something like "make gdi32/fast reactos_cab/fast
bootcd/fast"
-add_custom_target(reactos_cab
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC
${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P
${REACTOS_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman)
-add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
+add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab)
+
+add_cd_file(
+ TARGET reactos_cab
+ FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
+ DESTINATION reactos
+ NO_CAB FOR bootcd regtest)
Modified: branches/condrv_restructure/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/cmake/CMakeM…
==============================================================================
--- branches/condrv_restructure/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/condrv_restructure/cmake/CMakeMacros.cmake [iso-8859-1] Sun Aug 10 21:33:21
2014
@@ -318,6 +318,12 @@
if(_CD_TARGET)
#manage dependency
add_dependencies(reactos_cab ${_CD_TARGET})
+ # add this so that the combination make target/fast reactos_cab/fast
bootcd/fast properly detects that reactos.cab must be rebuilt
+ if (CMAKE_BUILD_TOOL STREQUAL "make")
+ add_custom_command(TARGET ${_CD_TARGET}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E touch
${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff)
+ endif()
endif()
endif()
endif() #end bootcd
Modified: branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons…
==============================================================================
--- branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -38,13 +38,13 @@
BEGIN
LTEXT "Dritare Preview:", -1, 10, 10, 94, 10
LTEXT "Masë:", -1, 180, 10, 36, 10
- CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
+ CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
LTEXT "&Font:", -1, 10, 105, 33, 10
CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
- CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
+ CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Ãdo krarakter është:", -1, 124, 166, 75, 10
LTEXT "pixeli ekranit i gjerë\npixel ekranit i gjatë", -1, 136, 180, 101,
20
LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
@@ -57,7 +57,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Dritare Preview:", -1, 8, 6, 95, 10
- CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Statik", SS_SUNKEN
| SS_OWNERDRAW, 8, 16, 115, 70
+ CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN
| SS_OWNERDRAW, 8, 16, 115, 70
GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50
LTEXT "Gjerë:", -1, 140, 28, 40, 10
LTEXT "Gjatë:", -1, 140, 46, 39, 10
@@ -114,26 +114,26 @@
EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
- CONTROL "", IDC_STATIC_COLOR1, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 23, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR2, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 36, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR3, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 49, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR4, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 62, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR5, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 75, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR6, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 88, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR7, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 101, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR8, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 114, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR9, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 127, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR10, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 140, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR11, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 153, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR12, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 166, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR13, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 179, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR14, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 192, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR15, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 205, 80, 12, 12
- CONTROL "", IDC_STATIC_COLOR16, "Statik", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 218, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 23, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 36, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 49, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 62, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 75, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 88, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 101, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 114, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 127, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 140, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 153, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 166, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 179, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 192, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 205, 80, 12, 12
+ CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 218, 80, 12, 12
GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55
- CONTROL "", IDC_STATIC_SCREEN_COLOR, "Statik", SS_OWNERDRAW |
SS_SUNKEN, 13, 110, 227, 40
+ CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 13, 110, 227, 40
GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55
- CONTROL "", IDC_STATIC_POPUP_COLOR, "Statik", SS_OWNERDRAW |
SS_SUNKEN, 13, 170, 227, 40
+ CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 13, 170, 227, 40
END
IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
Modified: branches/condrv_restructure/dll/cpl/desk/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/desk…
==============================================================================
--- branches/condrv_restructure/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -9,7 +9,7 @@
CAPTION "Sfond"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_BACKGROUND_PREVIEW, "Statik", SS_OWNERDRAW, 70,
10, 105, 80, 0
+ CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70,
10, 105, 80, 0
CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL |
LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP, 8, 114, 174, 78
LTEXT "Zgjidhni një imazh për t'u përdorur si sfond tuaj desktop",
IDC_STATIC, 8, 103, 230, 9
@@ -24,7 +24,7 @@
CAPTION "Screensaver"
FONT 8, "MS Shell Dlg", 0, 0
BEGIN
- CONTROL "", IDC_SCREENS_PREVIEW, "Statik", SS_OWNERDRAW, 70, 10,
105, 70, WS_EX_STATICEDGE
+ CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10,
105, 70, WS_EX_STATICEDGE
GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52
COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Cilësime%t", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
@@ -134,7 +134,7 @@
LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP |
SS_CENTER
GROUPBOX "&Ngjyra", 1817, 125, 127, 115, 43
COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
- CONTROL "", IDC_SETTINGS_SPECTRUM, "Statik", SS_OWNERDRAW |
SS_SUNKEN, 131, 155, 103, 9
+ CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW |
SS_SUNKEN, 131, 155, 103, 9
PUSHBUTTON "Përparuar...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14
END
Modified: branches/condrv_restructure/dll/win32/browseui/internettoolbar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/br…
==============================================================================
--- branches/condrv_restructure/dll/win32/browseui/internettoolbar.cpp [iso-8859-1]
(original)
+++ branches/condrv_restructure/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sun
Aug 10 21:33:21 2014
@@ -481,14 +481,13 @@
fLocked = false;
fMenuBandWindow = NULL;
fNavigationWindow = NULL;
- fMenuCallback.AddRef();
+ fMenuCallback = new CComObject<CMenuCallback>();
fToolbarWindow = NULL;
fAdviseCookie = 0;
}
CInternetToolbar::~CInternetToolbar()
{
- fMenuCallback.Release();
}
void CInternetToolbar::AddDockItem(IUnknown *newItem, int bandID, int flags)
@@ -540,7 +539,7 @@
IID_IShellMenu, reinterpret_cast<void **>(menuBar));
if (FAILED(hResult))
return hResult;
- hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback,
reinterpret_cast<void **>(&callback));
+ hResult = fMenuCallback->QueryInterface(IID_IShellMenuCallback,
reinterpret_cast<void **>(&callback));
if (FAILED(hResult))
return hResult;
hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL
| SMINIT_TOPLEVEL);
Modified: branches/condrv_restructure/dll/win32/browseui/internettoolbar.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/br…
==============================================================================
--- branches/condrv_restructure/dll/win32/browseui/internettoolbar.h [iso-8859-1]
(original)
+++ branches/condrv_restructure/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -90,7 +90,7 @@
CComPtr<IUnknown> fLogoBar; // the reactos
logo
CComPtr<IUnknown> fControlsBar; // navigation
controls
CComPtr<IUnknown> fNavigationBar; // address bar
- CComObject<CMenuCallback> fMenuCallback;
+ CComPtr<CMenuCallback> fMenuCallback;
CComPtr<IOleCommandTarget> fCommandTarget;
GUID fCommandCategory;
HWND fToolbarWindow;
Modified: branches/condrv_restructure/dll/win32/kernel32/client/dosdev.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke…
==============================================================================
--- branches/condrv_restructure/dll/win32/kernel32/client/dosdev.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -35,22 +35,18 @@
BOOL Result;
if (lpDeviceName &&
- ! RtlCreateUnicodeStringFromAsciiz(&DeviceNameU,
- (LPSTR)lpDeviceName))
+ !RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, lpDeviceName))
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return 0;
}
if (lpTargetPath &&
- ! RtlCreateUnicodeStringFromAsciiz(&TargetPathU,
- (LPSTR)lpTargetPath))
+ !RtlCreateUnicodeStringFromAsciiz(&TargetPathU, lpTargetPath))
{
if (DeviceNameU.Buffer)
{
- RtlFreeHeap(RtlGetProcessHeap (),
- 0,
- DeviceNameU.Buffer);
+ RtlFreeUnicodeString(&DeviceNameU);
}
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return 0;
@@ -62,16 +58,12 @@
if (TargetPathU.Buffer)
{
- RtlFreeHeap(RtlGetProcessHeap (),
- 0,
- TargetPathU.Buffer);
+ RtlFreeUnicodeString(&TargetPathU);
}
if (DeviceNameU.Buffer)
{
- RtlFreeHeap(RtlGetProcessHeap (),
- 0,
- DeviceNameU.Buffer);
+ RtlFreeUnicodeString(&DeviceNameU);
}
return Result;
}
@@ -114,7 +106,7 @@
ArgumentCount = 1;
BufferSize = 0;
- if (! lpTargetPath)
+ if (!lpTargetPath)
{
RtlInitUnicodeString(&NtTargetPathU,
NULL);
@@ -128,10 +120,10 @@
}
else
{
- if (! RtlDosPathNameToNtPathName_U(lpTargetPath,
- &NtTargetPathU,
- 0,
- 0))
+ if (!RtlDosPathNameToNtPathName_U(lpTargetPath,
+ &NtTargetPathU,
+ NULL,
+ NULL))
{
WARN("RtlDosPathNameToNtPathName_U() failed\n");
BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID);
@@ -151,7 +143,7 @@
CaptureBuffer = CsrAllocateCaptureBuffer(ArgumentCount,
BufferSize);
- if (! CaptureBuffer)
+ if (!CaptureBuffer)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
Result = FALSE;
@@ -161,7 +153,7 @@
DefineDosDeviceRequest->Flags = dwFlags;
CsrCaptureMessageBuffer(CaptureBuffer,
- (PVOID)DeviceUpcaseNameU.Buffer,
+ DeviceUpcaseNameU.Buffer,
DeviceUpcaseNameU.Length,
(PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer);
@@ -173,7 +165,7 @@
if (NtTargetPathU.Buffer)
{
CsrCaptureMessageBuffer(CaptureBuffer,
- (PVOID)NtTargetPathU.Buffer,
+ NtTargetPathU.Buffer,
NtTargetPathU.Length,
(PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer);
}
@@ -212,7 +204,7 @@
dbcv.dbcv_size = sizeof(DEV_BROADCAST_VOLUME);
dbcv.dbcv_devicetype = DBT_DEVTYP_VOLUME;
dbcv.dbcv_reserved = 0;
- dbcv.dbcv_unitmask |=
+ dbcv.dbcv_unitmask |=
(1 << (DeviceUpcaseNameU.Buffer[0] - L'A'));
dbcv.dbcv_flags = DBTF_NET;
(void) BSM_ptr(BSF_SENDNOTIFYMESSAGE | BSF_FLUSHDISK,
@@ -227,7 +219,8 @@
}
}
- if (NtTargetPathU.Buffer)
+ if (NtTargetPathU.Buffer &&
+ NtTargetPathU.Buffer != lpTargetPath)
{
RtlFreeHeap(RtlGetProcessHeap(),
0,
@@ -293,7 +286,7 @@
{
CurrentLength = min (ucchMax, MAXUSHORT / 2);
TargetPathU.MaximumLength = TargetPathU.Length = (USHORT)CurrentLength *
sizeof(WCHAR);
-
+
TargetPathA.Length = 0;
TargetPathA.MaximumLength = (USHORT)CurrentLength;
Modified: branches/condrv_restructure/dll/win32/serialui/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/se…
==============================================================================
--- branches/condrv_restructure/dll/win32/serialui/lang/sq-AL.rc [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/serialui/lang/sq-AL.rc [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -25,14 +25,14 @@
STYLE 0x10C80080
EXSTYLE 0x00000001
BEGIN
- CONTROL "", IDC_GRP1, "Buton", 0x50000007, 6, 5, 210, 146,
0x00000000
- CONTROL "OK", IDC_OKBTN, "Buton", 0x50010000, 98, 156, 56, 13,
0x00000000
- CONTROL "Anulo", IDC_CANCELBTN, "Buton", 0x50010000, 158, 156,
56, 13, 0x00000000
- CONTROL "Baud normë:", IDC_STC1, "Statik", 0x50000000, 24, 31,
42, 9, 0x00000000
- CONTROL "Byte masë:", IDC_STC2, "Statik", 0x50000000, 24, 53,
42, 9, 0x00000000
- CONTROL "Barazi:", IDC_STC3, "Statik", 0x50000000, 24, 73, 42, 9,
0x00000000
- CONTROL "Ndalo bits:", IDC_STC4, "Statik", 0x50000000, 24, 96,
42, 9, 0x00000000
- CONTROL "Kontroll Rrjedhe:", IDC_STC5, "Statik", 0x50000000, 24,
120, 42, 9, 0x00000000
+ CONTROL "", IDC_GRP1, "Button", 0x50000007, 6, 5, 210, 146,
0x00000000
+ CONTROL "OK", IDC_OKBTN, "Button", 0x50010000, 98, 156, 56, 13,
0x00000000
+ CONTROL "Anulo", IDC_CANCELBTN, "Button", 0x50010000, 158, 156,
56, 13, 0x00000000
+ CONTROL "Baud normë:", IDC_STC1, "Static", 0x50000000, 24, 31,
42, 9, 0x00000000
+ CONTROL "Byte masë:", IDC_STC2, "Static", 0x50000000, 24, 53,
42, 9, 0x00000000
+ CONTROL "Barazi:", IDC_STC3, "Static", 0x50000000, 24, 73, 42, 9,
0x00000000
+ CONTROL "Ndalo bits:", IDC_STC4, "Static", 0x50000000, 24, 96,
42, 9, 0x00000000
+ CONTROL "Kontroll Rrjedhe:", IDC_STC5, "Static", 0x50000000, 24,
120, 42, 9, 0x00000000
CONTROL "", IDC_BAUDRATE, "ComboBox", 0x50210003, 98, 29, 100,
50, 0x00000000
CONTROL "", IDC_BYTESIZE, "ComboBox", 0x50210003, 98, 49, 100,
50, 0x00000000
CONTROL "", IDC_PARITY, "ComboBox", 0x50210003, 98, 72, 100, 50,
0x00000000
Modified: branches/condrv_restructure/dll/win32/shell32/folders.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/folders.cpp [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/folders.cpp [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -28,6 +28,7 @@
LPWSTR szIconFile, UINT cchMax, int *piIndex,
UINT *pwFlags)
{
int icon_idx;
+ bool cont=TRUE;
WCHAR wszPath[MAX_PATH];
WCHAR wszCLSIDValue[CHARS_IN_GUID];
static const WCHAR shellClassInfo[] = { '.', 'S', 'h',
'e', 'l', 'l', 'C', 'l', 'a', 's',
's', 'I', 'n', 'f', 'o', 0 };
@@ -36,27 +37,40 @@
static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I',
'D', '2', 0 };
static const WCHAR iconIndex[] = { 'I', 'c', 'o',
'n', 'I', 'n', 'd', 'e', 'x', 0 };
- if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile,
- wszPath, MAX_PATH))
- {
- WCHAR wszIconIndex[10];
- SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex,
- wszIconIndex, 10);
- *piIndex = _wtoi(wszIconIndex);
- }
- else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid,
- wszCLSIDValue, CHARS_IN_GUID) &&
- HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx))
- {
- *piIndex = icon_idx;
- }
- else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2,
- wszCLSIDValue, CHARS_IN_GUID) &&
- HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx))
- {
- *piIndex = icon_idx;
- }
- else
+ /*
+ Optimisation. GetCustomFolderAttribute has a critical lock on it, and isn't
fast.
+ Test the water (i.e., see if the attribute exists) before questioning it three times
+ when most folders don't use it at all.
+ */
+ WCHAR wszBigToe[3];
+ if (!(uFlags & GIL_DEFAULTICON) &&
SHELL32_GetCustomFolderAttributes(pidl, shellClassInfo,
+ wszBigToe, 3))
+ {
+ if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile,
+ wszPath, MAX_PATH))
+ {
+ WCHAR wszIconIndex[10];
+ SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex,
+ wszIconIndex, 10);
+ *piIndex = _wtoi(wszIconIndex);
+ cont=FALSE;
+ }
+ else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid,
+ wszCLSIDValue, CHARS_IN_GUID) &&
+ HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx))
+ {
+ *piIndex = icon_idx;
+ cont=FALSE;
+ }
+ else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2,
+ wszCLSIDValue, CHARS_IN_GUID) &&
+ HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx))
+ {
+ *piIndex = icon_idx;
+ cont=FALSE;
+ }
+ }
+ if (cont)
{
static const WCHAR folder[] = { 'F', 'o', 'l',
'd', 'e', 'r', 0 };
@@ -322,6 +336,10 @@
&flags)))
{
initIcon->SetNormalIcon(wTemp, icon_idx);
+ // FIXME: if/when getIconLocationForFolder does something for
+ // GIL_FORSHORTCUT, code below should be uncommented. and
+ // the following line removed.
+ initIcon->SetShortcutIcon(wTemp, icon_idx);
}
if (SUCCEEDED(getIconLocationForFolder(
pidl, GIL_DEFAULTICON, wTemp, MAX_PATH,
@@ -330,13 +348,13 @@
{
initIcon->SetDefaultIcon(wTemp, icon_idx);
}
- if (SUCCEEDED(getIconLocationForFolder(
- pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH,
- &icon_idx,
- &flags)))
- {
- initIcon->SetShortcutIcon(wTemp, icon_idx);
- }
+ // if (SUCCEEDED(getIconLocationForFolder(
+ // pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH,
+ // &icon_idx,
+ // &flags)))
+ // {
+ // initIcon->SetShortcutIcon(wTemp, icon_idx);
+ // }
if (SUCCEEDED(getIconLocationForFolder(
pidl, GIL_OPENICON, wTemp, MAX_PATH,
&icon_idx,
Modified: branches/condrv_restructure/dll/win32/shell32/iconcache.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -64,14 +64,14 @@
* loaded from, their resource index and the fact if they have a shortcut
* icon overlay or not.
*/
- if (e1->dwSourceIndex != e2->dwSourceIndex || /* first the faster one */
- (e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags &
GIL_FORSHORTCUT))
- return 1;
-
- if (wcsicmp(e1->sSourceFile,e2->sSourceFile))
- return 1;
-
- return 0;
+ /* first the faster one */
+ if (e1->dwSourceIndex != e2->dwSourceIndex)
+ return (e1->dwSourceIndex < e2->dwSourceIndex) ? -1 : 1;
+
+ if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT))
+ return ((e1->dwFlags & GIL_FORSHORTCUT) < (e2->dwFlags &
GIL_FORSHORTCUT)) ? -1 : 1;
+
+ return wcsicmp(e1->sSourceFile,e2->sSourceFile);
}
/* declare SIC_LoadOverlayIcon() */
@@ -338,7 +338,8 @@
EnterCriticalSection(&SHELL32_SicCS);
- indexDPA = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice);
+ indexDPA = DPA_Search (sic_hdpa, lpsice, 0, SIC_CompareEntries, 0,
DPAS_SORTED|DPAS_INSERTAFTER);
+ indexDPA = DPA_InsertPtr(sic_hdpa, indexDPA, lpsice);
if ( -1 == indexDPA )
{
ret = INVALID_INDEX;
@@ -468,7 +469,7 @@
if (NULL != DPA_GetPtr (sic_hdpa, 0))
{
/* search linear from position 0*/
- index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0);
+ index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, DPAS_SORTED);
}
if ( INVALID_INDEX == index )
Modified: branches/condrv_restructure/dll/win32/shell32/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -289,11 +289,11 @@
LTEXT "Dokumentimi Sistemit:", -1, 8, 51, 95, 10
EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP
LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
- CONTROL "", 14013, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10,
10
+ CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10,
10
LTEXT "Hapësira përdorur:", -1, 25, 69, 80, 10
EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
- CONTROL "", 14014, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10,
10
+ CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10,
10
LTEXT "Hapësirë Falas:", -1, 25, 82, 80, 10
EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
@@ -301,7 +301,7 @@
LTEXT "Kapaciteti:", -1, 25, 103, 80, 10
EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT
WS_TABSTOP | ES_AUTOHSCROLL
- CONTROL "", 14015, "Statik", SS_OWNERDRAW, 70, 116, 100, 30
+ CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
LTEXT "Drive %c", 14009, 100, 150, 70, 10
PUSHBUTTON "Pastrim &Disku", 14010, 160, 154, 70, 15, WS_TABSTOP
LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
Modified: branches/condrv_restructure/dll/win32/shell32/shfldr.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/shfldr.h [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/shfldr.h [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -37,6 +37,7 @@
#define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF)
BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR
pwszAttribute, LPWSTR pwszValue, DWORD cchValue);
+BOOL SHELL32_GetCustomFolderAttributes (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPWSTR
pwszValue, DWORD cchValue);
LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut);
HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
LPITEMIDLIST * pidlInOut,
Modified: branches/condrv_restructure/dll/win32/shell32/shlfolder.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -80,6 +80,33 @@
}
return FALSE;
}
+
+BOOL SHELL32_GetCustomFolderAttributes(
+ LPCITEMIDLIST pidl, LPCWSTR pwszHeading,
+ LPWSTR pwszValue, DWORD cchValue)
+{
+ DWORD dwAttrib = FILE_ATTRIBUTE_SYSTEM;
+ WCHAR wszFolderPath[MAX_PATH];
+
+ /* Hack around not having system attribute on non-Windows file systems */
+ if (0)
+ dwAttrib = _ILGetFileAttributes(pidl, NULL, 0);
+
+ if (dwAttrib & FILE_ATTRIBUTE_SYSTEM)
+ {
+ if (!SHGetPathFromIDListW(pidl, wszFolderPath))
+ return FALSE;
+
+ static const WCHAR wszDesktopIni[] =
+
{'d','e','s','k','t','o','p','.','i','n','i',0};
+
+ PathAddBackslashW(wszFolderPath);
+ PathAppendW(wszFolderPath, wszDesktopIni);
+ return GetPrivateProfileSectionW(pwszHeading, pwszValue, cchValue,
wszFolderPath);
+ }
+ return FALSE;
+}
+
/***************************************************************************
* GetNextElement (internal function)
Modified: branches/condrv_restructure/dll/win32/syssetup/security.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sy…
==============================================================================
--- branches/condrv_restructure/dll/win32/syssetup/security.c [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/syssetup/security.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -330,7 +330,7 @@
SAM_HANDLE UserHandle = NULL;
NTSTATUS Status;
- DPRINT1("SYSSETUP: SetAdministratorPassword(%S)\n", Password);
+ DPRINT("SYSSETUP: SetAdministratorPassword(%p)\n", Password);
memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES));
ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES);
Modified: branches/condrv_restructure/ntoskrnl/ob/oblife.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/ob/…
==============================================================================
--- branches/condrv_restructure/ntoskrnl/ob/oblife.c [iso-8859-1] (original)
+++ branches/condrv_restructure/ntoskrnl/ob/oblife.c [iso-8859-1] Sun Aug 10 21:33:21
2014
@@ -1231,8 +1231,15 @@
/* Get creator info and insert it into the type list */
CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header);
- if (CreatorInfo) InsertTailList(&ObpTypeObjectType->TypeList,
- &CreatorInfo->TypeList);
+ if (CreatorInfo)
+ {
+ InsertTailList(&ObpTypeObjectType->TypeList,
+ &CreatorInfo->TypeList);
+
+ /* CORE-8423: Avoid inserting this a second time if someone creates a
+ * handle to the object type (bug in Windows 2003) */
+ Header->Flags &= ~OB_FLAG_CREATE_INFO;
+ }
/* Set the index and the entry into the object type array */
LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects;
Modified: branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n…
==============================================================================
--- branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -19,6 +19,7 @@
hardware/speaker.c
hardware/timer.c
hardware/vga.c
+ hardware/mouse.c
dos/dos32krnl/bios.c
dos/dos32krnl/dos.c
dos/dos32krnl/dosfiles.c
Modified: branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n…
==============================================================================
--- branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original)
+++ branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -14,6 +14,7 @@
#include "io.h"
#include "ps2.h"
#include "pic.h"
+#include "mouse.h"
/* PRIVATE VARIABLES **********************************************************/
@@ -27,69 +28,6 @@
static HANDLE QueueMutex = NULL;
/* PRIVATE FUNCTIONS **********************************************************/
-
-static BOOLEAN KeyboardQueuePush(BYTE ScanCode)
-{
- BOOLEAN Result = TRUE;
-
- WaitForSingleObject(QueueMutex, INFINITE);
-
- /* Check if the keyboard queue is full */
- if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd))
- {
- Result = FALSE;
- goto Done;
- }
-
- /* Insert the value in the queue */
- KeyboardQueue[KeyboardQueueEnd] = ScanCode;
- KeyboardQueueEnd++;
- KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE;
-
- /* Since we inserted a value, it's not empty anymore */
- KeyboardQueueEmpty = FALSE;
-
-Done:
- ReleaseMutex(QueueMutex);
- return Result;
-}
-
-static BOOLEAN KeyboardQueuePop(BYTE *ScanCode)
-{
- BOOLEAN Result = TRUE;
-
- /* Make sure the keyboard queue is not empty (fast check) */
- if (KeyboardQueueEmpty) return FALSE;
-
- WaitForSingleObject(QueueMutex, INFINITE);
-
- /*
- * Recheck whether keyboard queue is not empty (it
- * may have changed after having grabbed the mutex).
- */
- if (KeyboardQueueEmpty)
- {
- Result = FALSE;
- goto Done;
- }
-
- /* Get the scan code */
- *ScanCode = KeyboardQueue[KeyboardQueueStart];
-
- /* Remove the value from the queue */
- KeyboardQueueStart++;
- KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE;
-
- /* Check if the queue is now empty */
- if (KeyboardQueueStart == KeyboardQueueEnd)
- {
- KeyboardQueueEmpty = TRUE;
- }
-
-Done:
- ReleaseMutex(QueueMutex);
- return Result;
-}
static BYTE WINAPI PS2ReadPort(ULONG Port)
{
@@ -156,14 +94,14 @@
/* Disable mouse */
case 0xA7:
{
- // TODO: Mouse support
+ // TODO: Not implemented
break;
}
/* Enable mouse */
case 0xA8:
{
- // TODO: Mouse support
+ // TODO: Not implemented
break;
}
@@ -268,7 +206,7 @@
case 0xD4:
{
- // TODO: Mouse support
+ MouseCommand(Data);
break;
}
}
@@ -281,6 +219,69 @@
}
/* PUBLIC FUNCTIONS ***********************************************************/
+
+BOOLEAN KeyboardQueuePush(BYTE ScanCode)
+{
+ BOOLEAN Result = TRUE;
+
+ WaitForSingleObject(QueueMutex, INFINITE);
+
+ /* Check if the keyboard queue is full */
+ if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd))
+ {
+ Result = FALSE;
+ goto Done;
+ }
+
+ /* Insert the value in the queue */
+ KeyboardQueue[KeyboardQueueEnd] = ScanCode;
+ KeyboardQueueEnd++;
+ KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE;
+
+ /* Since we inserted a value, it's not empty anymore */
+ KeyboardQueueEmpty = FALSE;
+
+Done:
+ ReleaseMutex(QueueMutex);
+ return Result;
+}
+
+BOOLEAN KeyboardQueuePop(BYTE *ScanCode)
+{
+ BOOLEAN Result = TRUE;
+
+ /* Make sure the keyboard queue is not empty (fast check) */
+ if (KeyboardQueueEmpty) return FALSE;
+
+ WaitForSingleObject(QueueMutex, INFINITE);
+
+ /*
+ * Recheck whether keyboard queue is not empty (it
+ * may have changed after having grabbed the mutex).
+ */
+ if (KeyboardQueueEmpty)
+ {
+ Result = FALSE;
+ goto Done;
+ }
+
+ /* Get the scan code */
+ *ScanCode = KeyboardQueue[KeyboardQueueStart];
+
+ /* Remove the value from the queue */
+ KeyboardQueueStart++;
+ KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE;
+
+ /* Check if the queue is now empty */
+ if (KeyboardQueueStart == KeyboardQueueEnd)
+ {
+ KeyboardQueueEmpty = TRUE;
+ }
+
+Done:
+ ReleaseMutex(QueueMutex);
+ return Result;
+}
VOID PS2Dispatch(PINPUT_RECORD InputRecord)
{
Modified: branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n…
==============================================================================
--- branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original)
+++ branches/condrv_restructure/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -24,6 +24,8 @@
/* FUNCTIONS ******************************************************************/
+BOOLEAN KeyboardQueuePush(BYTE ScanCode);
+BOOLEAN KeyboardQueuePop(BYTE *ScanCode);
VOID PS2Dispatch(PINPUT_RECORD InputRecord);
VOID GenerateKeyboardInterrupts(VOID);
Modified: branches/condrv_restructure/subsystems/ntvdm/hardware/vga.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n…
==============================================================================
--- branches/condrv_restructure/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original)
+++ branches/condrv_restructure/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -20,6 +20,12 @@
static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 };
static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF };
+
+/*
+ * Activate this line if you want to use the real
+ * RegisterConsoleVDM API of ReactOS/Windows.
+ */
+// #define USE_REAL_REGISTERCONSOLEVDM
#define USE_REACTOS_COLORS
// #define USE_DOSBOX_COLORS
@@ -288,44 +294,12 @@
#include <ntddvdeo.h>
-typedef
-BOOL
-(WINAPI *pRegisterConsoleVDM)
-(
- BOOL IsDosVDM_flag,
- HANDLE EventHandle_1,
- HANDLE EventHandle_2,
- HANDLE EventHandle_3,
- int Unused1,
- PVOID returned_val_1,
- PVOID *returned_val_2,
- PVOID lpUnknownBuffer,
- DWORD theUnknownBufferLength,
- COORD theVDMBufferSize,
- PCHAR *lpVDMBuffer
-);
-
-#if 0
-BOOL
-WINAPI
-RegisterConsoleVDM
-(
- BOOL IsDosVDM_flag,
- HANDLE EventHandle_1,
- HANDLE EventHandle_2,
- HANDLE EventHandle_3,
- int Unused1,
- PVOID returned_val_1,
- PVOID *returned_val_2,
- PVOID lpUnknownBuffer,
- DWORD theUnknownBufferLength,
- COORD theVDMBufferSize,
- PVOID *lpVDMBuffer
-);
-
-HMODULE hKernel32 = NULL;
-pRegisterConsoleVDM RegisterConsoleVDM = NULL;
-#endif
+#ifdef USE_REAL_REGISTERCONSOLEVDM
+
+#define __RegisterConsoleVDM RegisterConsoleVDM
+#define __InvalidateConsoleDIBits InvalidateConsoleDIBits
+
+#else
/*
* This private buffer, per-console, is used by
@@ -340,49 +314,49 @@
BOOL
WINAPI
-__RegisterConsoleVDM(BOOL IsDosVDM_flag,
- HANDLE EventHandle_1,
- HANDLE EventHandle_2,
- HANDLE EventHandle_3,
- int Unused1,
- PVOID returned_val_1,
- PVOID *returned_val_2,
- PVOID lpUnknownBuffer,
- DWORD theUnknownBufferLength,
- COORD theVDMBufferSize,
- PCHAR *lpVDMBuffer)
-{
- UNREFERENCED_PARAMETER(EventHandle_3);
- UNREFERENCED_PARAMETER(Unused1);
- UNREFERENCED_PARAMETER(returned_val_1);
- UNREFERENCED_PARAMETER(returned_val_2);
- UNREFERENCED_PARAMETER(lpUnknownBuffer);
- UNREFERENCED_PARAMETER(theUnknownBufferLength);
+__RegisterConsoleVDM(IN DWORD dwRegisterFlags,
+ IN HANDLE hStartHardwareEvent,
+ IN HANDLE hEndHardwareEvent,
+ IN HANDLE hErrorHardwareEvent,
+ IN DWORD dwUnusedVar,
+ OUT LPDWORD lpVideoStateLength,
+ OUT PVOID* lpVideoState, // PVIDEO_HARDWARE_STATE_HEADER*
+ IN PVOID lpUnusedBuffer,
+ IN DWORD dwUnusedBufferLength,
+ IN COORD dwVDMBufferSize,
+ OUT PVOID* lpVDMBuffer)
+{
+ UNREFERENCED_PARAMETER(hErrorHardwareEvent);
+ UNREFERENCED_PARAMETER(dwUnusedVar);
+ UNREFERENCED_PARAMETER(lpVideoStateLength);
+ UNREFERENCED_PARAMETER(lpVideoState);
+ UNREFERENCED_PARAMETER(lpUnusedBuffer);
+ UNREFERENCED_PARAMETER(dwUnusedBufferLength);
SetLastError(0);
- DPRINT1("__RegisterConsoleVDM(%d)\n", IsDosVDM_flag);
+ DPRINT1("__RegisterConsoleVDM(%d)\n", dwRegisterFlags);
if (lpVDMBuffer == NULL) return FALSE;
- if (IsDosVDM_flag)
- {
- // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE;
+ if (dwRegisterFlags != 0)
+ {
+ // if (hStartHardwareEvent == NULL || hEndHardwareEvent == NULL) return FALSE;
if (VDMBuffer != NULL) return FALSE;
- VDMBufferSize = theVDMBufferSize;
+ VDMBufferSize = dwVDMBufferSize;
/* HACK: Cache -- to be removed in the real implementation */
CharBuff = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
- theVDMBufferSize.X * theVDMBufferSize.Y
- * sizeof(CHAR_INFO));
+ VDMBufferSize.X * VDMBufferSize.Y
+ * sizeof(CHAR_INFO));
ASSERT(CharBuff);
VDMBuffer = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
- theVDMBufferSize.X * theVDMBufferSize.Y
- * sizeof(CHAR_CELL));
- *lpVDMBuffer = (PCHAR)VDMBuffer;
+ VDMBufferSize.X * VDMBufferSize.Y
+ * sizeof(CHAR_CELL));
+ *lpVDMBuffer = VDMBuffer;
return (VDMBuffer != NULL);
}
else
@@ -432,6 +406,8 @@
return InvalidateConsoleDIBits(hConsoleOutput, lpRect);
}
+#endif
+
/* PRIVATE FUNCTIONS **********************************************************/
static inline DWORD VgaGetAddressSize(VOID);
@@ -458,6 +434,9 @@
ULONG Length = 0;
PVIDEO_HARDWARE_STATE_HEADER State;
+#ifdef USE_REAL_REGISTERCONSOLEVDM
+ PCHAR_INFO CharBuff = NULL;
+#endif
SHORT i, j;
DWORD AddressSize, ScanlineSize;
DWORD Address = 0;
@@ -472,7 +451,7 @@
/*
* Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14,
&ConsoleHandle);
* in the two following APIs:
- * SrvRegisterConsoleVDM (corresponding win32 API: RegisterConsoleVDM)
+ * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM)
* SrvVDMConsoleOperation (corresponding Win32 API: )
* to check whether the current process is a VDM process, and fails otherwise with
the
* error 0xC0000022 ().
@@ -492,13 +471,21 @@
NULL,
0,
TextResolution,
- (PCHAR*)&TextFramebuffer);
+ (PVOID*)&TextFramebuffer);
if (!Success)
{
DisplayMessage(L"RegisterConsoleVDM failed with error %d\n",
GetLastError());
EmulatorTerminate();
return FALSE;
}
+
+#ifdef USE_REAL_REGISTERCONSOLEVDM
+ CharBuff = HeapAlloc(GetProcessHeap(),
+ HEAP_ZERO_MEMORY,
+ TextResolution.X * TextResolution.Y
+ * sizeof(CHAR_INFO));
+ ASSERT(CharBuff);
+#endif
/*
* Resize the console
@@ -559,6 +546,10 @@
/* Move to the next scanline */
Address += ScanlineSize;
}
+
+#ifdef USE_REAL_REGISTERCONSOLEVDM
+ if (CharBuff) HeapFree(GetProcessHeap(), 0, CharBuff);
+#endif
VgaUpdateCursorPosition();
@@ -1950,7 +1941,7 @@
NULL,
0,
dummySize,
- (PCHAR*)&dummyPtr);
+ &dummyPtr);
TextFramebuffer = NULL;
@@ -2039,11 +2030,6 @@
CloseHandle(AnotherEvent);
CloseHandle(EndEvent);
CloseHandle(StartEvent);
-
-#if 0
- RegisterConsoleVDM = NULL;
- FreeLibrary(hKernel32);
-#endif
}
/* EOF */
Modified: branches/condrv_restructure/win32ss/user/ntuser/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Clipboard routines
- * FILE: subsys/win32k/ntuser/clipboard.c
+ * FILE: win32ss/user/ntuser/clipboard.c
* PROGRAMER: Filip Navara <xnavara(a)volny.cz>
* Pablo Borobia <pborobia(a)gmail.com>
* Rafal Harabien <rafalh(a)reactos.org>
@@ -622,7 +622,7 @@
if (pWinStaObj->spwndClipOwner)
{
- TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p",
pWinStaObj->spwndClipOwner->head.h);
+ TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n",
pWinStaObj->spwndClipOwner->head.h);
co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h,
WM_DESTROYCLIPBOARD, 0, 0);
}
Modified: branches/condrv_restructure/win32ss/user/ntuser/cursoricon.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Aug 10
21:33:21 2014
@@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Cursor and icon functions
- * FILE: subsystems/win32/win32k/ntuser/cursoricon.c
+ * FILE: win32ss/user/ntuser/cursoricon.c
* PROGRAMER: ReactOS Team
*/
/*
Modified: branches/condrv_restructure/win32ss/user/ntuser/cursoricon_new.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Sun Aug
10 21:33:21 2014
@@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Cursor and icon functions
- * FILE: subsystems/win32/win32k/ntuser/cursoricon.c
+ * FILE: win32ss/user/ntuser/cursoricon.c
* PROGRAMER: ReactOS Team
*/
/*
@@ -298,7 +298,7 @@
if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
{
- RETURN(FALSE);
+ return(FALSE);
}
ret = IntDestroyCurIconObject(CurIcon, bForce);
@@ -670,7 +670,7 @@
prcl = &rclLocal;
}
- UserEnterExclusive();
+ UserEnterExclusive();
/* Call the internal function */
bResult = UserClipCursor(prcl);
@@ -1291,7 +1291,7 @@
/* We now have our destination surface */
psurfDest = psurfOffScreen;
#else
- pdcClipObj = pdc->rosdc.CombinedClip;
+ pdcClipObj = &pdc->co.ClipObj;
/* Paint the brush */
EBRUSHOBJ_vInit(&eboFill, pbrush, psurfDest, 0x00FFFFFF, 0, NULL);
@@ -1322,14 +1322,14 @@
{
/* We directly draw to the DC */
TRACE("Performing on screen rendering.\n");
- pdcClipObj = pdc->rosdc.CombinedClip;
+ pdcClipObj = &pdc->co.ClipObj;
// psurfOffScreen = NULL;
}
/* Now do the rendering */
- if(hbmAlpha && ((diFlags & DI_NORMAL) == DI_NORMAL))
- {
- BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } };
+ if(hbmAlpha && ((diFlags & DI_NORMAL) == DI_NORMAL))
+ {
+ BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } };
PSURFACE psurf = NULL;
psurf = SURFACE_ShareLockSurface(hbmAlpha);
@@ -1354,7 +1354,7 @@
EXLATEOBJ_vCleanup(&exlo);
SURFACE_ShareUnlockSurface(psurf);
if(Ret) goto done;
- ERR("NtGdiAlphaBlend failed!\n");
+ ERR("NtGdiAlphaBlend failed!\n");
}
NoAlpha:
if (diFlags & DI_MASK)
@@ -1387,7 +1387,7 @@
if(diFlags & DI_IMAGE)
{
- if (psurfColor)
+ if (psurfColor)
{
DWORD rop4 = (diFlags & DI_MASK) ? ROP4_SRCINVERT : ROP4_SRCCOPY ;