Compare commits

...

14 Commits

Author SHA1 Message Date
Joachim Henze
31794c27eb [0.4.7] remove "dev" from version string and add the golden release-kiss 2017-11-24 21:02:01 +01:00
Giannis Adamopoulos
2fda8374a2 [0.4.7] cherry-pick [COMCTL32] Button: Don't use a class brush. CORE-13445
(cherry picked from commit 34c563fa2a)
2017-11-17 17:11:08 +01:00
Giannis Adamopoulos
850c1d6b6d [0.4.7] cherry-pick [COMCTL32] Button: Draw the image list even when the button has the BS_ICON or the BS_BITMAP style. CORE-13170
(cherry picked from commit a98ff4d77c)
2017-11-14 20:08:13 +01:00
Giannis Adamopoulos
2534bc6542 [0.4.7] cherry-pick [COMCTL32] -Button: Implement drawing the image list with the BUTTON_IMAGELIST_ALIGN_CENTER parameter. This is enough to fix buttons with images created by Lazarus but only with themes. The non themed branch of the code is slightly more complex and will be fixed next. CORE-13170
(cherry picked from commit dea602cd70)
2017-11-14 20:08:05 +01:00
Giannis Adamopoulos
2e469036b3 [0.4.7] cherry-pick [SHELL32] SHBrowseForFolderW: Fix creating directories in the desktop and in drives like C: CORE-13925
(cherry picked from commit 78b78d6e73)
2017-11-14 20:08:00 +01:00
Giannis Adamopoulos
276f77a3a3 [0.4.7] cherry-pick [SHELL32] SHBrowseForFolder: Fix creating a new folder (which was broken two years ago and was properly reported 3 days ago). CORE-13925
(cherry picked from commit dd4af77703)
2017-11-14 20:07:53 +01:00
Joachim Henze
85d686904a [0.4.7] cherry-pick [EXPLORER] Remove version number from the start menu banner image, as requested.
Also, since we won't be editing the svg as often, move it to the media/graphics folder.
by David Quintana
SHA-1: e10108c088
2017-11-14 19:20:48 +01:00
Mark Jansen
23af2fa257 [0.4.7] cherry-pick [WIN32K] Check if the window being destroyed is currently tracked. by mjansen CORE-13619 (to fix several related BSODs)
SHA-1: 9e4d2f1f9e
2017-11-05 14:22:49 +01:00
Hermès Bélusca-Maïto
8b16304062 [0.4.7] Apply drawing issue fix for propsheets in comctl32, approved by Joachim Henze. See commit 11049bd (issue CORE-13929). 2017-11-03 00:16:15 +01:00
Mark Jansen
68655cc1e9 [0.4.7] Apply workaround for BSOD in win32k CORE-13629 2017-10-29 14:53:42 +01:00
Thomas Faber
cf3e1d4e19 [0.4.7] Revert r73436 to avoid trouble with VirtualBox Guest Additions. CORE-13172 CORE-12700 CORE-12765 2017-10-29 14:41:08 +01:00
Thomas Faber
c9bd78c5b7 [0.4.7] Apply the WordPad icon hack by Jared Smudde CORE-5823 2017-10-29 14:40:59 +01:00
Thomas Faber
04d7a3c0d0 [0.4.7] Mask WndProc exceptions CORE-11915 2017-10-29 14:40:44 +01:00
David Quintana
5a2e3e9bed [EXPLORER] Update start menu banner 2017-10-26 22:30:14 +02:00
46 changed files with 159 additions and 147 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -420,16 +420,21 @@ BOOL BUTTON_DrawIml(HDC hDC, BUTTON_IMAGELIST *pimlData, RECT *prc, BOOL bOnlyCa
}
else if (pimlData->uAlign == BUTTON_IMAGELIST_ALIGN_TOP)
{
left = prc->left + (prc->right - prc->left - ImageSize.cy) / 2;
left = prc->left + (prc->right - prc->left - ImageSize.cx) / 2;
top = prc->top + pimlData->margin.top;
prc->top = top + ImageSize.cy + pimlData->margin.bottom;
}
else if (pimlData->uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM)
{
left = prc->left + (prc->right - prc->left - ImageSize.cy) / 2;
left = prc->left + (prc->right - prc->left - ImageSize.cx) / 2;
top = prc->bottom - pimlData->margin.bottom - ImageSize.cy;
prc->bottom = top - pimlData->margin.top;
}
else if (pimlData->uAlign == BUTTON_IMAGELIST_ALIGN_CENTER)
{
left = prc->left + (prc->right - prc->left - ImageSize.cx) / 2;
top = prc->top + (prc->bottom - prc->top - ImageSize.cy) / 2;
}
if (!bOnlyCalc)
ImageList_Draw(pimlData->himl, 0, hDC, left, top, 0);
@@ -1185,17 +1190,16 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
PBUTTON_DATA pdata = _GetButtonData(hwnd);
#endif
#ifndef _USER32_
BOOL bHasIml = BUTTON_DrawIml(hdc, &pdata->imlData, &r, TRUE);
#endif
/* Calculate label rectangle according to label type */
switch (style & (BS_ICON|BS_BITMAP))
{
case BS_TEXT:
{
HFONT hFont, hPrevFont = 0;
#ifdef __REACTOS__
BOOL bHasIml;
bHasIml = BUTTON_DrawIml(hdc, &pdata->imlData, &r, TRUE);
#endif
if (!(text = get_button_text( hwnd ))) goto empty_rect;
if (!text[0])
@@ -1211,18 +1215,6 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
#ifdef __REACTOS__
if (get_ui_state(hwnd) & UISF_HIDEACCEL)
dtStyle |= DT_HIDEPREFIX;
if (bHasIml)
{
if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT)
r.left = pdata->imlData.margin.left;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT)
r.right = pdata->imlData.margin.right;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_TOP)
r.top = pdata->imlData.margin.top;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM)
r.bottom = pdata->imlData.margin.bottom;
}
#endif
break;
}
@@ -1258,11 +1250,29 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
default:
empty_rect:
#ifndef _USER32_
if (bHasIml)
break;
#endif
rc->right = r.left;
rc->bottom = r.top;
return (UINT)-1;
}
#ifndef _USER32_
if (bHasIml)
{
if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT)
r.left = pdata->imlData.margin.left;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT)
r.right = pdata->imlData.margin.right;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_TOP)
r.top = pdata->imlData.margin.top;
else if (pdata->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM)
r.bottom = pdata->imlData.margin.bottom;
}
#endif
/* Position label inside bounding rectangle according to
* alignment flags. (calculated rect is always left-top aligned).
* If label is aligned to any side - shift label in opposite
@@ -1304,28 +1314,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
*/
static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int cx, int cy)
{
#ifdef _USER32_
RECT rc;
SetRect(&rc, 0, 0, cx, cy);
DrawTextW(hdc, (LPCWSTR)lp, -1, &rc, (UINT)wp);
return TRUE;
#else
HWND hwnd = (HWND)lp;
RECT rc;
PBUTTON_DATA pdata = _GetButtonData(hwnd);
WCHAR *text = NULL;
if (!(text = get_button_text( hwnd ))) return TRUE;
SetRect(&rc, 0, 0, cx, cy);
BUTTON_DrawIml(hdc, &pdata->imlData, &rc, FALSE);
DrawTextW(hdc, text, -1, &rc, (UINT)wp);
HeapFree(GetProcessHeap(), 0, text);
return TRUE;
#endif
}
@@ -1334,7 +1327,11 @@ static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int
*
* Common function for drawing button label.
*/
#if defined(_USER32_)
static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc)
#else
static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, RECT *rc)
#endif
{
DRAWSTATEPROC lpOutputProc = NULL;
LPARAM lp;
@@ -1350,6 +1347,11 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc)
* I don't have Win31 on hand to verify that, so I leave it as is.
*/
#ifndef _USER32_
PBUTTON_DATA pdata = _GetButtonData(hwnd);
BUTTON_DrawIml(hdc, &pdata->imlData, rc, FALSE);
#endif
if ((style & BS_PUSHLIKE) && (state & BST_INDETERMINATE))
{
hbr = GetSysColorBrush(COLOR_GRAYTEXT);
@@ -1361,13 +1363,8 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc)
case BS_TEXT:
/* DST_COMPLEX -- is 0 */
lpOutputProc = BUTTON_DrawTextCallback;
#ifdef _USER32_
if (!(text = get_button_text( hwnd ))) return;
lp = (LPARAM)text;
#else
lp = (LPARAM)hwnd;
#endif
wp = (WPARAM)dtFlags;
#ifdef __REACTOS__
@@ -1843,7 +1840,7 @@ void BUTTON_Register()
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(PBUTTON_DATA);
wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
wndClass.hbrBackground = 0;
wndClass.lpszClassName = WC_BUTTONW;
RegisterClassW(&wndClass);

View File

@@ -1176,13 +1176,8 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
return TRUE;
case WM_CTLCOLORSTATIC:
#ifdef __REACTOS__
SetBkMode((HDC)wParam, TRANSPARENT);
return (INT_PTR)GetStockObject(HOLLOW_BRUSH);
#else
SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));
return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);
#endif
}
return DefSubclassProc(hwnd, uMsg, wParam, lParam);

View File

@@ -453,9 +453,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags )
sice.dwSourceIndex = dwSourceIndex;
sice.dwFlags = dwFlags;
if (!sic_hdpa)
SIC_Initialize();
EnterCriticalSection(&SHELL32_SicCS);
if (NULL != DPA_GetPtr (sic_hdpa, 0))
@@ -690,9 +687,6 @@ static int SIC_LoadOverlayIcon(int icon_idx)
RegCloseKey(hKeyShellIcons);
}
if (!sic_hdpa)
SIC_Initialize();
return SIC_LoadIcon(iconPath, iconIdx, 0);
}
@@ -704,17 +698,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
*
*/
BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
{
TRACE("(%p,%p)\n",lpBigList,lpSmallList);
if (!sic_hdpa)
SIC_Initialize();
{ TRACE("(%p,%p)\n",lpBigList,lpSmallList);
if (lpBigList)
*lpBigList = ShellBigIconList;
{ *lpBigList = ShellBigIconList;
}
if (lpSmallList)
*lpSmallList = ShellSmallIconList;
{ *lpSmallList = ShellSmallIconList;
}
return TRUE;
}
@@ -745,9 +735,6 @@ BOOL PidlToSicIndex (
TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small");
if (!sic_hdpa)
SIC_Initialize();
if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei))))
{
if (SUCCEEDED(ei->GetIconLocation(uFlags &~ GIL_FORSHORTCUT, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags)))

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Папка:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Създаване на нова папка", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 10, 174, 92, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "Добре", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -101,7 +101,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Složka:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Vytvořit novou složku", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -101,7 +101,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Ordner:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Neuen Ordner erstellen", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Φάκελος:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Δημιουργία φακέλου", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -96,7 +96,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -97,7 +97,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Carpeta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Crear nueva carpeta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "Aceptar", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Dossier :", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Créer un nouveau dossier", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "תיקיה:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "צור תיקיה חדשה", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "אישור", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Cartella:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Crea una nuova cartella", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "フォルダ:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "新しいフォルダの作成(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 188, 85, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Mappe:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Lag en ny mappe", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -99,7 +99,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Katalog:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Utwórz katalog", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Criar Nova Pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -95,7 +95,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Criar Nova Pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -97,7 +97,7 @@ BEGIN
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
LTEXT "Dosar:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Crează dosar nou", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "Con&firmă", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

View File

@@ -86,7 +86,7 @@ BEGIN
PUSHBUTTON "Отмена", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -84,7 +84,7 @@ BEGIN
PUSHBUTTON "Zrušiť", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -84,7 +84,7 @@ BEGIN
PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -88,7 +88,7 @@ BEGIN
PUSHBUTTON "Anulo", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -84,7 +84,7 @@ BEGIN
PUSHBUTTON "Avbryt", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -86,7 +86,7 @@ BEGIN
PUSHBUTTON "İptal", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -84,7 +84,7 @@ BEGIN
PUSHBUTTON "Скасувати", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -93,7 +93,7 @@ BEGIN
PUSHBUTTON "取消", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -92,7 +92,7 @@ BEGIN
PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12
LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
END
IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196

View File

@@ -340,6 +340,7 @@ STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad)
InitCommonControlsEx(&InitCtrls);
/* Bad idea, initialization in DllMain! */
SIC_Initialize();
InitChangeNotifications();
}
else if (dwReason == DLL_PROCESS_DETACH)

View File

@@ -736,7 +736,7 @@ static HRESULT BrsFolder_NewFolder(browse_info *info)
IShellFolder *desktop, *cur;
#ifdef __REACTOS__
WCHAR wszNewFolder[25];
WCHAR path[25];
WCHAR path[MAX_PATH];
#else
ISFHelper *sfhelper;
#endif
@@ -748,6 +748,38 @@ static HRESULT BrsFolder_NewFolder(browse_info *info)
HRESULT hr;
int len;
#ifdef __REACTOS__
hr = SHGetDesktopFolder(&desktop);
if(FAILED(hr))
return hr;
if (info->pidlRet)
{
hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur);
IShellFolder_Release(desktop);
if(FAILED(hr))
return hr;
hr = SHGetPathFromIDListW(info->pidlRet, path);
}
else
{
cur = desktop;
hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, path);
}
if(FAILED(hr))
return hr;
if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder)))
return E_FAIL;
if (!PathYetAnotherMakeUniqueName(name, path, NULL, wszNewFolder))
return E_FAIL;
len = strlenW(path);
if(len<MAX_PATH && name[len] == L'\\')
len++;
#else
if(!info->pidlRet) {
ERR("Make new folder button should be disabled\n");
return E_FAIL;
@@ -757,27 +789,12 @@ static HRESULT BrsFolder_NewFolder(browse_info *info)
hr = SHGetDesktopFolder(&desktop);
if(FAILED(hr))
return hr;
hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur);
IShellFolder_Release(desktop);
if(FAILED(hr))
return hr;
#ifdef __REACTOS__
hr = SHGetPathFromIDListW(info->pidlRet, path);
if(FAILED(hr))
return hr;
len = strlenW(name);
if(len<MAX_PATH)
len++;
if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder)))
return E_FAIL;
if (!PathYetAnotherMakeUniqueName(name, path, NULL, wszNewFolder))
return E_FAIL;
#else
hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper);
if(FAILED(hr))
return hr;

View File

@@ -1296,8 +1296,8 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
*
*/
BOOL WINAPI FileIconInit(BOOL bFullInit)
{
return SIC_Initialize();
{ FIXME("(%s)\n", bFullInit ? "true" : "false");
return FALSE;
}
/*************************************************************************

View File

@@ -16,7 +16,7 @@
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="Logo.svg"
sodipodi:docname="start_menu_banner.svg"
inkscape:export-filename="F:\reactos\Logo.png"
inkscape:export-xdpi="72"
inkscape:export-ydpi="72">
@@ -117,7 +117,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="2.4967109"
inkscape:cx="-34.214085"
inkscape:cx="-163.98482"
inkscape:cy="142.13217"
inkscape:document-units="px"
inkscape:current-layer="svg2"
@@ -125,8 +125,8 @@
units="pt"
inkscape:window-width="1397"
inkscape:window-height="974"
inkscape:window-x="437"
inkscape:window-y="214"
inkscape:window-x="346"
inkscape:window-y="335"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
@@ -136,7 +136,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -171,7 +171,7 @@
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00007629px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
id="tspan4213">ReactOS</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.50006676px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
id="tspan4209"> 0.5 - SVN</tspan></tspan></text>
id="tspan4209" /></tspan></text>
<g
style="fill:#ffffff;fill-opacity:1"
id="layer1-2"

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -7,7 +7,7 @@ set(COPYRIGHT_YEAR "2017")
# KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds
# or "RC1", "RC2", "" for releases.
set(KERNEL_VERSION_BUILD_TYPE "dev")
set(KERNEL_VERSION_BUILD_TYPE "")
set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}")
if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "")

View File

@@ -4392,7 +4392,10 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y,
{
PWND pwndM = ValidateHwndNoErr( menu->hWnd );
if (pwndM) // wine hack around this with their destroy function.
co_UserDestroyWindow( pwndM ); // Fix wrong error return.
{
if (!(pWnd->state & WNDS_DESTROYED))
co_UserDestroyWindow( pwndM ); // Fix wrong error return.
}
menu->hWnd = 0;
if (!(wFlags & TPM_NONOTIFY))

View File

@@ -342,6 +342,26 @@ UserSendMouseInput(MOUSEINPUT *pmi, BOOL bInjected)
return TRUE;
}
VOID
FASTCALL
IntRemoveTrackMouseEvent(
PDESKTOP pDesk)
{
/* Generate a leave message */
if (pDesk->dwDTFlags & DF_TME_LEAVE)
{
UINT uMsg = (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE;
UserPostMessage(UserHMGetHandle(pDesk->spwndTrack), uMsg, 0, 0);
}
/* Kill the timer */
if (pDesk->dwDTFlags & DF_TME_HOVER)
IntKillTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE);
/* Reset state */
pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER);
pDesk->spwndTrack = NULL;
}
BOOL
FASTCALL
IntQueryTrackMouseEvent(

View File

@@ -381,6 +381,12 @@ DWORD FASTCALL IntGetWindowContextHelpId( PWND pWnd )
return HelpId;
}
VOID
FASTCALL
IntRemoveTrackMouseEvent(
PDESKTOP pDesk);
/***********************************************************************
* IntSendDestroyMsg
*/
@@ -422,6 +428,12 @@ static void IntSendDestroyMsg(HWND hWnd)
{
co_IntDestroyCaret(ti);
}
/* If the window being destroyed is currently tracked... */
if (ti->rpdesk->spwndTrack == Window)
{
IntRemoveTrackMouseEvent(ti->rpdesk);
}
}
/* If the window being destroyed is the current clipboard owner... */

View File

@@ -1463,20 +1463,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,
if (PreResult) goto Exit;
if (!Dialog)
Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
else
{
_SEH2_TRY
{
Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
}
_SEH2_END;
}
if (Hook && (MsgOverride || DlgOverride))
{
@@ -1517,20 +1512,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,
if (PreResult) goto Exit;
if (!Dialog)
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
else
{
_SEH2_TRY
{
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
}
_SEH2_END;
}
if (Hook && (MsgOverride || DlgOverride))
{
@@ -1609,20 +1599,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,
if (PreResult) goto Exit;
if (!Dialog)
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
else
{
_SEH2_TRY
{
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
}
_SEH2_END;
}
if (Hook && (MsgOverride || DlgOverride))
{
@@ -1670,20 +1655,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,
if (PreResult) goto Exit;
if (!Dialog)
Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam);
else
{
_SEH2_TRY
{
Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
}
_SEH2_END;
}
if (Hook && (MsgOverride || DlgOverride))
{