Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29032: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: hpoussin Date: Fri Sep 14 11:22:03 2007 New Revision: 29032 URL: http://svn.reactos.org/svn/reactos?rev=29032&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h Fri Sep 14 11:22:03 2007 @@ -153,8 +153,6 @@ BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc); #define COMCTL32_VERSION_MINOR 81 -#define WINE_FILEVERSION 5, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSIONSTR "5.81" /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Sep 14 11:22:03 2007 @@ -1,4 +1,4 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true" entrypoint="0"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> @@ -9,12 +9,6 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> - - <metadata - description = "Common controls used by ReactOS" - version = "Autosync" - owner = "Wine" /> - <library>wine</library> <library>user32</library> <library>gdi32</library> 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 Fri Sep 14 11:22:03 2007 @@ -1,3 +1,16 @@ +Index: commctrl.c +=================================================================== +--- commctrl.c (revision 23123) ++++ commctrl.c (working copy) +@@ -1620,7 +1620,7 @@ + * + * Draw text with shadow. + */ ++int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *rect, DWORD dwFlags, +-int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, + COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) + { + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, Index: listview.c =================================================================== --- listview.c (revision 23123) @@ -102,7 +115,7 @@ =================================================================== --- tooltips.c (revision 25790) +++ tooltips.c (working copy) -@@ -2437,7 +2437,34 @@ +@@ -2471,7 +2471,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); @@ -141,7 +154,7 @@ =================================================================== --- treeview.c (revision 27134) +++ treeview.c (working copy) -@@ -2839,8 +2839,6 @@ +@@ -2844,8 +2844,6 @@ } } Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Sep 14 11:22:03 2007 @@ -31,7 +31,7 @@ PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14 PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + CONTROL "Onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Sep 14 11:22:03 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Sep 14 11:22:03 2007 @@ -1,6 +1,6 @@ /* * Copyright 2003 Marcelo Duarte - * Copyright 2006 Américo José Melo + * Copyright 2006-2007 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,7 +42,7 @@ PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + CONTROL "Separador", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Sep 14 11:22:03 2007 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà: %s" +CAPTION "Ñâîéñòâà äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Sep 14 11:22:03 2007 @@ -2,7 +2,6 @@ * comctl (Ukrainian resources) * * Copyright 2004 Ilya Korniyko - * 2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +26,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Â³äì³íà", IDCANCEL,58,122,50,14 PUSHBUTTON "&Çàñòîñóâàòè", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "&Äîâ³äêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -42,7 +41,7 @@ PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Â³äì³íà", IDCANCEL,178,138,50,14 PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Fri Sep 14 11:22:03 2007 @@ -71,6 +71,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); + +#define NAME "microsoft.windows.common-controls" +#define FILE "comctl32.dll" +#define VERSION "6.0.0.0" +#define PUBLIC_KEY "6595b64144ccf1df" + +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + +static const char manifest[] = + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" + " <assemblyIdentity type=\"win32\" name=\"" NAME "\" version=\"" VERSION "\" processorArchitecture=\"" ARCH "\" publicKeyToken=\"" PUBLIC_KEY "\"/>\n" + " <file name=\"" FILE "\">\n" + " <windowClass>Button</windowClass>\n" + " <windowClass>ButtonListBox</windowClass>\n" + " <windowClass>ComboBoxEx32</windowClass>\n" + " <windowClass>ComboLBox</windowClass>\n" + " <windowClass>Combobox</windowClass>\n" + " <windowClass>Edit</windowClass>\n" + " <windowClass>Listbox</windowClass>\n" + " <windowClass>NativeFontCtl</windowClass>\n" + " <windowClass>ReBarWindow32</windowClass>\n" + " <windowClass>ScrollBar</windowClass>\n" + " <windowClass>Static</windowClass>\n" + " <windowClass>SysAnimate32</windowClass>\n" + " <windowClass>SysDateTimePick32</windowClass>\n" + " <windowClass>SysHeader32</windowClass>\n" + " <windowClass>SysIPAddress32</windowClass>\n" + " <windowClass>SysLink</windowClass>\n" + " <windowClass>SysListView32</windowClass>\n" + " <windowClass>SysMonthCal32</windowClass>\n" + " <windowClass>SysPager</windowClass>\n" + " <windowClass>SysTabControl32</windowClass>\n" + " <windowClass>SysTreeView32</windowClass>\n" + " <windowClass>ToolbarWindow32</windowClass>\n" + " <windowClass>msctls_hotkey32</windowClass>\n" + " <windowClass>msctls_progress32</windowClass>\n" + " <windowClass>msctls_statusbar32</windowClass>\n" + " <windowClass>msctls_trackbar32</windowClass>\n" + " <windowClass>msctls_updown32</windowClass>\n" + " <windowClass>tooltips_class32</windowClass>\n" + " </file>\n" + "</assembly>\n"; + +static const char manifest_filename[] = ARCH "_" NAME "_" PUBLIC_KEY "_" VERSION "_none_deadbeef.manifest"; + LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LPWSTR COMCTL32_wSubclass = NULL; @@ -90,6 +142,47 @@ static const WCHAR strCC32SubclassInfo[] = { 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 }; + +static BOOL create_manifest( BOOL install ) +{ + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s',0}; + static const WCHAR manifestsW[] = {'\\','m','a','n','i','f','e','s','t','s','\\',0}; + + DWORD len, written; + WCHAR *buffer; + HANDLE file; + BOOL ret = FALSE; + + len = MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), NULL, 0 ); + len += GetWindowsDirectoryW( NULL, 0 ); + len += lstrlenW(winsxsW); + len += lstrlenW(manifestsW); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + GetWindowsDirectoryW( buffer, len ); + lstrcatW( buffer, winsxsW ); + CreateDirectoryW( buffer, NULL ); + lstrcatW( buffer, manifestsW ); + CreateDirectoryW( buffer, NULL ); + MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), + buffer + lstrlenW(buffer), len ); + if (install) + { + file = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + if (file != INVALID_HANDLE_VALUE) + { + ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && + written == sizeof(manifest)-1); + CloseHandle( file ); + if (!ret) DeleteFileW( buffer ); + else TRACE("created %s\n", debugstr_w(buffer)); + } + } + else ret = DeleteFileW( buffer ); + + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + /*********************************************************************** * DllMain [Internal] @@ -917,10 +1010,9 @@ */ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { - FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", - debugstr_w(cmdline)); - - return S_OK; + TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); + if (!create_manifest( bInstall )) return HRESULT_FROM_WIN32(GetLastError()); + return S_OK; } /*********************************************************************** @@ -1528,12 +1620,10 @@ * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *pRect, DWORD dwFlags, +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *rect, DWORD dwFlags, COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) { - RECT rect = *pRect; - - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, pRect, dwFlags, + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, &rect, DT_LEFT); -} + return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); +} Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Sep 14 11:22:03 2007 @@ -6658,7 +6658,16 @@ ZeroMemory(&hdi, sizeof(HDITEMW)); column_fill_hditem(infoPtr, &hdi, nColumn, lpColumn, isW); - + + /* + * A mask not including LVCF_WIDTH turns into a mask of width, width 10 + * (can be seen in SPY) otherwise column never gets added. + */ + if (!(lpColumn->mask & LVCF_WIDTH)) { + hdi.mask |= HDI_WIDTH; + hdi.cxy = 10; + } + /* * when the iSubItem is available Windows copies it to the header lParam. It seems * to happen only in LVM_INSERTCOLUMN - not in LVM_SETCOLUMN Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc Fri Sep 14 11:22:03 2007 @@ -26,6 +26,13 @@ #include "comctl32.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controls" +#define WINE_FILENAME_STR "comctl32.dll" +#define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 +#define WINE_FILEVERSIONSTR "5.81" +#define WINE_PRODUCTVERSION WINE_FILEVERSION +#define WINE_PRODUCTVERSION_STR WINE_FILEVERSIONSTR #include "wine/wine_common_ver.rc" Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c (original) +++ trunk/reactos/dll/win32/comctl32/tab.c Fri Sep 14 11:22:03 2007 @@ -255,6 +255,7 @@ else { if (infoPtr->iSelected != iItem) { infoPtr->iSelected=iItem; + infoPtr->uFocus=iItem; TAB_EnsureSelectionVisible(infoPtr); TAB_InvalidateTabArea(infoPtr); } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Fri Sep 14 11:22:03 2007 @@ -44,7 +44,7 @@ * - TBN_GETOBJECT * - TBN_SAVE * - Button wrapping (under construction). - * - Fix TB_SETROWS. + * - Fix TB_SETROWS and Separators. * - iListGap custom draw support. * * Testing: @@ -3637,10 +3637,7 @@ { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - if (infoPtr->dwStyle & TBSTYLE_WRAPABLE) - return infoPtr->nRows; - else - return 1; + return infoPtr->nRows; } @@ -4947,19 +4944,106 @@ { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPRECT lprc = (LPRECT)lParam; + int rows = LOWORD(wParam); + BOOL bLarger = HIWORD(wParam); TRACE("\n"); - if (LOWORD(wParam) > 1) { - FIXME("multiple rows not supported!\n"); - } - - if(infoPtr->nRows != LOWORD(wParam)) - { - infoPtr->nRows = LOWORD(wParam); + TRACE("Setting rows to %d (%d)\n", rows, bLarger); + + if(infoPtr->nRows != rows) + { + TBUTTON_INFO *btnPtr = infoPtr->buttons; + int curColumn = 0; /* Current column */ + int curRow = 0; /* Current row */ + int hidden = 0; /* Number of hidden buttons */ + int seps = 0; /* Number of separators */ + int idealWrap = 0; /* Ideal wrap point */ + int i; + BOOL wrap; + + /* + Calculate new size and wrap points - Under windows, setrows will + change the dimensions if needed to show the number of requested + rows (if CCS_NORESIZE is set), or will take up the whole window + (if no CCS_NORESIZE). + + Basic algorithum - If N buttons, and y rows requested, each row + contains N/y buttons. + + FIXME: Handling of separators not obvious from testing results + FIXME: Take width of window into account? + */ + + /* Loop through the buttons one by one counting key items */ + for (i = 0; i < infoPtr->nNumButtons; i++ ) + { + btnPtr[i].fsState &= ~TBSTATE_WRAP; + if (btnPtr[i].fsState & TBSTATE_HIDDEN) + hidden++; + else if (btnPtr[i].fsStyle & BTNS_SEP) + seps++; + } + + /* FIXME: Separators make this quite complex */ + if (seps) FIXME("Separators unhandled\n"); + + /* Round up so more per line, ie less rows */ + idealWrap = (infoPtr->nNumButtons - hidden + (rows-1)) / rows; + + /* Calculate ideal wrap point if we are allowed to grow, but cannot + achieve the requested number of rows. */ + if (bLarger && idealWrap > 1) + { + int resRows = (infoPtr->nNumButtons + (idealWrap-1)) / idealWrap; + int moreRows = (infoPtr->nNumButtons + (idealWrap-2)) / (idealWrap-1); + + if (resRows < rows && moreRows > rows) + { + idealWrap--; + TRACE("Changing idealWrap due to bLarger (now %d)\n", idealWrap); + } + } + + curColumn = curRow = 0; + wrap = FALSE; + TRACE("Trying to wrap at %d (%d,%d,%d)\n", idealWrap, + infoPtr->nNumButtons, hidden, rows); + + for (i = 0; i < infoPtr->nNumButtons; i++ ) + { + if (btnPtr[i].fsState & TBSTATE_HIDDEN) + continue; + + /* Step on, wrap if necessary or flag next to wrap */ + if (!wrap) { + curColumn++; + } else { + wrap = FALSE; + curColumn = 1; + curRow++; + } + + if (curColumn > (idealWrap-1)) { + wrap = TRUE; + btnPtr[i].fsState |= TBSTATE_WRAP; + } + } + + TRACE("Result - %d rows\n", curRow + 1); /* recalculate toolbar */ TOOLBAR_CalcToolbar (hwnd); + + /* Resize if necessary (Only if NORESIZE is set - odd, but basically + if NORESIZE is NOT set, then the toolbar will always be resized to + take up the whole window. With it set, sizing needs to be manual. */ + if (infoPtr->dwStyle & CCS_NORESIZE) { + SetWindowPos(hwnd, NULL, 0, 0, + infoPtr->rcBound.right - infoPtr->rcBound.left, + infoPtr->rcBound.bottom - infoPtr->rcBound.top, + SWP_NOMOVE); + } /* repaint toolbar */ InvalidateRect(hwnd, NULL, TRUE); 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 Fri Sep 14 11:22:03 2007 @@ -314,7 +314,7 @@ ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA)); ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOA; + ttnmdi.hdr.code = TTN_GETDISPINFOA; /* == TTN_NEEDTEXTA */ ttnmdi.lpszText = (LPSTR)&ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; @@ -332,7 +332,6 @@ } } else if (ttnmdi.lpszText == 0) { - /* no text available */ infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { @@ -347,6 +346,22 @@ ERR("recursive text callback!\n"); infoPtr->szTipText[0] = '\0'; } + + /* no text available - try calling parent instead as per native */ + /* FIXME: Unsure if SETITEM should save the value or not */ + if (infoPtr->szTipText[0] == 0x00) { + + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, + (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + + if (IS_INTRESOURCE(ttnmdi.lpszText)) { + LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), + infoPtr->szTipText, INFOTIPSIZE); + } else if (ttnmdi.lpszText && + ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { + Str_GetPtrAtoW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); + } + } } static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *toolPtr) @@ -357,7 +372,7 @@ ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOW)); ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOW; + ttnmdi.hdr.code = TTN_GETDISPINFOW; /* == TTN_NEEDTEXTW */ ttnmdi.lpszText = (LPWSTR)&ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; @@ -375,7 +390,6 @@ } } else if (ttnmdi.lpszText == 0) { - /* no text available */ infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { @@ -390,6 +404,23 @@ ERR("recursive text callback!\n"); infoPtr->szTipText[0] = '\0'; } + + /* no text available - try calling parent instead as per native */ + /* FIXME: Unsure if SETITEM should save the value or not */ + if (infoPtr->szTipText[0] == 0x00) { + + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, + (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + + if (IS_INTRESOURCE(ttnmdi.lpszText)) { + LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), + infoPtr->szTipText, INFOTIPSIZE); + } else if (ttnmdi.lpszText && + ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { + Str_GetPtrW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); + } + } + } static void @@ -538,15 +569,18 @@ if (style & TTS_BALLOON) { ptfx = rc.left + ((rc.right - rc.left) / 2); - if(rect.top - size.cy >= 0) + + /* CENTERTIP ballon tooltips default to below the field + if they fit on the screen */ + if(rc.bottom + size.cy > GetSystemMetrics(SM_CYSCREEN)) { - rect.top -= size.cy; + rect.top = rc.top - size.cy; infoPtr->bToolBelow = FALSE; } else { infoPtr->bToolBelow = TRUE; - rect.top += 20; + rect.top = rc.bottom; } rect.left = max(0, rect.left - BALLOON_STEMINDENT); } Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Fri Sep 14 11:22:03 2007 @@ -946,6 +946,8 @@ for (item = start; item != NULL; item = TREEVIEW_GetNextListItem(infoPtr, item)) { + if (!ISVISIBLE(item) && order > 0) + TREEVIEW_ComputeItemInternalMetrics(infoPtr, item); item->visibleOrder = order; order += item->iIntegral; } @@ -2031,7 +2033,10 @@ lpRect->bottom = wineItem->rect.bottom; lpRect->left = wineItem->textOffset; - lpRect->right = wineItem->textOffset + wineItem->textWidth; + if (!wineItem->textWidth) + TREEVIEW_ComputeTextWidth(infoPtr, wineItem, 0); + + lpRect->right = wineItem->textOffset + wineItem->textWidth + 4; } else {

1 0

[jimtabor] 29031: It does work. There is another bug in the tree!
by jimtabor＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: jimtabor Date: Fri Sep 14 10:37:08 2007 New Revision: 29031 URL: http://svn.reactos.org/svn/reactos?rev=29031&view=rev Log: It does work. There is another bug in the tree! Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Fri Sep 14 10:37:08 2007 @@ -1058,7 +1058,8 @@ } case WM_LBUTTONDBLCLK: -// return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam)); + return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam)); + case WM_NCLBUTTONDBLCLK: { return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));

1 0

[jimtabor] 29030: Need to update or sync with wine.
by jimtabor＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: jimtabor Date: Fri Sep 14 10:30:26 2007 New Revision: 29030 URL: http://svn.reactos.org/svn/reactos?rev=29030&view=rev Log: Need to update or sync with wine. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Fri Sep 14 10:30:26 2007 @@ -1058,8 +1058,7 @@ } case WM_LBUTTONDBLCLK: - return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam)); - +// return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam)); case WM_NCLBUTTONDBLCLK: { return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));

1 0

[jimtabor] 29029: Vitaliy Margolen: Dont exit when double-clicking with right button held.
by jimtabor＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: jimtabor Date: Fri Sep 14 10:14:50 2007 New Revision: 29029 URL: http://svn.reactos.org/svn/reactos?rev=29029&view=rev Log: Vitaliy Margolen: Dont exit when double-clicking with right button held. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Fri Sep 14 10:14:50 2007 @@ -1058,6 +1058,8 @@ } case WM_LBUTTONDBLCLK: + return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam)); + case WM_NCLBUTTONDBLCLK: { return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));

1 0

[jimtabor] 29028: Fix typo, add extra entry to the structure.
by jimtabor＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: jimtabor Date: Fri Sep 14 09:05:35 2007 New Revision: 29028 URL: http://svn.reactos.org/svn/reactos?rev=29028&view=rev Log: Fix typo, add extra entry to the structure. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Sep 14 09:05:35 2007 @@ -679,14 +679,15 @@ // typedef struct _W32CLTINFO_TEB { - ULONG Win32ClientInfo0[3]; + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; ULONG ulAppCompatFlags; ULONG ulAppCompatFlags2; ULONG Win32ClientInfo1[5]; HWND hWND; PVOID pvWND; ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, PW32CLTINFO_TEB; +} W32CLTINFO_TEB, *PW32CLTINFO_TEB; // // Initial TEB

1 0

[tkreuzer] 29027: make upper 16 bit of gdi table entries type field more windows compatible
by tkreuzer＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: tkreuzer Date: Fri Sep 14 06:53:49 2007 New Revision: 29027 URL: http://svn.reactos.org/svn/reactos?rev=29027&view=rev Log: make upper 16 bit of gdi table entries type field more windows compatible Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Sep 14 06:53:49 2007 @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -641,6 +641,7 @@ if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); + DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); KeRosDumpStackFrames(NULL, 20); } else @@ -1060,7 +1061,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1069,22 +1070,24 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; + HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(hObj); - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); + ASSERT(phObj); + hObj = *phObj; + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1096,16 +1099,13 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - NewType = GDI_HANDLE_GET_TYPE(*hObj); - NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; - - /* This is the type that the object should have right now, save it */ - OldType = NewType; + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType |= GDI_ENTRY_STOCK_MASK; + NewType = OldType | GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,7 +1146,8 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; /* we're done, successfully converted the object */ return TRUE; @@ -1300,6 +1301,7 @@ else { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); + DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); } } else if(PrevProcId == LockedProcessId)

1 0

[jimtabor] 29026: Add window client information structure to TEB.
by jimtabor＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: jimtabor Date: Thu Sep 13 20:57:53 2007 New Revision: 29026 URL: http://svn.reactos.org/svn/reactos?rev=29026&view=rev Log: Add window client information structure to TEB. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 13 20:57:53 2007 @@ -675,6 +675,20 @@ } GDI_TEB_BATCH, *PGDI_TEB_BATCH; // +// Window Client Information structure +// +typedef struct _W32CLTINFO_TEB +{ + ULONG Win32ClientInfo0[3]; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLTINFO_TEB, PW32CLTINFO_TEB; + +// // Initial TEB // typedef struct _INITIAL_TEB @@ -733,7 +747,7 @@ ULONG GdiClientPID; ULONG GdiClientTID; PVOID GdiThreadLocalInfo; - ULONG Win32ClientInfo[62]; + W32CLTINFO_TEB Win32ClientInfo; PVOID glDispatchTable[0xE9]; ULONG glReserved1[0x1D]; PVOID glReserved2;

1 0

[dreimer] 29025: Reformat the RC Files of the cpls to use rsrc.rc for including additional languages. *Nameofcpl*.rc should be LANG_NEUTRAL SUBLANG_NEUTRAL. Add manifest.xml to all CPLs to support skinning from now on.
by dreimer＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: dreimer Date: Thu Sep 13 15:40:16 2007 New Revision: 29025 URL: http://svn.reactos.org/svn/reactos?rev=29025&view=rev Log: Reformat the RC Files of the cpls to use rsrc.rc for including additional languages. *Nameofcpl*.rc should be LANG_NEUTRAL SUBLANG_NEUTRAL. Add manifest.xml to all CPLs to support skinning from now on. Added: trunk/reactos/dll/cpl/access/manifest.xml trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/manifest.xml trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/desk/manifest.xml trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/manifest.xml trunk/reactos/dll/cpl/input/manifest.xml trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/manifest.xml trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/liccpa/manifest.xml trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/manifest.xml trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/manifest.xml trunk/reactos/dll/cpl/ncpa/manifest.xml trunk/reactos/dll/cpl/ncpa/rsrc.rc trunk/reactos/dll/cpl/powercfg/manifest.xml trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/timedate/manifest.xml trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/cpl/usrmgr/manifest.xml trunk/reactos/dll/cpl/usrmgr/rsrc.rc Modified: trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/odbccp32/odbccp32.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Thu Sep 13 15:40:16 2007 @@ -9,19 +9,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDI_CPLACCESS ICON "resources/applet.ico" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" - - +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/access/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/access/manifest.xml (added) +++ trunk/reactos/dll/cpl/access/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/rsrc.rc (added) +++ trunk/reactos/dll/cpl/access/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,15 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,7 @@ #include "resource.h" #include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" @@ -11,30 +13,8 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ - -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/appwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/manifest.xml (added) +++ trunk/reactos/dll/cpl/appwiz/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (added) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,20 @@ +#include "resource.h" +#include <windows.h> + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Thu Sep 13 15:40:16 2007 @@ -10,24 +10,10 @@ #define REACTOS_STR_ORIGINAL_FILENAME "desk.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" - +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/desk/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/desk/manifest.xml (added) +++ trunk/reactos/dll/cpl/desk/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/rsrc.rc (added) +++ trunk/reactos/dll/cpl/desk/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,4 @@ #include <windows.h> - #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -15,6 +14,8 @@ #include <reactos/version.rc> #endif +123 24 DISCARDABLE "manifest.xml" + IDI_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Added: trunk/reactos/dll/cpl/hdwwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/manifest.xml (added) +++ trunk/reactos/dll/cpl/hdwwiz/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Thu Sep 13 15:40:16 2007 @@ -1,8 +1,10 @@ #include "resource.h" #include <windows.h> +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Language Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "input\0" #define REACTOS_STR_ORIGINAL_FILENAME "input.dll\0" #ifdef _MSC_VER @@ -11,20 +13,12 @@ #include <reactos/version.rc> #endif +123 24 DISCARDABLE "manifest.xml" + IDI_KEYBOARD_ICO ICON "resources/keyboard.ico" IDI_MARKER_ICO ICON "resources/marker.ico" IDI_MIC_ICO ICON "resources/microphone.ico" IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" IDI_INFO_ICO ICON "resources/information.ico" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ - -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/input/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/input/manifest.xml (added) +++ trunk/reactos/dll/cpl/input/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc (added) +++ trunk/reactos/dll/cpl/input/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,6 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Thu Sep 13 15:40:16 2007 @@ -4,33 +4,13 @@ #include "resource.h" #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Regional Settings Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "intl\0" #define REACTOS_STR_ORIGINAL_FILENAME "intl.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON ICON "resources/applet.ico" - - -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ - -//#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -//#include "lang/el-GR.rc" -#include "lang/en-US.rc" -//#include "lang/es-ES.rc" -//#include "lang/fr-FR.rc" -//#include "lang/hu-HU.rc" -//#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" -//#include "lang/nl-NL.rc" -#include "lang/ru-RU.rc" -//#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/intl/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/intl/manifest.xml (added) +++ trunk/reactos/dll/cpl/intl/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/rsrc.rc (added) +++ trunk/reactos/dll/cpl/intl/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,17 @@ +#include <windows.h> +#include "resource.h" + +//#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +//#include "lang/el-GR.rc" +#include "lang/en-US.rc" +//#include "lang/es-ES.rc" +//#include "lang/fr-FR.rc" +//#include "lang/hu-HU.rc" +//#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +//#include "lang/ja-JP.rc" +//#include "lang/nl-NL.rc" +#include "lang/ru-RU.rc" +//#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc Thu Sep 13 15:40:16 2007 @@ -2,6 +2,8 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" @@ -9,15 +11,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/liccpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/manifest.xml (added) +++ trunk/reactos/dll/cpl/liccpa/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/rsrc.rc (added) +++ trunk/reactos/dll/cpl/liccpa/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,12 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Thu Sep 13 15:40:16 2007 @@ -3,16 +3,15 @@ #include <windows.h> #include "resource.h" - -/* define language neutral resources */ - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Keyboard Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "main\0" #define REACTOS_STR_ORIGINAL_FILENAME "main.cpl\0" #include <reactos/version.rc> + +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" @@ -21,19 +20,4 @@ IDI_MOUSE_LEFT ICON "resources/mouse_left.ico" IDI_MOUSE_RIGHT ICON "resources/mouse_right.ico" - -/* include localised resources */ - -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/main/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/main/manifest.xml (added) +++ trunk/reactos/dll/cpl/main/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (added) +++ trunk/reactos/dll/cpl/main/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,16 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/mmsys/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/manifest.xml (added) +++ trunk/reactos/dll/cpl/mmsys/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,7 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Multimedia Control Panel\0" @@ -7,6 +9,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mmsys.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDI_CPLICON ICON "resources/mmsys.ico" IDI_MUTED_ICON ICON "resources/muted.ico" Added: trunk/reactos/dll/cpl/ncpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/manifest.xml (added) +++ trunk/reactos/dll/cpl/ncpa/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Thu Sep 13 15:40:16 2007 @@ -1,34 +1,20 @@ /* $Id$ */ +#include <windows.h> #include "resource.h" -#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "ncpa\0" #define REACTOS_STR_ORIGINAL_FILENAME "ncpa.cpl\0" +123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nb-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/ncpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/rsrc.rc (added) +++ trunk/reactos/dll/cpl/ncpa/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rc (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rc Thu Sep 13 15:40:16 2007 @@ -1,4 +1,3 @@ - #include <windows.h> #include "resource.h" Added: trunk/reactos/dll/cpl/powercfg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/manifest.xml (added) +++ trunk/reactos/dll/cpl/powercfg/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Thu Sep 13 15:40:16 2007 @@ -2,6 +2,8 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Power Management Control Panel\0" @@ -9,19 +11,11 @@ #define REACTOS_STR_ORIGINAL_FILENAME "powercfg.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDI_AC ICON "resources/ac.ico" IDI_ACDC ICON "resources/acdc.ico" IDI_DC ICON "resources/dc.ico" IDI_SCREEN ICON "resources/screen.ico" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc (added) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc (added) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" + +/* +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/es-ES.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/sv-SE.rc" +*/ Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Thu Sep 13 15:40:16 2007 @@ -2,7 +2,7 @@ #include <commctrl.h> #include "resource.h" -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Applet\0" @@ -13,30 +13,11 @@ 123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" - IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/devmgr.ico" IDI_DEVMGR ICON "resources/devmgr.ico" - IDB_ROSBMP BITMAP "resources/rosbitmap.bmp" RC_LICENSE RTDATA "resources/gpl.txt" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" - -/* -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/es-ES.rc" -#include "lang/hu-HU.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/sv-SE.rc" -*/ +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/timedate/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/manifest.xml (added) +++ trunk/reactos/dll/cpl/timedate/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/rsrc.rc (added) +++ trunk/reactos/dll/cpl/timedate/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,22 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Thu Sep 13 15:40:16 2007 @@ -1,37 +1,18 @@ #include <windows.h> #include <commctrl.h> - #include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS time/date Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Time/Date Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "timedate\0" #define REACTOS_STR_ORIGINAL_FILENAME "timedate.cpl\0" -//#include <reactos/version.rc> +#include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON ICON "resources/applet.ico" IDC_WORLD BITMAP "resources/world.bmp" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/usrmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/manifest.xml (added) +++ trunk/reactos/dll/cpl/usrmgr/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/rsrc.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Thu Sep 13 15:40:16 2007 @@ -7,12 +7,11 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS User Manager Panel\0" #define REACTOS_STR_INTERNAL_NAME "usrmgr\0" #define REACTOS_STR_ORIGINAL_FILENAME "usrmgr.cpl\0" +#include <reactos/version.rc> -#include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_USRMGR_ICON ICON "resources/applet.ico" IDC_USRMGR_ICON2 ICON "resources/applet.ico" - -#include "lang/en-US.rc" -#include "lang/ru-RU.rc" +#include "rsrc.rc"

1 0

[janderwald] 29024: - implement reading/displaying audio schemes
by janderwald＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: janderwald Date: Thu Sep 13 07:11:15 2007 New Revision: 29024 URL: http://svn.reactos.org/svn/reactos?rev=29024&view=rev Log: - implement reading/displaying audio schemes Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Thu Sep 13 07:11:15 2007 @@ -13,6 +13,7 @@ <library>msvcrt</library> <library>devmgr</library> <library>gdi32</library> + <library>winmm</library> <library>advapi32</library> <file>mmsys.c</file> <file>sounds.c</file> Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Thu Sep 13 07:11:15 2007 @@ -23,12 +23,17 @@ #define IDC_DEVICE_MIDI_LIST 114 #define IDC_DEVICE_VOICE_LIST 115 #define IDC_DEVICE_VOICE_REC_LIST 116 +#define IDC_TEXT_SOUND 117 +#define IDC_PLAY_SOUND 118 +#define IDC_BROWSE_SOUND 119 + #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 +#define IDS_NO_SOUND 1002 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Thu Sep 13 07:11:15 2007 @@ -40,18 +40,27 @@ PAPP_CONTEXT AppContext; }SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; +typedef struct __LABEL_MAP__ +{ + TCHAR * szName; + TCHAR * szDesc; + TCHAR * szIcon; + struct __LABEL_MAP__ * Next; +}LABEL_MAP, *PLABEL_MAP; + +static PLABEL_MAP s_Map = NULL; + BOOL -LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) +LoadEventLabel(HKEY hKey, TCHAR * szSubKey) { HKEY hSubKey; DWORD dwData; DWORD dwDesc; TCHAR szDesc[MAX_PATH]; TCHAR szData[MAX_PATH]; - - - LRESULT lResult; + PLABEL_MAP pMap; + if (RegOpenKeyEx(hKey, szSubKey, 0, @@ -85,17 +94,32 @@ return FALSE; } - - //FIXME - //lResult = SendDlgItemMessage(hwndDlg, - lResult = 0; + pMap = HeapAlloc(GetProcessHeap(), 0, sizeof(LABEL_MAP)); + if (!pMap) + { + return FALSE; + } + pMap->szName = _tcsdup(szSubKey); + pMap->szDesc = _tcsdup(szDesc); + pMap->szIcon = _tcsdup(szData); + + if (s_Map) + { + pMap->Next = s_Map; + s_Map = pMap; + } + else + { + s_Map = pMap; + s_Map->Next = 0; + } return TRUE; } BOOL -LoadEventLabels(HWND hwndDlg, HKEY hKey) +LoadEventLabels() { HKEY hSubKey; DWORD dwCurKey; @@ -103,8 +127,8 @@ DWORD dwName; DWORD dwResult; DWORD dwCount; - if (RegOpenKeyEx(hKey, - _T("EventLabels"), + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\EventLabels"), 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) @@ -128,7 +152,7 @@ if (dwResult == ERROR_SUCCESS) { - if (LoadEventLabel(hwndDlg, hSubKey, szName)) + if (LoadEventLabel(hSubKey, szName)) { dwCount++; } @@ -140,6 +164,23 @@ RegCloseKey(hSubKey); return (dwCount != 0); } +PLABEL_MAP FindLabel(TCHAR * szName) +{ + PLABEL_MAP pMap = s_Map; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + return NULL; +} + + + BOOL AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) @@ -189,8 +230,6 @@ return FALSE; } - - DWORD EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) { @@ -237,7 +276,7 @@ if (dwResult == ERROR_SUCCESS) { - if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcsicmp(szName, szDefault)))) { dwNumSchemes++; } @@ -292,10 +331,11 @@ BOOL -ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; + TCHAR szBuffer[MAX_PATH]; DWORD dwValue; PSOUND_SCHEME_CONTEXT pScheme; PAPP_CONTEXT pAppContext; @@ -349,10 +389,29 @@ //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); return FALSE; } - pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + if (!pLabelContext) + { + HeapFree(GetProcessHeap(), 0, pLabelContext); + if (Create) + { + HeapFree(GetProcessHeap(), 0, pAppContext); + } + return FALSE; + } + dwValue = ExpandEnvironmentStrings(szValue, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); + if (dwValue == 0 || dwValue > (sizeof(szBuffer) / sizeof(TCHAR))) + { + /* fixme */ + HeapFree(GetProcessHeap(), 0, pLabelContext); + if (Create) + { + HeapFree(GetProcessHeap(), 0, pAppContext); + } + return FALSE; + } + _tcscpy(pLabelContext->szValue, szBuffer); _tcscpy(pLabelContext->szName, szLabelName); - _tcscpy(pLabelContext->szValue, szValue); pLabelContext->Next = pAppContext->LabelContext; pAppContext->LabelContext = pLabelContext; @@ -367,7 +426,7 @@ DWORD -ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName) { HKEY hSubKey; DWORD dwNumProfiles; @@ -403,7 +462,7 @@ if (dwResult == ERROR_SUCCESS) { - if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, szDefault)) + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName)) { dwNumProfiles++; } @@ -429,6 +488,7 @@ DWORD dwNumEntry; DWORD dwName; TCHAR szName[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); @@ -451,6 +511,17 @@ { RegCloseKey(hSubKey); return FALSE; + } + + dwDefault = sizeof(szIcon) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + _T("DispFileName"), + NULL, + NULL, + (LPBYTE)szIcon, + &dwDefault) != ERROR_SUCCESS) + { + szIcon[0] = _T('\0'); } dwCurKey = 0; @@ -468,8 +539,38 @@ NULL); if (dwResult == ERROR_SUCCESS) { - if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, szDefault)) + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName)) { + LRESULT lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount != CB_ERR) + { + LRESULT lIndex; + LRESULT lResult; + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult != CB_ERR) + { + PAPP_CONTEXT pAppContext; + PSOUND_SCHEME_CONTEXT pScheme = (PSOUND_SCHEME_CONTEXT)lResult; + if (!_tcsicmp(pScheme->szName, _T(".None"))) + { + continue; + } + pAppContext = FindAppContext(pScheme, szAppName); + if (pAppContext) + { + _tcscpy(pAppContext->szDesc, szDefault); + _tcscpy(pAppContext->szIcon, szIcon); + } + + } + } + + + } + + dwNumEntry++; } } @@ -523,13 +624,13 @@ BOOL -LoadSoundProfiles(HWND hwndDlg, HKEY hKey) +LoadSoundProfiles(HWND hwndDlg) { HKEY hSubKey; DWORD dwNumSchemes; - if (RegOpenKeyEx(hKey, - _T("Schemes"), + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes"), 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) @@ -548,29 +649,144 @@ RegCloseKey(hSubKey); return FALSE; } - - - BOOL -InitSoundSettings(HWND hwndDlg) -{ - HKEY hKey; - - if (RegOpenKey(HKEY_CURRENT_USER, - _T("AppEvents"), - &hKey) != ERROR_SUCCESS) - { - return FALSE; - } - LoadSoundProfiles(hwndDlg, hKey); - //LoadEventLabels(hwndDlg, hKey); - - RegCloseKey(hKey); +LoadSoundFiles(HWND hwndDlg) +{ + TCHAR szPath[MAX_PATH]; + TCHAR szNone[MAX_PATH]; + TCHAR * ptr; + WIN32_FIND_DATA FileData; + HANDLE hFile; + LRESULT lResult; + UINT length; - return TRUE; -} - - + length = GetWindowsDirectory(szPath, sizeof(szPath) / sizeof(TCHAR)); + if (length == 0 || length > (sizeof(szPath) / sizeof(TCHAR))) + { + return FALSE; + } + if (szPath[length-1] != _T('\\')) + { + szPath[length] = _T('\\'); + length++; + } + _tcscpy(&szPath[length], _T("media\\*")); + length += 7; + + hFile = FindFirstFile(szPath, &FileData); + if (hFile == INVALID_HANDLE_VALUE) + { + return FALSE; + } + if (LoadString(hApplet, IDS_NO_SOUND, szNone, MAX_PATH)) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNone); + } + + do + { + if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; + + ptr = _tcsrchr(FileData.cFileName, _T('\\')); + if (ptr) + { + ptr++; + } + else + { + ptr = FileData.cFileName; + } + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + if (lResult != CB_ERR) + { + _tcscpy(&szPath[length-1], FileData.cFileName); + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_tcsdup(szPath)); + } + }while(FindNextFile(hFile, &FileData) != 0); + + FindClose(hFile); + return TRUE; +} + + + +BOOL +ShowSoundScheme(HWND hwndDlg) +{ + LRESULT lIndex; + PSOUND_SCHEME_CONTEXT pScheme; + PAPP_CONTEXT pAppContext; + LV_ITEM listItem; + LV_COLUMN dummy; + HWND hDlgCtrl, hList; + RECT rect; + int ItemIndex; + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + hList = GetDlgItem(hwndDlg, IDC_SCHEME_LIST); + + lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + + lIndex = SendMessage(hDlgCtrl, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; + pAppContext = pScheme->AppContext; + if (!pAppContext) + { + return FALSE; + } + + /* add column for app */ + GetClientRect(hList, &rect); + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_WIDTH; + dummy.iSubItem = 0; + dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); + (void)ListView_InsertColumn(hList, 0, &dummy); + ItemIndex = 0; + while(pAppContext) + { + PLABEL_CONTEXT pLabelContext = pAppContext->LabelContext; + if (pLabelContext) + { +#if 0 + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + listItem.pszText = pAppContext->szDesc; + listItem.lParam = (LPARAM)pAppContext; + listItem.iItem = ItemIndex; + listItem.iImage = -1; + (void)ListView_InsertItem(hList, &listItem); + ItemIndex++; +#endif + while(pLabelContext) + { + PLABEL_MAP pMap = FindLabel(pLabelContext->szName); + if (pMap) + { + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + listItem.pszText = pMap->szDesc; + listItem.lParam = (LPARAM)pLabelContext; + listItem.iItem = ItemIndex; + listItem.iImage = -1; + (void)ListView_InsertItem(hList, &listItem); + ItemIndex++; + } + pLabelContext = pLabelContext->Next; + } + } + pAppContext = pAppContext->Next; + } + return TRUE; +} /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -579,13 +795,164 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: - InitSoundSettings(hwndDlg); + LoadEventLabels(); + LoadSoundProfiles(hwndDlg); + LoadSoundFiles(hwndDlg); + ShowSoundScheme(hwndDlg); + if (wParam == (WPARAM)GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)) + return TRUE; + SetFocus(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)); + return FALSE; + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_PLAY_SOUND: + { + LRESULT lIndex; + TCHAR szValue[MAX_PATH]; + + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + break; + } + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); + PlaySound(szValue, NULL, SND_FILENAME); + break; + } + case IDC_SOUND_SCHEME: + { + if (HIWORD(wParam) == CBN_SELENDOK) + { + (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); + ShowSoundScheme(hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), FALSE); + } + break; + } + case IDC_SOUND_LIST: + { + if (HIWORD(wParam) == CBN_SELENDOK) + { + PLABEL_CONTEXT pLabelContext; + INT SelCount; + LVITEM item; + LRESULT lIndex; + SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); + if (SelCount == -1) + { + break; + } + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + break; + } + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = SelCount; + if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + { + TCHAR szValue[MAX_PATH]; + pLabelContext = (PLABEL_CONTEXT)item.lParam; + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); + /// + /// should store in current member + /// + _tcscpy(pLabelContext->szValue, szValue); + if (_tcslen(szValue) && lIndex != 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + } + } + } + break; + } + } + break; + } + case WM_NOTIFY: + { + LVITEM item; + PLABEL_CONTEXT pLabelContext; + LPNMHDR lpnm = (LPNMHDR)lParam; + TCHAR * ptr; + switch(lpnm->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; + + if ((nm->uNewState & LVIS_SELECTED) == 0) + { + return FALSE; + } + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = nm->iItem; + if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + { + LRESULT lCount, lIndex, lResult; + pLabelContext = (PLABEL_CONTEXT)item.lParam; + if (!pLabelContext) + { + return FALSE; + } + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), TRUE); + if (_tcslen(pLabelContext->szValue) == 0) + { + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + break; + + } + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); + lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR || lResult == 0) + continue; + + if (!_tcscmp((TCHAR*)lResult, pLabelContext->szValue)) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + return FALSE; + } + } + ptr = _tcsrchr(pLabelContext->szValue, _T('\\')); + if (ptr) + { + ptr++; + } + else + { + ptr = pLabelContext->szValue; + } + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + if (lIndex != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lIndex, (LPARAM)_tcsdup(pLabelContext->szValue)); + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + } + } + break; + } + } + } break; }

1 0

[janderwald] 29023: - implement loading of sound items
by janderwald＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: janderwald Date: Thu Sep 13 00:22:41 2007 New Revision: 29023 URL: http://svn.reactos.org/svn/reactos?rev=29023&view=rev Log: - implement loading of sound items Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Thu Sep 13 00:22:41 2007 @@ -12,9 +12,34 @@ #include <setupapi.h> #include <cpl.h> #include <tchar.h> - +#include <stdio.h> #include "mmsys.h" #include "resource.h" + +typedef struct __LABEL_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + struct __LABEL_CONTEXT__ *Next; +}LABEL_CONTEXT, *PLABEL_CONTEXT; + +typedef struct __APP_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; + PLABEL_CONTEXT LabelContext; + struct __APP_CONTEXT__ * Next; +}APP_CONTEXT, *PAPP_CONTEXT; + + +typedef struct __SOUND_SCHEME_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + PAPP_CONTEXT AppContext; +}SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; + BOOL LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) @@ -117,7 +142,7 @@ } BOOL -AddSoundScheme(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) +AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; @@ -145,10 +170,15 @@ LRESULT lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - /// - /// FIXME store a context struct - /// - SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)szSubKey); + PSOUND_SCHEME_CONTEXT pScheme = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUND_SCHEME_CONTEXT)); + if (pScheme != NULL) + { + _tcscpy(pScheme->szDesc, szValue); + _tcscpy(pScheme->szName, szSubKey); + pScheme->AppContext = NULL; + } + + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); if (SetDefault) { SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); @@ -161,8 +191,8 @@ -BOOL -EnumerateSoundSchemes(HWND hwndDlg, HKEY hKey) +DWORD +EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) { HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; @@ -207,7 +237,7 @@ if (dwResult == ERROR_SUCCESS) { - if (AddSoundScheme(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) { dwNumSchemes++; } @@ -217,15 +247,286 @@ }while(dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); - return (dwNumSchemes != 0); -} - - -BOOL -LoadSoundSchemes(HWND hwndDlg, HKEY hKey) -{ - HKEY hSubKey; - BOOL Result; + return dwNumSchemes; +} + +PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) +{ + LRESULT lCount, lIndex, lResult; + PSOUND_SCHEME_CONTEXT pScheme; + + lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount == CB_ERR) + { + return NULL; + } + + for(lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR) + { + continue; + } + + pScheme = (PSOUND_SCHEME_CONTEXT)lResult; + if (!_tcsicmp(pScheme->szName, szName)) + { + return pScheme; + } + } + return FALSE; +} +PAPP_CONTEXT FindAppContext(PSOUND_SCHEME_CONTEXT pScheme, TCHAR * szAppName) +{ + PAPP_CONTEXT pAppContext = pScheme->AppContext; + while(pAppContext) + { + if (!_tcsicmp(pAppContext->szName, szAppName)) + return pScheme->AppContext; + pAppContext = pAppContext->Next; + } + return FALSE; +} + + + +BOOL +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +{ + HKEY hSubKey; + TCHAR szValue[MAX_PATH]; + DWORD dwValue; + PSOUND_SCHEME_CONTEXT pScheme; + PAPP_CONTEXT pAppContext; + PLABEL_CONTEXT pLabelContext; + BOOL Create = FALSE; + + //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); + + if (!_tcsicmp(szProfile, _T(".Current"))) + { + //ignore current settings for now + return TRUE; + } + + if (RegOpenKeyEx(hKey, + szProfile, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwValue = sizeof(szValue) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szValue, + &dwValue) != ERROR_SUCCESS) + { + return FALSE; + } + pScheme = FindSoundProfile(hwndDlg, szProfile); + if (!pScheme) + { + //MessageBox(hwndDlg, szProfile, _T("no profile!!"), MB_OK); + return FALSE; + } + + pAppContext = FindAppContext(pScheme, szAppName); + if (!pAppContext) + { + pAppContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_CONTEXT)); + Create = TRUE; + } + + if (!pAppContext) + { + + //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); + return FALSE; + } + + pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + _tcscpy(pLabelContext->szName, szLabelName); + _tcscpy(pLabelContext->szValue, szValue); + pLabelContext->Next = pAppContext->LabelContext; + pAppContext->LabelContext = pLabelContext; + + if (Create) + { + _tcscpy(pAppContext->szName, szAppName); + pAppContext->Next = pScheme->AppContext; + pScheme->AppContext = pAppContext; + } + return TRUE; +} + + +DWORD +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +{ + HKEY hSubKey; + DWORD dwNumProfiles; + DWORD dwCurKey; + DWORD dwResult; + DWORD dwProfile; + TCHAR szProfile[MAX_PATH]; + + if (RegOpenKeyEx(hKey, + szLabelName, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); + + dwNumProfiles = 0; + dwCurKey = 0; + do + { + dwProfile = sizeof(szProfile) / sizeof(TCHAR); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szProfile, + &dwProfile, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, szDefault)) + { + dwNumProfiles++; + } + } + + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return dwNumProfiles; +} + + + +DWORD +ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) +{ + HKEY hSubKey; + TCHAR szDefault[MAX_PATH]; + DWORD dwDefault; + DWORD dwCurKey; + DWORD dwResult; + DWORD dwNumEntry; + DWORD dwName; + TCHAR szName[MAX_PATH]; + + //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); + + if (RegOpenKeyEx(hKey, + szAppName, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwDefault = sizeof(szDefault) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szDefault, + &dwDefault) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + dwCurKey = 0; + dwNumEntry = 0; + do + { + dwName = sizeof(szName) / sizeof(TCHAR); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + if (dwResult == ERROR_SUCCESS) + { + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, szDefault)) + { + dwNumEntry++; + } + } + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); + return dwNumEntry; +} + +BOOL +ImportSoundProfiles(HWND hwndDlg, HKEY hKey) +{ + DWORD dwCurKey; + DWORD dwResult; + DWORD dwNumApps; + TCHAR szName[MAX_PATH]; + HKEY hSubKey; + + if (RegOpenKeyEx(hKey, + _T("Apps"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwNumApps = 0; + dwCurKey = 0; + do + { + dwResult = RegEnumKey(hSubKey, + dwCurKey, + szName, + sizeof(szName) / sizeof(TCHAR)); + + if (dwResult == ERROR_SUCCESS) + { + if (ImportAppProfile(hwndDlg, hSubKey, szName)) + { + dwNumApps++; + } + } + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); + + return (dwNumApps != 0); +} + + + +BOOL +LoadSoundProfiles(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwNumSchemes; if (RegOpenKeyEx(hKey, _T("Schemes"), @@ -236,12 +537,16 @@ return FALSE; } - - - Result = EnumerateSoundSchemes(hwndDlg, hSubKey); - RegCloseKey(hSubKey); - - return Result; + dwNumSchemes = EnumerateSoundProfiles(hwndDlg, hSubKey); + + + if (dwNumSchemes) + { + //MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK); + ImportSoundProfiles(hwndDlg, hSubKey); + } + RegCloseKey(hSubKey); + return FALSE; } @@ -257,9 +562,8 @@ { return FALSE; } - - LoadEventLabels(hwndDlg, hKey); - LoadSoundSchemes(hwndDlg, hKey); + LoadSoundProfiles(hwndDlg, hKey); + //LoadEventLabels(hwndDlg, hKey); RegCloseKey(hKey);

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