Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tretiakov] 25797: - Make NtUserLoadKeyboardLayoutEx accept 6 params - Always get default locale from ntoskrnl - Fix some small bugs
by tretiakov＠svn.reactos.org 13 Feb '07

13 Feb '07

Author: tretiakov Date: Tue Feb 13 22:50:06 2007 New Revision: 25797 URL: http://svn.reactos.org/svn/reactos?rev=25797&view=rev Log: - Make NtUserLoadKeyboardLayoutEx accept 6 params - Always get default locale from ntoskrnl - Fix some small bugs Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/config.template.rbuild trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Tue Feb 13 22:50:06 2007 @@ -332,6 +332,7 @@ case WM_INPUTLANGCHANGEREQUEST: { FormatMsg(L"dlg WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", lParam, wParam); + UpdateData(hDlg); return FALSE; } Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Tue Feb 13 22:50:06 2007 @@ -49,6 +49,8 @@ 5 = gcc -O3 with -mpreferred-stack-boundary=2 --> <property name="OPTIMIZE" value="1" /> + +  Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Tue Feb 13 22:50:06 2007 @@ -300,7 +300,7 @@ { return NtUserLoadKeyboardLayoutEx( strtoul(pwszKLID, NULL, 16), - Flags); + Flags, 0, 0, 0, 0); } @@ -315,7 +315,7 @@ // We will do things our own way. return NtUserLoadKeyboardLayoutEx( wcstoul(pwszKLID, NULL, 16), - Flags); + Flags, 0, 0, 0, 0); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Feb 13 22:50:06 2007 @@ -1217,10 +1217,14 @@ ); HKL -NTAPI -NtUserLoadKeyboardLayoutEx( - LCID LocaleId, - UINT Flags); +STDCALL +NtUserLoadKeyboardLayoutEx( + IN DWORD dwKLID, + IN UINT Flags, + IN DWORD Unused1, + IN DWORD Unused2, + IN DWORD Unused3, + IN DWORD Unused4); BOOL NTAPI 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 (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Tue Feb 13 22:50:06 2007 @@ -12,7 +12,7 @@ HANDLE hModule; ULONG RefCount; HKL hkl; - LCID lcid; + DWORD klid; // Low word - language id. High word - device id. } KBL, *PKBL; #define KBL_UNLOADED 0x20000000 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Tue Feb 13 22:50:06 2007 @@ -17,7 +17,6 @@ #include <debug.h> PKBL KBLList = NULL; // Keyboard layout list. -PKBL DefaultKL = NULL; typedef PVOID (*KbdLayerDescriptor)(VOID); NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, @@ -193,13 +192,13 @@ return TRUE; } -static PKBL UserLoadDllAndCreateKbl(LCID LocaleId) +static PKBL UserLoadDllAndCreateKbl(DWORD LocaleId) { PKBL NewKbl; ULONG hKl; LANGID langid; - NewKbl = ExAllocatePool(PagedPool, sizeof(NewKbl)); + NewKbl = ExAllocatePool(PagedPool, sizeof(KBL)); if(!NewKbl) { @@ -229,7 +228,7 @@ else hKl |= hKl << 16; NewKbl->hkl = (HKL) hKl; - NewKbl->lcid = LocaleId; + NewKbl->klid = LocaleId; NewKbl->Flags = 0; NewKbl->RefCount = 0; @@ -238,7 +237,6 @@ BOOL UserInitDefaultKeyboardLayout() { - LCID LocaleId; NTSTATUS Status; @@ -252,27 +250,60 @@ DPRINT("DefaultLocale = %08lx\n", LocaleId); } - if(!NT_SUCCESS(Status) || !(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) + if(!NT_SUCCESS(Status) || !(KBLList = UserLoadDllAndCreateKbl(LocaleId))) { DPRINT1("Trying to load US Keyboard Layout.\n"); LocaleId = 0x409; - if(!(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) + if(!(KBLList = UserLoadDllAndCreateKbl(LocaleId))) { DPRINT1("Failed to load any Keyboard Layout\n"); return FALSE; } } - InitializeListHead(&DefaultKL->List); - KBLList = DefaultKL; + InitializeListHead(&KBLList->List); return TRUE; } - PKBL W32kGetDefaultKeyLayout(VOID) { - return DefaultKL; + LCID LocaleId; + NTSTATUS Status; + PKBL pKbl; + + // This is probably wrong... + // I need to do more research. + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not get default locale (%08lx).\n", Status); + DPRINT1("Assuming default locale = 0x409 (US).\n"); + LocaleId = 0x409; + } + + pKbl = KBLList; + do + { + if(pKbl->klid == LocaleId) + { + return pKbl; + } + + pKbl = (PKBL) pKbl->List.Flink; + } while(pKbl != KBLList); + + DPRINT("Loading new default keyboard layout.\n"); + pKbl = UserLoadDllAndCreateKbl(LocaleId); + + if(!pKbl) + { + DPRINT1("Failed to load %x!!! Returning any availableKL.\n", LocaleId); + return KBLList; + } + + InsertTailList(&KBLList->List, &pKbl->List); + return pKbl; } static PKBL UserHklToKbl(HKL hKl) @@ -298,6 +329,8 @@ return Prev; } + +/* EXPORTS *******************************************************************/ HKL FASTCALL UserGetKeyboardLayout( @@ -326,8 +359,6 @@ ObDereferenceObject(Thread); return Ret; } - -/* EXPORTS *******************************************************************/ UINT STDCALL @@ -408,8 +439,12 @@ HKL STDCALL NtUserLoadKeyboardLayoutEx( - IN LCID LocaleId, - IN UINT Flags) + IN DWORD dwKLID, + IN UINT Flags, + IN DWORD Unused1, + IN DWORD Unused2, + IN DWORD Unused3, + IN DWORD Unused4) { HKL Ret = NULL; PKBL pKbl; @@ -419,7 +454,7 @@ pKbl = KBLList; do { - if(pKbl->lcid == LocaleId) + if(pKbl->klid == dwKLID) { Ret = pKbl->hkl; goto the_end; @@ -428,7 +463,13 @@ pKbl = (PKBL) pKbl->List.Flink; } while(pKbl != KBLList); - pKbl = UserLoadDllAndCreateKbl(LocaleId); + pKbl = UserLoadDllAndCreateKbl(dwKLID); + + if(!pKbl) + { + goto the_end; + } + InsertTailList(&KBLList->List, &pKbl->List); Ret = pKbl->hkl; Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Tue Feb 13 22:50:06 2007 @@ -428,7 +428,7 @@ NtUserIsClipboardFormatAvailable 1 NtUserKillSystemTimer 2 NtUserKillTimer 2 -NtUserLoadKeyboardLayoutEx 2 +NtUserLoadKeyboardLayoutEx 6 NtUserLockWindowStation 1 NtUserLockWindowUpdate 1 NtUserLockWorkStation 0

1 0

[greatlrd] 25796: small prepare for rished20 sync for wine. so the sync goes allot easy update richedit.h adding tom.h <- from wine cvs 11/2-2007 the tom.idl does not exists in windows ?
by greatlrd＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: greatlrd Date: Tue Feb 13 00:23:32 2007 New Revision: 25796 URL: http://svn.reactos.org/svn/reactos?rev=25796&view=rev Log: small prepare for rished20 sync for wine. so the sync goes allot easy update richedit.h adding tom.h <- from wine cvs 11/2-2007 the tom.idl does not exists in windows ? Added: trunk/reactos/include/reactos/wine/tom.h (with props) Modified: trunk/reactos/include/psdk/richedit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… Added: trunk/reactos/include/reactos/wine/tom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/tom.h…

1 0

[greatlrd] 25795: merge r25794 from trunk to 0.3.1 it fixing follow thing : patch from Physicus, implement TOOLTIPS_NotifyFormat, it now retrurn the type of the string if it unicode or ansi. before it did not return any type at all. it did a heap crash from downloader mangers when it try figout what type of sting the toolstips use. it is tested in 0.3.1 and not whole implemnent is tested yet. it should be right for all case.
by greatlrd＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: greatlrd Date: Mon Feb 12 21:39:09 2007 New Revision: 25795 URL: http://svn.reactos.org/svn/reactos?rev=25795&view=rev Log: merge r25794 from trunk to 0.3.1 it fixing follow thing : patch from Physicus, implement TOOLTIPS_NotifyFormat, it now retrurn the type of the string if it unicode or ansi. before it did not return any type at all. it did a heap crash from downloader mangers when it try figout what type of sting the toolstips use. it is tested in 0.3.1 and not whole implemnent is tested yet. it should be right for all case. Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/tooltips.c Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Feb 12 21:39:09 2007 @@ -107,3 +107,43 @@ case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return FALSE; + +Index: tooltips.c +=================================================================== +--- tooltips.c (revision 25790) ++++ tooltips.c (working copy) +@@ -2450,7 +2450,34 @@ + TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) + { + FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam); ++ TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); ++ TTTOOL_INFO *toolPtr = infoPtr->tools; ++ INT nResult; + ++ if (lParam == NF_QUERY) ++ { ++ if (toolPtr->bNotifyUnicode) ++ { ++ return NFR_UNICODE; ++ } else { ++ return NFR_ANSI; ++ } ++ } ++ else if (lParam == NF_REQUERY) ++ { ++ nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, ++ (WPARAM)hwnd, (LPARAM)NF_QUERY); ++ if (nResult == NFR_ANSI) { ++ toolPtr->bNotifyUnicode = FALSE; ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); ++ } else if (nResult == NFR_UNICODE) { ++ toolPtr->bNotifyUnicode = TRUE; ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); ++ } else { ++ TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); ++ } ++ return nResult; ++ } + return 0; + } + Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/tooltips.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/tooltips.c Mon Feb 12 21:39:09 2007 @@ -2450,7 +2450,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam); - + TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); + TTTOOL_INFO *toolPtr = infoPtr->tools; + INT nResult; + + if (lParam == NF_QUERY) + { + if (toolPtr->bNotifyUnicode) + { + return NFR_UNICODE; + } else { + return NFR_ANSI; + } + } + else if (lParam == NF_REQUERY) + { + nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, + (WPARAM)hwnd, (LPARAM)NF_QUERY); + if (nResult == NFR_ANSI) { + toolPtr->bNotifyUnicode = FALSE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); + } else if (nResult == NFR_UNICODE) { + toolPtr->bNotifyUnicode = TRUE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); + } else { + TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + } + return nResult; + } return 0; }

1 0

[greatlrd] 25794: patch from Physicus, implement TOOLTIPS_NotifyFormat, it now retrurn the type of the string if it unicode or ansi. before it did not return any type at all. it did a heap crash from downloader mangers when it try figout what type of sting the toolstips use. it is tested in 0.3.1 and not whole implemnent is tested yet. it should be right for all case.
by greatlrd＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: greatlrd Date: Mon Feb 12 21:37:05 2007 New Revision: 25794 URL: http://svn.reactos.org/svn/reactos?rev=25794&view=rev Log: patch from Physicus, implement TOOLTIPS_NotifyFormat, it now retrurn the type of the string if it unicode or ansi. before it did not return any type at all. it did a heap crash from downloader mangers when it try figout what type of sting the toolstips use. it is tested in 0.3.1 and not whole implemnent is tested yet. it should be right for all case. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/tooltips.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Feb 12 21:37:05 2007 @@ -107,3 +107,43 @@ case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return FALSE; + +Index: tooltips.c +=================================================================== +--- tooltips.c (revision 25790) ++++ tooltips.c (working copy) +@@ -2450,7 +2450,34 @@ + TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) + { + FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam); ++ TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); ++ TTTOOL_INFO *toolPtr = infoPtr->tools; ++ INT nResult; + ++ if (lParam == NF_QUERY) ++ { ++ if (toolPtr->bNotifyUnicode) ++ { ++ return NFR_UNICODE; ++ } else { ++ return NFR_ANSI; ++ } ++ } ++ else if (lParam == NF_REQUERY) ++ { ++ nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, ++ (WPARAM)hwnd, (LPARAM)NF_QUERY); ++ if (nResult == NFR_ANSI) { ++ toolPtr->bNotifyUnicode = FALSE; ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); ++ } else if (nResult == NFR_UNICODE) { ++ toolPtr->bNotifyUnicode = TRUE; ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); ++ } else { ++ TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); ++ } ++ return nResult; ++ } + return 0; + } + Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Mon Feb 12 21:37:05 2007 @@ -2450,7 +2450,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam); - + TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); + TTTOOL_INFO *toolPtr = infoPtr->tools; + INT nResult; + + if (lParam == NF_QUERY) + { + if (toolPtr->bNotifyUnicode) + { + return NFR_UNICODE; + } else { + return NFR_ANSI; + } + } + else if (lParam == NF_REQUERY) + { + nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, + (WPARAM)hwnd, (LPARAM)NF_QUERY); + if (nResult == NFR_ANSI) { + toolPtr->bNotifyUnicode = FALSE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); + } else if (nResult == NFR_UNICODE) { + toolPtr->bNotifyUnicode = TRUE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); + } else { + TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + } + return nResult; + } return 0; }

1 0

[fireball] 25793: Merge 25729 (calc.exe fix)
by fireball＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: fireball Date: Mon Feb 12 19:38:36 2007 New Revision: 25793 URL: http://svn.reactos.org/svn/reactos?rev=25793&view=rev Log: Merge 25729 (calc.exe fix) Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c Mon Feb 12 19:38:36 2007 @@ -2882,16 +2882,16 @@ MessageBeep(0); } - if (point) { - p = calc->buffer; - n = _tcslen(p) - 1; - while (*(p+n) && - *(p+n) != TEXT('.') && - *(p+n) == TEXT('0')) { - calc->buffer[n] = TEXT('\0'); - n--; - } - } + //if (point) { + // p = calc->buffer; + // n = _tcslen(p) - 1; + // while (*(p+n) && + // *(p+n) != TEXT('.') && + // *(p+n) == TEXT('0')) { + // calc->buffer[n] = TEXT('\0'); + // n--; + // } + //} // remove leading zeros

1 0

[tkreuzer] 25792: -check wich control send the WM_NOTIFY -don't include ProcessID 0 two times
by tkreuzer＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: tkreuzer Date: Mon Feb 12 07:42:53 2007 New Revision: 25792 URL: http://svn.reactos.org/svn/reactos?rev=25792&view=rev Log: -check wich control send the WM_NOTIFY -don't include ProcessID 0 two times Modified: trunk/rosapps/devutils/gdihv/mainwnd.c trunk/rosapps/devutils/gdihv/proclist.c Modified: trunk/rosapps/devutils/gdihv/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.c?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.c (original) +++ trunk/rosapps/devutils/gdihv/mainwnd.c Mon Feb 12 07:42:53 2007 @@ -83,6 +83,7 @@ case WM_NOTIFY: { if (((LPNMLISTVIEW)lParam)->hdr.code == LVN_ITEMCHANGED + && (wParam == IDC_PROCESSLIST) && (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED) && !(((LPNMLISTVIEW)lParam)->uOldState & LVIS_SELECTED)) { Modified: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (original) +++ trunk/rosapps/devutils/gdihv/proclist.c Mon Feb 12 07:42:53 2007 @@ -72,7 +72,7 @@ { return; } - for (i = 0; i < cProcesses; i++) + for (i = 1; i < cProcesses; i++) { wsprintf(strText, L"<unknown>"); item.lParam = ProcessIds[i];

1 0

[tkreuzer] 25791: - Implement appearance page of desk.cpl - update and cleanup resources See issue #1732 for more details.
by tkreuzer＠svn.reactos.org 12 Feb '07

12 Feb '07

Author: tkreuzer Date: Mon Feb 12 06:32:40 2007 New Revision: 25791 URL: http://svn.reactos.org/svn/reactos?rev=25791&view=rev Log: - Implement appearance page of desk.cpl - update and cleanup resources See issue #1732 for more details. Added: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.h Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/sv.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=257… Added: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… Added: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=257… Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=257…

1 0

[greatlrd] 25790: Implement test for NtGdiDdCreateDirectDrawObject works in windows 2000 sp4, only if u remove __REACTOS__ or using the vs project file. have not tested in reactos yet. but it should work.
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 19:57:31 2007 New Revision: 25790 URL: http://svn.reactos.org/svn/reactos?rev=25790&view=rev Log: Implement test for NtGdiDdCreateDirectDrawObject works in windows 2000 sp4, only if u remove __REACTOS__ or using the vs project file. have not tested in reactos yet. but it should work. Added: trunk/rosapps/dxtest/ trunk/rosapps/dxtest/ddraw/ trunk/rosapps/dxtest/directory.rbuild (with props) trunk/rosapps/dxtest/gdi32/ trunk/rosapps/dxtest/win32kdxtest/ trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (with props) trunk/rosapps/dxtest/win32kdxtest/main.c (with props) trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (with props) trunk/rosapps/dxtest/win32kdxtest/test.h (with props) trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (with props) trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (with props) trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (with props) Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=25790… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sun Feb 11 19:57:31 2007 @@ -12,6 +12,9 @@ <directory name="dflat32"> <xi:include href="dflat32/dflat32.rbuild" /> +</directory> +<directory name="dxtest"> + <xi:include href="dxtest/directory.rbuild" /> </directory> <!-- <directory name="lib"> Added: trunk/rosapps/dxtest/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/directory.rbuild?re… ============================================================================== --- trunk/rosapps/dxtest/directory.rbuild (added) +++ trunk/rosapps/dxtest/directory.rbuild Sun Feb 11 19:57:31 2007 @@ -1,0 +1,4 @@ +<directory name="win32kdxtest"> + <xi:include href="win32kdxtest/win32kdxtest.rbuild" /> +</directory> + Propchange: trunk/rosapps/dxtest/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/Window… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (added) +++ trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h Sun Feb 11 19:57:31 2007 @@ -1,0 +1,20 @@ + + +#if !defined(__REACTOS__) + + HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc) + { + INT retValue; + _asm + { + mov eax, 0x1039 + lea edx, [hdc] + int 0x2E + mov [retValue],eax + } + return retValue; + } + +#endif + + Propchange: trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (added) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sun Feb 11 19:57:31 2007 @@ -1,0 +1,51 @@ + +#include <stdio.h> +#include <windows.h> + + +#include "test.h" +#include "Windows2000Sp4.h" +#include "sysreactos.h" + +int main(int argc, char **argv) +{ + + test_NtGdiDdCreateDirectDrawObject(); + return 0; +} + + +void +test_NtGdiDdCreateDirectDrawObject() +{ + HANDLE retValue=0; + int fails=0; + HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); + + printf("Start testing of NtGdiDdCreateDirectDrawObject(NULL)\n"); + + retValue = sysNtGdiDdCreateDirectDrawObject(NULL); + + if (retValue != NULL) + { + printf("FAIL NtGdiDdCreateDirectDrawObject(NULL) != 0\n"); + fails++; + } + + retValue = sysNtGdiDdCreateDirectDrawObject(hdc); + if (retValue == NULL) + { + printf("FAIL NtGdiDdCreateDirectDrawObject(NULL) == 0)\n"); + fails++; + } + + if (fails == 0) + { + printf("End testing of NtGdiDdCreateDirectDrawObject Status : ok\n"); + } + else + { + printf("End testing of NtGdiDdCreateDirectDrawObject Status : fail\n"); + } +} + Propchange: trunk/rosapps/dxtest/win32kdxtest/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/sysreactos.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/sysrea… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (added) +++ trunk/rosapps/dxtest/win32kdxtest/sysreactos.h Sun Feb 11 19:57:31 2007 @@ -1,0 +1,5 @@ + + +#if defined(__REACTOS__) + #define sysNtGdiDdCreateDirectDrawObject NtGdiDdCreateDirectDrawObject; +#endif Propchange: trunk/rosapps/dxtest/win32kdxtest/sysreactos.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/test.h… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/test.h (added) +++ trunk/rosapps/dxtest/win32kdxtest/test.h Sun Feb 11 19:57:31 2007 @@ -1,0 +1,5 @@ + +HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc); +HANDLE NtGdiDdCreateDirectDrawObject(HDC hdc); +void test_NtGdiDdCreateDirectDrawObject(); + Propchange: trunk/rosapps/dxtest/win32kdxtest/test.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (added) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Sun Feb 11 19:57:31 2007 @@ -1,0 +1,14 @@ +<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings ="true" > + <include base="win32kdxtest">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>main.c</file> + <file>../../../../dll/win32/gdi32/misc/win32k.S</file> + + +</module> Propchange: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (added) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln Sun Feb 11 19:57:31 2007 @@ -1,0 +1,32 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32kdxtest", "win32kdxtest_vc8_auto.vcproj", "{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug - Wine headers|Win32 = Debug - Wine headers|Win32 + Debug|Win32 = Debug|Win32 + Release - Wine headers|Win32 = Release - Wine headers|Win32 + Release|Win32 = Release|Win32 + Speed - Wine headers|Win32 = Speed - Wine headers|Win32 + Speed|Win32 = Speed|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.ActiveCfg = Debug - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.Build.0 = Debug - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.Build.0 = Debug|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.ActiveCfg = Release - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.Build.0 = Release - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.ActiveCfg = Release|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.Build.0 = Release|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.ActiveCfg = Speed - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.Build.0 = Speed - Wine headers|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.ActiveCfg = Speed|Win32 + {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.Build.0 = Speed|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Propchange: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (added) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj Sun Feb 11 19:57:31 2007 @@ -1,0 +1,609 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="win32kdxtest" + ProjectGUID="{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}" + RootNamespace="win32kdxtest" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + <DefaultToolFile + FileName="masm.rules" + /> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + FavorSizeOrSpeed="1" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + StringPooling="true" + MinimalRebuild="true" + BasicRuntimeChecks="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release;..\..\..\..\output-i386\dll\win32\user32\vc8\Release" + GenerateDebugInformation="true" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Speed|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + MinimalRebuild="false" + BasicRuntimeChecks="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed" + GenerateDebugInformation="false" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug - Wine headers|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug - Wine headers" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug - Wine headers" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + PreprocessorDefinitions=";DBG;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + GeneratePreprocessedFile="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + AssemblerOutput="3" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug - Wine headers" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release - Wine headers|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release - Wine headers" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release - Wine headers" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + FavorSizeOrSpeed="1" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + StringPooling="true" + MinimalRebuild="true" + BasicRuntimeChecks="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Release - Wine headers" + GenerateDebugInformation="true" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Speed - Wine headers|Win32" + OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed - Wine headers" + IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed - Wine headers" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" + MinimalRebuild="false" + BasicRuntimeChecks="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CallingConvention="0" + CompileAs="1" + ForcedIncludeFiles="warning.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib" + OutputFile="$(OutDir)/win32kdxtest.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed - Wine headers" + GenerateDebugInformation="false" + SubSystem="1" + LinkTimeCodeGeneration="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + EmbedManifest="false" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S" + > + <File + RelativePath=".\main.c" + > + </File> + <File + RelativePath=".\sysreactos.h" + > + </File> + <File + RelativePath=".\test.h" + > + </File> + <File + RelativePath=".\Windows2000Sp4.h" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Propchange: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 25789: - fix warning
by janderwald＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: janderwald Date: Sun Feb 11 19:27:08 2007 New Revision: 25789 URL: http://svn.reactos.org/svn/reactos?rev=25789&view=rev Log: - fix warning Modified: trunk/reactos/base/system/msiexec/msiexec.c Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c (original) +++ trunk/reactos/base/system/msiexec/msiexec.c Sun Feb 11 19:27:08 2007 @@ -237,7 +237,7 @@ /* str2 is at the beginning of str1, ignoring case */ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2) { - DWORD len, ret; + int len, ret; LPWSTR strW; len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0);

1 0

[janderwald] 25788: - Fix a bug in NtUserOpenDesktop and simply the code - Fix bug in NtUserEnumDisplayDevices
by janderwald＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: janderwald Date: Sun Feb 11 18:32:54 2007 New Revision: 25788 URL: http://svn.reactos.org/svn/reactos?rev=25788&view=rev Log: - Fix a bug in NtUserOpenDesktop and simply the code - Fix bug in NtUserEnumDisplayDevices Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Sun Feb 11 18:32:54 2007 @@ -1068,6 +1068,7 @@ UNICODE_STRING SafeDesktopName; NTSTATUS Status; HDESK Desktop; + BOOL Result; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserOpenDesktop: %wZ\n", lpszDesktopName); @@ -1106,17 +1107,19 @@ RtlInitUnicodeString(&SafeDesktopName, NULL); } - if (!IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, - lpszDesktopName)) - { - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - ObDereferenceObject(WinStaObject); - RtlFreeUnicodeString(&SafeDesktopName); - RETURN( 0); - } + Result = IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, + &SafeDesktopName); RtlFreeUnicodeString(&SafeDesktopName); ObDereferenceObject(WinStaObject); + + + if (!Result) + { + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); + RETURN( 0); + } + DPRINT("Trying to open desktop (%wZ)\n", &DesktopName); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sun Feb 11 18:32:54 2007 @@ -213,8 +213,8 @@ if (lpDisplayDevice->cb < sizeof(DISPLAY_DEVICE)) return FALSE; - swprintf(lpDisplayDevice->DeviceName, L"\\\\.\\DISPLAY1"); - swprintf(lpDisplayDevice->DeviceString, L"<Unknown>"); + wcscpy(lpDisplayDevice->DeviceName, L"\\\\.\\DISPLAY1"); + wcscpy(lpDisplayDevice->DeviceString, L"<Unknown>"); lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_MODESPRUNED | DISPLAY_DEVICE_PRIMARY_DEVICE

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