Wine-20050930 vendor drop Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32.h Modified: vendor/wine/dlls/comctl32/current/comctl32.spec Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Added: vendor/wine/dlls/comctl32/current/comctl_Bg.rc Added: vendor/wine/dlls/comctl32/current/comctl_No.rc Modified: vendor/wine/dlls/comctl32/current/commctrl.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/propsheet.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/rsrc.rc Modified: vendor/wine/dlls/comctl32/current/theming.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/treeview.c Modified: vendor/wine/dlls/commdlg/current/cdlg32.c Added: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fi.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_No.rc Modified: vendor/wine/dlls/commdlg/current/colordlg.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/commdlg/current/printdlg16.c Modified: vendor/wine/dlls/commdlg/current/rsrc.rc Added: vendor/wine/dlls/dinput/ Modified: vendor/wine/dlls/dinput/current/Makefile.in Modified: vendor/wine/dlls/dinput/current/data_formats.c Modified: vendor/wine/dlls/dinput/current/device.c Modified: vendor/wine/dlls/dinput/current/device_private.h Modified: vendor/wine/dlls/dinput/current/dinput.spec Modified: vendor/wine/dlls/dinput/current/dinput_main.c Modified: vendor/wine/dlls/dinput/current/dinput_private.h Added: vendor/wine/dlls/dinput/current/effect_linuxinput.c Modified: vendor/wine/dlls/dinput/current/joystick_linux.c Modified: vendor/wine/dlls/dinput/current/joystick_linuxinput.c Modified: vendor/wine/dlls/dinput/current/keyboard.c Modified: vendor/wine/dlls/dinput/current/mouse.c Modified: vendor/wine/dlls/dinput/current/regsvr.c Modified: vendor/wine/dlls/dinput/current/version.rc Modified: vendor/wine/dlls/dsound/current/buffer.c Modified: vendor/wine/dlls/dsound/current/capture.c Modified: vendor/wine/dlls/dsound/current/dsound.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/duplex.c Modified: vendor/wine/dlls/dsound/current/primary.c Modified: vendor/wine/dlls/dsound/current/propset.c Modified: vendor/wine/dlls/mpr/current/mpr.rc Added: vendor/wine/dlls/mpr/current/mpr_Bg.rc Added: vendor/wine/dlls/mpr/current/mpr_No.rc Modified: vendor/wine/dlls/mpr/current/mpr_main.c Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/appsearch.c Modified: vendor/wine/dlls/msi/current/classes.c Modified: vendor/wine/dlls/msi/current/cond.y Modified: vendor/wine/dlls/msi/current/create.c Modified: vendor/wine/dlls/msi/current/custom.c Modified: vendor/wine/dlls/msi/current/database.c Modified: vendor/wine/dlls/msi/current/delete.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/distinct.c Modified: vendor/wine/dlls/msi/current/events.c Modified: vendor/wine/dlls/msi/current/files.c Modified: vendor/wine/dlls/msi/current/format.c Modified: vendor/wine/dlls/msi/current/handle.c Modified: vendor/wine/dlls/msi/current/helpers.c Modified: vendor/wine/dlls/msi/current/insert.c Modified: vendor/wine/dlls/msi/current/install.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.rc Modified: vendor/wine/dlls/msi/current/msi.spec Added: vendor/wine/dlls/msi/current/msi_Bg.rc Added: vendor/wine/dlls/msi/current/msi_Fi.rc Added: vendor/wine/dlls/msi/current/msi_No.rc Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/order.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/preview.c Modified: vendor/wine/dlls/msi/current/record.c Modified: vendor/wine/dlls/msi/current/registry.c Modified: vendor/wine/dlls/msi/current/select.c Modified: vendor/wine/dlls/msi/current/source.c Modified: vendor/wine/dlls/msi/current/sql.y Modified: vendor/wine/dlls/msi/current/string.c Modified: vendor/wine/dlls/msi/current/suminfo.c Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msi/current/update.c Modified: vendor/wine/dlls/msi/current/upgrade.c Modified: vendor/wine/dlls/msi/current/where.c Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/dcom.idl Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c [truncated at 100 lines; 124 more skipped] _____
Modified: vendor/wine/dlls/comctl32/current/animate.c --- vendor/wine/dlls/comctl32/current/animate.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/animate.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -252,15 +252,12 @@
static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) { - void* pBitmapData = NULL; - LPBITMAPINFO pBitmapInfo = NULL; - + void *pBitmapData; + LPBITMAPINFO pBitmapInfo; HDC hdcMem; HBITMAP hbmOld; - int nOffsetX = 0; int nOffsetY = 0; - int nWidth; int nHeight;
@@ -289,11 +286,11 @@ infoPtr->hbmPrevFrame=CreateCompatibleBitmap(hDC, nWidth,nHeight ); }
- SetDIBits(hDC, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, (LPBITMAPINFO)pBitmapInfo, DIB_RGB_COLORS); - hdcMem = CreateCompatibleDC(hDC); hbmOld = SelectObject(hdcMem, infoPtr->hbmPrevFrame);
+ SetDIBits(hdcMem, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, pBitmapInfo, DIB_RGB_COLORS); + /* * we need to get the transparent color even without ACS_TRANSPARENT, * because the style can be changed later on and the color should always _____
Modified: vendor/wine/dlls/comctl32/current/comboex.c --- vendor/wine/dlls/comctl32/current/comboex.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comboex.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -473,7 +473,7 @@
CBE_ITEMDATA *item; INT i;
- if ((index > infoPtr->nb_items) || (index < -1)) + if ((index >= infoPtr->nb_items) || (index < -1)) return 0; if (index == -1) return infoPtr->edit; @@ -509,7 +509,7 @@ TRACE("(index=%d)\n", index);
/* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < 0)) return CB_ERR; + if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR;
/* doing this will result in WM_DELETEITEM being issued */ @@ -527,7 +527,7 @@ TRACE("(...)\n");
/* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < -1)) return FALSE; + if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE;
/* if the item is the edit control and there is no edit control, skip */ if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; @@ -587,7 +587,7 @@ /* get real index of item to insert */ index = cit->iItem; if (index == -1) index = infoPtr->nb_items; - if (index > infoPtr->nb_items) index = infoPtr->nb_items; + if (index > infoPtr->nb_items) return -1;
/* get zero-filled space and chain it in */ if(!(item = (CBE_ITEMDATA *)Alloc (sizeof(*item)))) return -1; @@ -740,7 +740,7 @@ if (TRACE_ON(comboex)) COMBOEX_DumpInput (cit);
/* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < -1)) return FALSE; + if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE;
/* if the item is the edit control and there is no edit control, skip */ if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; _____
Modified: vendor/wine/dlls/comctl32/current/comctl32.h --- vendor/wine/dlls/comctl32/current/comctl32.h 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comctl32.h 2005-10-08 09:19:17 UTC (rev 18320) @@ -250,6 +250,7 @@
}
extern void THEMING_Initialize(void); +extern void THEMING_Uninitialize(void); extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM); extern void THEMING_SetSubclassData(HWND, ULONG_PTR);
_____
Modified: vendor/wine/dlls/comctl32/current/comctl32.spec --- vendor/wine/dlls/comctl32/current/comctl32.spec 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comctl32.spec 2005-10-08 09:19:17 UTC (rev 18320) @@ -15,7 +15,7 @@
11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long long long long) + 14 stdcall LBItemFromPt(long double long) 15 stdcall DrawInsert(long long long) 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) 17 stdcall InitCommonControls() _____
Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -579,7 +579,7 @@
if (!stringW) return -1;
- MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); + MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len/sizeof(WCHAR)); ret = AddMRUData(hList, stringW, len); Free(stringW); return ret; @@ -682,13 +682,15 @@
/* get values from key 'MRUList' */ if (newkey) { - datasize = mp->extview.nMaxItems + 1; + datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, (LPBYTE)mp->realMRU, &datasize))) { /* not present - set size to 1 (will become 0 later) */ datasize = 1; *mp->realMRU = 0; } + else + datasize /= sizeof(WCHAR);
TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize);
_____
Added: vendor/wine/dlls/comctl32/current/comctl_Bg.rc --- vendor/wine/dlls/comctl32/current/comctl_Bg.rc 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comctl_Bg.rc 2005-10-08 09:19:17 UTC (rev 18320) @@ -0,0 +1,89 @@
+/* + * comctl (Bulgarian resource) + * + * Copyright 2005 Milko Krachounov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "ÐÔ¯Ú±?ÔÓ ÝÓ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + 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 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + 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 "¤¯ý¯¨", 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 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 407, 125 /* 357 -> 407 ? */ +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¤Õ±¯ÝÓÙÞþÞÓÝÕ ÝÓ ÙÕÝ?Ó?Ó ± Þݱ?¾ýÕÝ?Þ" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&ÃÓ?Ô¯Þ", IDCANCEL,318,6,84,14 /* 44 -> 84; 308 -> 318 ? */ + PUSHBUTTON "&?·þ±?ÓݯÔÞ", IDC_RESET_BTN,318,23,84,14 /* 44 -> 84 ? */ + PUSHBUTTON "&¤¯ý¯¨", IDC_HELP_BTN,318,40,84,14 /* 44 -> 84 ? */ + PUSHBUTTON "¤ÕýÕ±?Þ ÝÓ&Ò¯Õ", IDC_MOVEUP_BTN,318,74,84,14 /* 44 -> 84 ? */ + PUSHBUTTON "¤ÕýÕ±?Þ ÝÓ&õ¯Ù¾", IDC_MOVEDN_BTN,318,91,84,14 /* 44 -> 84 ? */ + LTEXT "&?ÓÙÞ¸ÝÞ ß¾?¯ÝÞ:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "?¯&ßÓÔÞ ->", IDOK, 131, 42, 54, 14 /* 44 -> 54 ? */ + PUSHBUTTON "<- ¤Õ&ýÓ§ÝÞ", IDC_REMOVE_BTN,131,62,54,14 /* 44 -> 54 ? */ + LTEXT "&?¾?¯ÝÞ ÝÓ ÙÕÝ?Ó?Ó ± Þݱ?¾ýÕÝ?Þ:", -1,192,5,78,10 /* 182 -> 192 ? */ + LISTBOX IDC_TOOLBARBTN_LBOX, 192,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP /* 182 -> 192 ? */ +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "ÃÓ?Ô¯Þ" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "?ÝÕ±:" + IDM_GOTODAY "?õÞ ÝÓ õÝÕ±" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "ðÓþõÕÙÞ?ÕÙ" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "?Þ¨¯" +} Property changes on: vendor/wine/dlls/comctl32/current/comctl_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____
Added: vendor/wine/dlls/comctl32/current/comctl_No.rc --- vendor/wine/dlls/comctl32/current/comctl_No.rc 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/comctl_No.rc 2005-10-08 09:19:17 UTC (rev 18320) @@ -0,0 +1,87 @@
+/* + * Copyright 2005 Alexander N. S°rnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +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 +CAPTION "Egenskaper for " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Avbryt", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Bruk", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Hjelp", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Fane", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Veiviser" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< Til&bake", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Neste >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Fullf°r", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Avbryt", IDCANCEL,178,138,50,14 + PUSHBUTTON "Hjelp", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Fane", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Tilpass verkt°ylinje" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Lukk", IDCANCEL,308,6,44,14 + PUSHBUTTON "Tilbak&estill", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Hjelp", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Flytt &opp", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Flytt ne&d", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Tilgjengelige &knapper:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Le&gg til ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Fje&rn", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Verk&t°ylinje-knapper:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Lukk" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Idag:" + IDM_GOTODAY "GÕ til idag" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Adskiller" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ingen" +} Property changes on: vendor/wine/dlls/comctl32/current/comctl_No.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____
Modified: vendor/wine/dlls/comctl32/current/commctrl.c --- vendor/wine/dlls/comctl32/current/commctrl.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/commctrl.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -150,6 +150,9 @@
break;
case DLL_PROCESS_DETACH: + /* clean up subclassing */ + THEMING_Uninitialize(); + /* unregister all common control classes */ ANIMATE_Unregister (); COMBOEX_Unregister (); _____
Modified: vendor/wine/dlls/comctl32/current/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/header.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -930,6 +930,10 @@
nItem = infoPtr->uNumItem;
iOrder = (phdi->mask & HDI_ORDER) ? phdi->iOrder : nItem; + if (iOrder < 0) + iOrder = 0; + else if (infoPtr->uNumItem < iOrder) + iOrder = infoPtr->uNumItem;
if (infoPtr->uNumItem == 0) { infoPtr->items = Alloc (sizeof (HEADER_ITEM)); _____
Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -389,7 +389,7 @@
#define LISTVIEW_DUMP(iP) do { \ TRACE("hwndSelf=%p, clrBk=0x%06lx, clrText=0x%06lx, clrTextBk=0x%06lx, ItemHeight=%d, ItemWidth=%d, Style=0x%08lx\n", \ iP->hwndSelf, iP->clrBk, iP->clrText, iP->clrTextBk, \ - iP->nItemHeight, iP->nItemWidth, infoPtr->dwStyle); \ + iP->nItemHeight, iP->nItemWidth, iP->dwStyle); \ TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08lx, Focus=%d\n", \ iP->hwndSelf, iP->himlNormal, iP->himlSmall, iP->himlState, \ iP->nFocusedItem, iP->nHotItem, iP->dwLvExStyle, iP->bFocus ); \ _____
Modified: vendor/wine/dlls/comctl32/current/propsheet.c --- vendor/wine/dlls/comctl32/current/propsheet.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/propsheet.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -2161,7 +2161,7 @@
{ WCHAR szTitle[256]; MultiByteToWideChar(CP_ACP, 0, lpszText, -1, - szTitle, sizeof(szTitle)); + szTitle, sizeof(szTitle)/sizeof(WCHAR)); PROPSHEET_SetTitleW(hwndDlg, dwStyle, szTitle); } else _____
Modified: vendor/wine/dlls/comctl32/current/rebar.c --- vendor/wine/dlls/comctl32/current/rebar.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/rebar.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -366,7 +366,7 @@
{ if( !TRACE_ON(rebar) ) return; TRACE("band info: "); - if (pB->fMask & RBBIM_ID); + if (pB->fMask & RBBIM_ID) TRACE("ID=%u, ", pB->wID); TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild); if (pB->fMask & RBBIM_COLORS) @@ -415,7 +415,7 @@ for (i = 0; i < iP->uNumBands; i++) { pB = &iP->bands[i]; TRACE("band # %u:", i); - if (pB->fMask & RBBIM_ID); + if (pB->fMask & RBBIM_ID) TRACE(" ID=%u", pB->wID); if (pB->fMask & RBBIM_CHILD) TRACE(" child=%p", pB->hwndChild); _____
Modified: vendor/wine/dlls/comctl32/current/rsrc.rc --- vendor/wine/dlls/comctl32/current/rsrc.rc 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/rsrc.rc 2005-10-08 09:19:17 UTC (rev 18320) @@ -1192,6 +1192,7 @@
* get localized bitmaps for example. */
+#include "comctl_Bg.rc" #include "comctl_Cn.rc" #include "comctl_Cs.rc" #include "comctl_De.rc" @@ -1202,6 +1203,7 @@ #include "comctl_Ja.rc" #include "comctl_Ko.rc" #include "comctl_Nl.rc" +#include "comctl_No.rc" #include "comctl_Pl.rc" #include "comctl_Pt.rc" #include "comctl_Ru.rc" _____
Modified: vendor/wine/dlls/comctl32/current/theming.c --- vendor/wine/dlls/comctl32/current/theming.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/theming.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -147,6 +147,20 @@
}
/*********************************************************************** + * THEMING_Uninitialize + * + * Unregister shadow classes for standard controls. + */ +void THEMING_Uninitialize (void) +{ + int i; + for (i = 0; i < NUM_SUBCLASSES; i++) + { + UnregisterClassW (subclasses[i].className, NULL); + } +} + +/********************************************************************** * * THEMING_CallOriginalClass * * Determines the original window proc and calls it. _____
Modified: vendor/wine/dlls/comctl32/current/toolbar.c --- vendor/wine/dlls/comctl32/current/toolbar.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/toolbar.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -41,7 +41,6 @@
* - WM_WININICHANGE * - Notifications: * - NM_CHAR - * - NM_KEYDOWN * - TBN_GETOBJECT * - TBN_SAVE * - Button wrapping (under construction). @@ -1278,12 +1277,21 @@ btnPtr = infoPtr->buttons; x = infoPtr->nIndent;
- /* this can get the parents width, to know how far we can extend - * this toolbar. We cannot use its height, as there may be multiple - * toolbars in a rebar control - */ - GetClientRect( GetParent(hwnd), &rc ); - infoPtr->nWidth = rc.right - rc.left; + if (GetParent(hwnd)) + { + /* this can get the parents width, to know how far we can extend + * this toolbar. We cannot use its height, as there may be multiple + * toolbars in a rebar control + */ + GetClientRect( GetParent(hwnd), &rc ); + infoPtr->nWidth = rc.right - rc.left; + } + else + { + GetWindowRect( hwnd, &rc ); + infoPtr->nWidth = rc.right - rc.left; + } + bButtonWrap = FALSE;
TRACE("start ButtonWidth=%d, BitmapWidth=%d, nWidth=%d, nIndent=%d\n", @@ -2193,6 +2201,7 @@ WCHAR Buffer[256]; int i = 0; int index; + NMTBINITCUSTOMIZE nmtbic;
infoPtr = custInfo->tbInfo;
@@ -2202,10 +2211,9 @@ if (!TOOLBAR_SendNotify(&nmtb.hdr, infoPtr, TBN_QUERYINSERT)) return FALSE;
- /* UNDOCUMENTED: dialog hwnd immediately follows NMHDR */ - memcpy(&nmtb.iItem, &hwnd, sizeof(hwnd)); + nmtbic.hwndDialog = hwnd; /* Send TBN_INITCUSTOMIZE notification */ - if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_INITCUSTOMIZE) == + if (TOOLBAR_SendNotify (&nmtbic.hdr, infoPtr, TBN_INITCUSTOMIZE) == TBNRF_HIDEHELP) { TRACE("TBNRF_HIDEHELP requested\n"); @@ -5783,7 +5791,78 @@ }
+static void +TOOLBAR_SetRelativeHotItem(TOOLBAR_INFO *infoPtr, INT iDirection, DWORD dwReason) +{ + INT i; + INT nNewHotItem = infoPtr->nHotItem; + + for (i = 0; i < infoPtr->nNumButtons; i++) + { + /* did we wrap? */ + if ((nNewHotItem + iDirection < 0) || + (nNewHotItem + iDirection >= infoPtr->nNumButtons)) + { + NMTBWRAPHOTITEM nmtbwhi; + nmtbwhi.idNew = infoPtr->buttons[nNewHotItem].idCommand; + nmtbwhi.iDirection = iDirection; + nmtbwhi.dwReason = dwReason; + + if (TOOLBAR_SendNotify(&nmtbwhi.hdr, infoPtr, TBN_WRAPHOTITEM)) + return; + } + + nNewHotItem += iDirection; + nNewHotItem = (nNewHotItem + infoPtr->nNumButtons) % infoPtr->nNumButtons; + + if ((infoPtr->buttons[nNewHotItem].fsState & TBSTATE_ENABLED) && + !(infoPtr->buttons[nNewHotItem].fsStyle & BTNS_SEP)) + { + TOOLBAR_SetHotItemEx(infoPtr, nNewHotItem, dwReason); + break; + } + } +} + static LRESULT +TOOLBAR_KeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); + NMKEY nmkey; + + nmkey.nVKey = (UINT)wParam; + nmkey.uFlags = HIWORD(lParam); + + if (TOOLBAR_SendNotify(&nmkey.hdr, infoPtr, NM_KEYDOWN)) + return DefWindowProcW(hwnd, WM_KEYDOWN, wParam, lParam); + + switch ((UINT)wParam) + { + case VK_LEFT: + case VK_UP: + TOOLBAR_SetRelativeHotItem(infoPtr, -1, HICF_ARROWKEYS); + break; + case VK_RIGHT: + case VK_DOWN: + TOOLBAR_SetRelativeHotItem(infoPtr, 1, HICF_ARROWKEYS); + break; + case VK_SPACE: + case VK_RETURN: + if ((infoPtr->nHotItem >= 0) && + (infoPtr->buttons[infoPtr->nHotItem].fsState & TBSTATE_ENABLED)) + { + SendMessageW (infoPtr->hwndNotify, WM_COMMAND, + MAKEWPARAM(infoPtr->buttons[infoPtr->nHotItem].idCommand, BN_CLICKED), + (LPARAM)hwnd); + } + break; + } + + return 0; +} + + +static LRESULT TOOLBAR_LButtonDblClk (HWND hwnd, WPARAM wParam, LPARAM lParam) { POINT pt; @@ -6080,7 +6159,7 @@ if (btnPtr->fsState & TBSTATE_ENABLED) { SendMessageW (infoPtr->hwndNotify, WM_COMMAND, - MAKEWPARAM(infoPtr->buttons[nHit].idCommand, 0), (LPARAM)hwnd); + MAKEWPARAM(infoPtr->buttons[nHit].idCommand, BN_CLICKED), (LPARAM)hwnd); } }
@@ -6320,6 +6399,7 @@ /* paranoid!! */ infoPtr->dwStructSize = sizeof(TBBUTTON); infoPtr->nRows = 1; + infoPtr->nWidth = 0;
/* fix instance handle, if the toolbar was created by CreateToolbarEx() */ if (!GetWindowLongPtrW (hwnd, GWLP_HINSTANCE)) { @@ -6483,23 +6563,24 @@
TRACE("TBN_GETINFOTIPA - got string %s\n", debugstr_a(tbgit.pszText));
- len = -1 + MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, NULL, 0); - if (len > sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])-1) + len = MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, NULL, 0); + if (len > sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])) { /* need to allocate temporary buffer in infoPtr as there * isn't enough space in buffer passed to us by the * tooltip control */ - infoPtr->pszTooltipText = Alloc((len+1)*sizeof(WCHAR)); + infoPtr->pszTooltipText = Alloc(len*sizeof(WCHAR)); if (infoPtr->pszTooltipText) { - MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, len+1, infoPtr->pszTooltipText, (len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, infoPtr->pszTooltipText, len); lpnmtdi->lpszText = infoPtr->pszTooltipText; return 0; } } else if (len > 0) { - MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, len+1, lpnmtdi->lpszText, (len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, + lpnmtdi->lpszText, sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])); return 0; } } @@ -6639,6 +6720,21 @@
static LRESULT +TOOLBAR_SetFocus (HWND hwnd, WPARAM wParam) +{ + TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); + + TRACE("nHotItem = %d\n", infoPtr->nHotItem); + + /* make first item hot */ + if (infoPtr->nNumButtons > 0) + TOOLBAR_SetHotItemEx(infoPtr, 0, HICF_OTHER); + + return 0; +} + + +static LRESULT TOOLBAR_SetRedraw (HWND hwnd, WPARAM wParam, LPARAM lParam) /***************************************************** * @@ -7091,7 +7187,9 @@ case WM_GETFONT: return TOOLBAR_GetFont (hwnd, wParam, lParam);
-/* case WM_KEYDOWN: */ + case WM_KEYDOWN: + return TOOLBAR_KeyDown (hwnd, wParam, lParam); + /* case WM_KILLFOCUS: */
case WM_LBUTTONDBLCLK: @@ -7139,6 +7237,9 @@ case WM_PAINT: return TOOLBAR_Paint (hwnd, wParam);
+ case WM_SETFOCUS: + return TOOLBAR_SetFocus (hwnd, wParam); + case WM_SETREDRAW: return TOOLBAR_SetRedraw (hwnd, wParam, lParam);
_____
Modified: vendor/wine/dlls/comctl32/current/treeview.c --- vendor/wine/dlls/comctl32/current/treeview.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/comctl32/current/treeview.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -775,8 +775,8 @@
wineItem->pszText = newText; MultiByteToWideChar( CP_ACP, 0, (LPSTR)callback.item.pszText, -1, - wineItem->pszText, buflen); - wineItem->cchTextMax = buflen; + wineItem->pszText, buflen/sizeof(WCHAR)); + wineItem->cchTextMax = buflen/sizeof(WCHAR); } /* If ReAlloc fails we have nothing to do, but keep original text */ } @@ -818,8 +818,8 @@ wineItem->pszText = newText; MultiByteToWideChar( CP_ACP, 0, (LPSTR)callback.item.pszText, -1, - wineItem->pszText, buflen); - wineItem->cchTextMax = buflen; + wineItem->pszText, buflen/sizeof(WCHAR)); + wineItem->cchTextMax = buflen/sizeof(WCHAR); if (oldText) Free(oldText); } _____
Modified: vendor/wine/dlls/commdlg/current/cdlg32.c --- vendor/wine/dlls/commdlg/current/cdlg32.c 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/commdlg/current/cdlg32.c 2005-10-08 09:19:17 UTC (rev 18320) @@ -158,7 +158,7 @@
if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES) COMDLG32_TlsIndex = TlsAlloc(); if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) - TlsSetValue(COMDLG32_TlsIndex, (void *)err); + TlsSetValue(COMDLG32_TlsIndex, (LPVOID)(DWORD_PTR)err); else FIXME("No Tls Space\n"); } @@ -176,7 +176,7 @@ DWORD WINAPI CommDlgExtendedError(void) { if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) - return (DWORD)TlsGetValue(COMDLG32_TlsIndex); + return (DWORD_PTR)TlsGetValue(COMDLG32_TlsIndex); else return 0; /* we never set an error, so there isn't one */ } _____
Added: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc --- vendor/wine/dlls/commdlg/current/cdlg_Bg.rc 2005-10-08 00:41:31 UTC (rev 18319) +++ vendor/wine/dlls/commdlg/current/cdlg_Bg.rc 2005-10-08 09:19:17 UTC (rev 18320) @@ -0,0 +1,472 @@
+/* + * Copyright 2005 Milko Krachounov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Ê¾Û Þþ޸ݯ ´Þ°Õ°Õ õÓ ÝÕ ´Þ´Óý ÝÕ¨¯, ÓýÓ Óþ Ò¯ ´Þ´ÝÓ§. + * ?Û¯ ÞýÓ ´¯ßÙÕýÞ Ý Û¯Ú õÓ ÒÞ ¯´ÓÔÞ. + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "??Ô¯Þ" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&?ýÕ ÝÓ ¶ÓÚÙ:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&?ÞÕÛ?¯ÞÞ:", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&ÊÞ´ ¶ÓÚÙ¯ÔÕ:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&˱?¯Ú±?ÔÓ:", 1091, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "??Ô¯Þ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤¯ý¯¨", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "ÐÓý¯ þÓ &¸Õ?ÕÝÕ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "з§ÓÝÞ ÛÓ?¯ ..." +FONT 8, "MS Shell Dlg" +{ + LTEXT "&?ýÕ ÝÓ ¶ÓÚÙ:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&?ÞÕÛ?¯ÞÞ:", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&ÊÞ´ ¶ÓÚÙ¯ÔÕ:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&˱?¯Ú±?ÔÓ:", 1091, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "з§ÓÝÞ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤¯ý¯¨", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "ÐÓý¯ þÓ &¸Õ?ÕÝÕ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¤Õ¸Ó?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "¤ÞÝ?Õ:", 1088, 6, 6, 40, 9 + LTEXT "", 1089, 60, 6, 150, 9 + GROUPBOX "ðÓþ´Õ¸Ó?ÓÚ", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&?±Þ¸Û¯", rad1, 16, 45, 60, 12 + RADIOBUTTON "&?þßÓݯ?¯", rad2, 16, 60, 60, 12 + RADIOBUTTON "&Ð?ÓÝÞ÷Þ", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "ðÓþ´Õ¸Ó?ÓÚ", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&?Ó±?¯ÚÛÞ", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&??:", 1090, 60, 80, 30, 9 + LTEXT "&?¯:", 1091, 120, 80, 30, 9 + LTEXT "&?Ó¸Õ±?Ô¯:", 1092, 6, 100, 76, 9 + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "¤Õ¸Ó? Ô·Ô &¶ÓÚÙ", chx1, 20, 100, 60, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "ÐÒ·±?Õݯ", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?Ó±?¯ÚÛÞ ÝÓ ´Õ¸Ó?ÓÝÕ?¯" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "¤ÞÝ?Õ", grp1, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "¤ÞÝ?Õ ´¯ ´¯õ&ÓþßÞÓÝÕ", rad1, 16, 20, 80, 12 + LTEXT "[Ý ýÓ]", 1088, 35, 35, 120, 9 + RADIOBUTTON "?¾Ò &´ÞÝ?Õ", rad2, 16, 50, 80, 12 + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&?Ó±?¯ÚÛÞ", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "?ÞÕÝ?Ó÷Þ ", grp2, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "¤¯&?Õ?", rad3, 50, 100, 40, 12 + RADIOBUTTON "¤ÕÚþÓ&µ", rad4, 50, 115, 40, 12 + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "ðÓþ&ýÕ", 1089, 130, 95, 30, 9 + LTEXT "&?þ?¯¸ÝÞÛ", 1090, 130, 110, 30, 9 + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÏÞ¶?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&ÏÞ¶?:",stc1 ,6,3,40,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Ð?ÞÙ:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "ðÓ&þýÕ:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "??ýÕÝÞ",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "¤Þ&Ù¯µÞ", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤¯ý¯¨" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "?¶ÕÛ?Þ",grp1,6,72,84,34,WS_GROUP + CHECKBOX "&ÃÓ¸Õ?ÓÝ", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "¤¯õ&¸Õ?ÓÝ", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&ÍÔ ?:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "¤ÞýÕ",grp2,98,72,120,36,WS_GROUP + CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "&?þß¾ÛÓ:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 314, 185 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÍÔ ?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&?±Ý¯ÔÝÞ ÷ÔÕ?¯ÔÕ:", 1088, 4, 4, 140, 10 + LTEXT "&¤¯?ÕßÞ?ÕÙ±ÛÞ ÷ÔÕ?¯ÔÕ:", 1089, 4, 106, 140, 10 + LTEXT "ÍÔ ?|&¤Ù·?ÕÝ", 1090, 150, 151, 48, 10 + LTEXT "&ÎÕÔÕݯ:", 726 /*1094*/,261,126,32,10 + EDITTEXT 706, 295,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ÃÕÙÕݯ:",727/*1095*/,261,140,32,10 + EDITTEXT 707, 295,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ÐÞݳ¯:",728 /*1096*/,261,154,32,10 + EDITTEXT 708, 295,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ʯÝ:" ,723 /*1091*/,197,126,42,10 + EDITTEXT 703, 241,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&?Ó±Þ?Õݯ±?:" ,724 /*1092*/,197,140,42,10 + EDITTEXT 704, 241,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&?±ÔÕ?Õݯ±?:" ,725 /*1093*/,197,154,42,10 + EDITTEXT 705, 241,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¤¯ý¯¨", pshHelp,100,166, 44, 14 + PUSHBUTTON "&?¯ßÓÔÞ ´¯?ÕßÞ?ÕÙ±ÛÞ ÷Ô ?", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&?´ÕõÕÙÞ ÷ÔÕ?¯ÔÕ >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤",713,300,200,4,14 /* just a dummy: '¤' is like &¤ in "&¤Ù·?ÕÝ" */ +} + + +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 62 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ê·±ÕÝÕ" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ê·±Þ &þÓ:", -1, 4, 8, 42, 8 + EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&ÐÓý¯ ÷ÕÙÞ õ¾ýÞ", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&ξԱ?ÔÞ?ÕÙÕÝ ÕÒÞ±?·", chx2, 4, 42, 96, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "¤¯±¯ÛÓ", grp1, 107, 26, 98, 28 + CONTROL "?Ó&Ò¯Õ", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 + CONTROL "?Ó&õ¯Ù¾", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 38, 40, 12 + + DEFPUSHBUTTON "&?ÓýÕÞ ±ÙÕõÔÓ¨", IDOK, 212, 5, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "??ýÕÝÞ", IDCANCEL , 212, 23, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤¯ý¯¨", pshHelp , 212, 45, 65, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 94 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÃÓý ÝÓ" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ê·±Þ &þÓ:", -1, 4, 9, 48, 8 + EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "ÃÓ&ý ÝÓ ±:", -1, 4, 26, 48, 8 + EDITTEXT edt2, 47, 24, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&ÐÓý¯ ÷ÕÙÞ õ¾ýÞ", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&ξԱ?ÔÞ?ÕÙÕÝ ÕÒÞ±?·", chx2, 5, 62, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&?ÓýÕÞ ±ÙÕõÔÓ¨", IDOK, 212, 4, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&ÃÓýÕÝÞ", psh1 , 212, 21, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÃÓýÕÝÞ &Ô±Þ¸ÛÞ", psh2 , 212, 38, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ý ÝÓ", IDCANCEL , 212, 55, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&¤¯ý¯¨", pshHelp , 212, 75, 65, 14, WS_GROUP | WS_TABSTOP +} + + +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 321, 186 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "¤Õ¸Ó?" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "&¤¯ý¯¨", pshHelp, 50, 161, 48,14, WS_GROUP + + GROUPBOX "¤ÞÝ?Õ", grp4, 8, 4, 305,84, WS_GROUP + CONTROL "¤Õ¸Ó? Ô·Ô &¶ÓÚÙ", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,217,70,74,12 + PUSHBUTTON "ÐÔ¯&Ú±?ÔÓ", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&?ýÕ:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "з±?¯ ÝÞÕ:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "ÊÕÛ±?", stc12, 57, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "ÊÞ´:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "ÊÕÛ±?", stc11, 57, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "? ±?¯:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "ÊÕÛ±?", stc14, 57, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "?¯ýÕÝ?Ó:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "ÊÕÛ±?", stc13, 57, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "?¯´Þ ", grp2, 172, 92, 141,64, WS_GROUP + LTEXT "?¯Ú &Û¯´Þ :",stc5,180,108,68,8 + ICON "", ico3, 174,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "¤¯õ&ÕµõÓÝÕ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,252,130,57,12 + EDITTEXT edt3, 252,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "ðÓþ´Õ¸Ó?ÓÚ", grp1, 8,92, 156,64, WS_GROUP + CONTROL "&?±Þ¸Û¯", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Ð?ÓÝÞ÷Þ", rad3,"Button",BS_AUTORADIOBUTTON,16,122,48,12 + CONTROL "&?þßÓݯ?¯", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 [truncated at 1000 lines; 47611 more skipped]