Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38680: sync cabinet to wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 09:17:40 2009 New Revision: 38680 URL: http://svn.reactos.org/svn/reactos?rev=38680&view=rev Log: sync cabinet to wine 1.1.12 Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] Sat Jan 10 09:17:40 2009 @@ -656,6 +656,5 @@ /* from fdi.c */ void QTMupdatemodel(struct QTMmodel *model, int sym); int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); #endif /* __WINE_CABINET_H */ Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Sat Jan 10 09:17:40 2009 @@ -237,7 +237,18 @@ /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES) + { + char *ptr; + + for(ptr = szDirectory + strlen(pDestination->Destination)+1; *ptr; ptr++) { + if(*ptr == '\\') { + *ptr = 0; + CreateDirectoryA(szDirectory, NULL); + *ptr = '\\'; + } + } CreateDirectoryA(szDirectory, NULL); + } hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sat Jan 10 09:17:40 2009 @@ -382,7 +382,7 @@ /* inefficient, but it's harder to forget about freeing the buffer :-). */ /* Reserved areas are used seldom besides that... */ if (cbReserveCFData!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFData))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -852,7 +852,7 @@ /* add optional reserved area */ if (cbReserveCFFolder!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFFolder))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFFolder))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -1419,7 +1419,7 @@ /* save size of file CFDATA2 - required for the folder's offset to data */ sizeFileCFDATA2old = p_fci_internal->sizeFileCFDATA2; - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData+sizeof(CFDATA)))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFData+sizeof(CFDATA)))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); PFCI_CLOSE(hfci,handleCFDATA1new,&err,p_fci_internal->pv); /* TODO error handling of err */ @@ -1753,7 +1753,7 @@ /* add optional reserved area */ if (cbReserveCFHeader!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFHeader))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFHeader))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -2397,7 +2397,7 @@ fci_set_error( FCIERR_NONE, ERROR_GEN_FAILURE, TRUE ); return FALSE; } - if(!(p_fci_internal->data_in = (char*)PFCI_ALLOC(hfci,CB_MAX_CHUNK))) { + if(!(p_fci_internal->data_in = PFCI_ALLOC(hfci,CB_MAX_CHUNK))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Sat Jan 10 09:17:40 2009 @@ -293,7 +293,7 @@ /************************************************************************* * checksum (internal) */ -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { +static cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { int len; cab_ULONG ul = 0; @@ -1054,7 +1054,7 @@ l[h] = j; /* set table size in stack */ /* allocate and link in new table */ - if (!(q = (struct Ziphuft *) PFDI_ALLOC(CAB(hfdi), (z + 1)*sizeof(struct Ziphuft)))) + if (!(q = PFDI_ALLOC(CAB(hfdi), (z + 1)*sizeof(struct Ziphuft)))) { if(h) fdi_Ziphuft_free(CAB(hfdi), ZIP(u)[0]); @@ -2180,8 +2180,8 @@ if (cab->mii.folder_resv > 0) PFDI_SEEK(CAB(hfdi), cab->cabhf, cab->mii.folder_resv, SEEK_CUR); - - fol = (struct fdi_folder *) PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_folder)); + + fol = PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_folder)); if (!fol) { ERR("out of memory!\n"); return DECR_NOMEMORY; @@ -2202,8 +2202,8 @@ for (i = 0; i < fdici.cFiles; i++) { if (PFDI_READ(CAB(hfdi), cab->cabhf, buf2, cffile_SIZEOF) != cffile_SIZEOF) return DECR_INPUT; - - file = (struct fdi_file *) PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_file)); + + file = PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_file)); if (!file) { ERR("out of memory!\n"); return DECR_NOMEMORY; @@ -2592,7 +2592,7 @@ if (CAB(mii).folder_resv > 0) PFDI_SEEK(hfdi, cabhf, CAB(mii).folder_resv, SEEK_CUR); - fol = (struct fdi_folder *) PFDI_ALLOC(hfdi, sizeof(struct fdi_folder)); + fol = PFDI_ALLOC(hfdi, sizeof(struct fdi_folder)); if (!fol) { ERR("out of memory!\n"); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_ALLOC_FAIL; @@ -2622,7 +2622,7 @@ goto bail_and_fail; } - file = (struct fdi_file *) PFDI_ALLOC(hfdi, sizeof(struct fdi_file)); + file = PFDI_ALLOC(hfdi, sizeof(struct fdi_file)); if (!file) { ERR("out of memory!\n"); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_ALLOC_FAIL;

1 0

[cwittich] 38679: sync oleacc and oledlg with wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 08:50:05 2009 New Revision: 38679 URL: http://svn.reactos.org/svn/reactos?rev=38679&view=rev Log: sync oleacc and oledlg with wine 1.1.12 Added: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc (with props) Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.spec trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/pastespl.c trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -23,6 +23,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "oleacc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -39,9 +40,15 @@ return E_NOTIMPL; } -HRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) +LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); + return E_NOTIMPL; +} + +HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) +{ + FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -1,6 +1,6 @@ @ stub AccessibleChildren @ stub AccessibleObjectFromEvent -@ stub AccessibleObjectFromPoint +@ stdcall AccessibleObjectFromPoint(double ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… ============================================================================== --- trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -124,7 +124,7 @@ */ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(uMsg) { @@ -134,7 +134,7 @@ pdlgInfo->hwndSelf = hwnd; - SetPropA(hwnd, OleUIInsertObjectInfoStr, (HANDLE) pdlgInfo); + SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo); @@ -165,7 +165,7 @@ { WORD wNotifyCode = HIWORD(wParam); WORD wID = LOWORD(wParam); - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(wID) { @@ -340,7 +340,7 @@ HKEY hkclsids; HKEY hkey; CLSID clsid; - HRESULT ret; + LSTATUS ret; WCHAR keydesc[MAX_PATH]; WCHAR keyname[MAX_PATH]; WCHAR szclsid[128]; @@ -399,12 +399,12 @@ { UINT i, count; - count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, (WPARAM)0, (LPARAM)0); + count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, 0, 0); for (i = 0; i < count; i++) { CLSID* lpclsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, - LB_GETITEMDATA, (WPARAM)i, (LPARAM)0); + LB_GETITEMDATA, i, 0); HeapFree(GetProcessHeap(), 0, lpclsid); } } @@ -546,7 +546,7 @@ fn.lpTemplateName = NULL; if (GetOpenFileNameA(&fn)) - SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, (WPARAM)0, (LPARAM)fn.lpstrFile); + SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, 0, (LPARAM)fn.lpstrFile); } Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -16,40 +16,45 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IuWFNgÌ}ü" -FONT 9, "MS UI Gothic" +CAPTION "ãªãã¸ã§ã¯ãã®æ¿å¥" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "IuWFNgÌíÞ:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "ãªãã¸ã§ã¯ãã®ç¨®é¡:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "LZ",IDCANCEL,221,24,66,14 - GROUPBOX "Ê",IDC_RESULT,7,103,208,41 - CONTROL "VKì¬",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,221,24,66,14 + GROUPBOX "çµæ",IDC_RESULT,7,103,208,41 + CONTROL "æ°è¦ä½æ",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Rg[ðì¬",IDC_CREATECONTROL,"Button", + CONTROL "ã³ã³ããã¼ã«ãä½æ",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "t@C©çì¬",IDC_CREATEFROMFILE,"Button", + CONTROL "ãã¡ã¤ã«ããä½æ",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "Rg[ðÇÁ(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "ACRÆµÄ\¦",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + PUSHBUTTON "ã³ã³ããã¼ã«ãè¿½å (&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "ã¢ã¤ã³ã³ã¨ãã¦è¡¨ç¤º",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "QÆ...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "t@C:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + PUSHBUTTON "åç§...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "ãã¡ã¤ã«:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "hLgÉVµ¢ %s IuWFNgð}üµÜ·" - IDS_RESULTFILEOBJDESC "t@CÌàeðIuWFNgÆµÄhLgÉ}üµÜ·BIuWFNgÍì¬µ½vO©çLøÉÅ«Ü·B" - IDS_BROWSE "QÆ" - IDS_NOTOLEMOD "t@CÍLøÈOLEW[ÅÍÈ¢æ¤Å·BOLERg[ðo^Å«Ü¹ñB" - IDS_NOTOLEMODCAPTION "Rg[ðÇÁ" + IDS_RESULTOBJDESC "ããã¥ã¡ã³ãã«æ°ãã %s ãªãã¸ã§ã¯ããæ¿å¥ãã¾ã" + IDS_RESULTFILEOBJDESC "ãã¡ã¤ã«ã®åå®¹ããªãã¸ã§ã¯ãã¨ãã¦ããã¥ã¡ã³ãã«æ¿å¥ãã¾ãããªãã¸ã§ã¯ãã¯ä½æããããã°ã©ã ããæå¹ã«ã§ãã¾ãã" + IDS_BROWSE "åç§" + IDS_NOTOLEMOD "ãã¡ã¤ã«ã¯æå¹ãªOLEã¢ã¸ã¥ã¼ã«ã§ã¯ãªãããã§ããOLEã³ã³ããã¼ã«ãç»é²ã§ãã¾ããã" + IDS_NOTOLEMODCAPTION "ã³ã³ããã¼ã«ãè¿½å " } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "°´Ã¼ »ðÀÔ" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | @@ -57,7 +57,7 @@ IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Æ¯º°ÇÏ°Ô ºÙ¿©³Ö±â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "¿øº»:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "ºÙ¿©³Ö±â(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, Added: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Zh… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -1,0 +1,180 @@ +/* + * oledlg (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "æå¥å¯¹è±¡" +FONT 9, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "å¯¹è±¡ç±»å:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "ç¡®å®",IDOK,221,7,66,14 + PUSHBUTTON "åæ¶",IDCANCEL,221,24,66,14 + GROUPBOX "ç»æ",IDC_RESULT,7,103,208,41 + CONTROL "æ°å»º",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "å»ºç«æ§ä»¶",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "å»ºç«äºæä»¶",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "æ·»å æ§ä»¶(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "æ¾ç¤ºä¸ºå¾æ ",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "æµè§...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "æä»¶:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "å¨ä½ çæä»¶ä¸æå¥ä¸ä¸ªæ°ç %s å¯¹è±¡" + IDS_RESULTFILEOBJDESC "å°æä»¶çåå®¹ä»¥å¯¹è±¡çæ¹å¼æå¥å°ä½ çæä»¶ä»¥ä¾¿ä½ å¯ä»¥ç¨åå»ºæ¬æä»¶çç¨åºæ¥æ¿æ´»å®." + IDS_BROWSE "æµè§" + IDS_NOTOLEMOD "æ¬æä»¶ä¸åæ¯ä¸ä¸ªææç OLE æ¨¡å. ä¸è½æ³¨å OLE æ§ä»¶." + IDS_NOTOLEMODCAPTION "æ·»å æ§ä»¶" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ç¹æ®ç²è´´" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "æº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "ç²è´´(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "ç²è´´é¾æ¥(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "ä¸º(&A):", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "ç¡®å®", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "åæ¶", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "å¸®å©(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "æ¾ç¤ºä¸ºå¾æ (&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "æ¹åå¾æ (&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "ç»æ", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "å°åªè´´æ¿çåå®¹ä»¥ %s æå¥å°ä½ çæä»¶." + IDS_PS_PASTE_OBJECT "å°åªè´´æ¿çåå®¹æå¥å°ä½ çæä»¶ä»¥ä¾¿ä½ å¯ä»¥ä½¿ç¨ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "å°åªè´´æ¿çåå®¹æå¥å°ä½ çæä»¶ä»¥ä¾¿ä½ å¯ä»¥ç¨ %s æ¿æ´»å®, ä¸è¬æ¾ç¤ºä¸ºå¾æ ." + IDS_PS_PASTE_LINK_DATA "å°åªè´´æ¿çåå®¹ä»¥ %s æå¥å°ä½ çæä»¶. æ°æ®æ¯é¾æ¥å°æºæä»¶ç, å¯¹æºæä»¶çä»»ä½æ¹å¨é½ä¼ååºå°ä½ çæä»¶." + IDS_PS_PASTE_LINK_OBJECT "å°åªè´´æ¿çå¾åæå¥å°ä½ çæä»¶. å¾åæ¯é¾æ¥å°æºæä»¶ç, å¯¹æºæä»¶çä»»ä½æ¹å¨é½ä¼ååºå°ä½ çæä»¶." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "å°åªè´´æ¿çæ·å¾æå¥å°ä½ çæä»¶. æ·å¾æ¯é¾æ¥å°æºæä»¶ç, å¯¹æºæä»¶çä»»ä½æ¹å¨é½ä¼ååºå°ä½ çæä»¶." + IDS_PS_NON_OLE "å°åªè´´æ¿çåå®¹æå¥å°ä½ çæä»¶." + IDS_PS_UNKNOWN_TYPE "ä¸æç±»å" + IDS_PS_UNKNOWN_SRC "ä¸ææ¥æº" + IDS_PS_UNKNOWN_APP "ä¸æåºç¨ç¨åº" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "æå¥å°è±¡" +FONT 9, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "å°è±¡é¡å:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "ç¢ºå®",IDOK,221,7,66,14 + PUSHBUTTON "åæ¶",IDCANCEL,221,24,66,14 + GROUPBOX "çµæ",IDC_RESULT,7,103,208,41 + CONTROL "æ°å»º",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "å»ºç«æ§ä»¶",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "å»ºç«æ¼æªæ¡",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "æ·»å æ§ä»¶(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "é¡¯ç¤ºçºåæ¨",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "çè¦½...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "æªæ¡:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "å¨ä½ çæªæ¡ä¸æå¥ä¸åæ°ç %s å°è±¡" + IDS_RESULTFILEOBJDESC "å°æªæ¡çå§å®¹ä»¥å°è±¡çæ¹å¼æå¥å°ä½ çæªæ¡ä»¥ä¾¿ä½ å¯ä»¥ç¨åµå»ºæ¬æªæ¡çç¨å¼ä¾æ¿æ´»å®." + IDS_BROWSE "çè¦½" + IDS_NOTOLEMOD "æ¬æªæ¡ä¸åæ¯ä¸åææç OLE æ¨¡å. ä¸è½è¨»å OLE æ§ä»¶." + IDS_NOTOLEMODCAPTION "æ·»å æ§ä»¶" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ç¹æ®è²¼ä¸" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "æº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "è²¼ä¸(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "è²¼ä¸éæ¥(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "çº(&A):", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "ç¢ºå®", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "åæ¶", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "å¹«å©(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "é¡¯ç¤ºçºåæ¨(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "æ¹è®åæ¨(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "çµæ", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "å°åªè²¼æ¿çå§å®¹ä»¥ %s æå¥å°ä½ çæªæ¡." + IDS_PS_PASTE_OBJECT "å°åªè²¼æ¿çå§å®¹æå¥å°ä½ çæªæ¡ä»¥ä¾¿ä½ å¯ä»¥ä½¿ç¨ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "å°åªè²¼æ¿çå§å®¹æå¥å°ä½ çæªæ¡ä»¥ä¾¿ä½ å¯ä»¥ç¨ %s æ¿æ´»å®, ä¸è¬é¡¯ç¤ºçºåæ¨." + IDS_PS_PASTE_LINK_DATA "å°åªè²¼æ¿çå§å®¹ä»¥ %s æå¥å°ä½ çæªæ¡. æ¸ææ¯éæ¥å°æºæªæ¡ç, å°æºæªæ¡çä»»ä½æ¹åé½æåæå°ä½ çæªæ¡." + IDS_PS_PASTE_LINK_OBJECT "å°åªè²¼æ¿çååæå¥å°ä½ çæªæ¡. ååæ¯éæ¥å°æºæªæ¡ç, å°æºæªæ¡çä»»ä½æ¹åé½æåæå°ä½ çæªæ¡." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "å°åªè²¼æ¿çæ·å¾æå¥å°ä½ çæªæ¡. æ·å¾æ¯éæ¥å°æºæªæ¡ç, å°æºæªæ¡çä»»ä½æ¹åé½æåæå°ä½ çæªæ¡." + IDS_PS_NON_OLE "å°åªè²¼æ¿çå§å®¹æå¥å°ä½ çæªæ¡." + IDS_PS_UNKNOWN_TYPE "ä¸æé¡å" + IDS_PS_UNKNOWN_SRC "ä¸æä¾æº" + IDS_PS_UNKNOWN_APP "ä¸ææç¨ç¨å¼" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/pastespl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -648,7 +648,7 @@ if(psA->cPasteEntries > 0) { DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); - UINT i; + INT i; ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); @@ -665,7 +665,7 @@ if(psA->cPasteEntries > 0) { - UINT i; + INT i; for(i = 0; i < psA->cPasteEntries; i++) { HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Sat Jan 10 08:50:05 2009 @@ -52,3 +52,4 @@ #include "oledlg_Sv.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc" +#include "oledlg_Zh.rc"

1 0

[dchapyshev] 38678: - Fix 3 wine tests for OpenFile function
by dchapyshev＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: dchapyshev Date: Sat Jan 10 06:33:22 2009 New Revision: 38678 URL: http://svn.reactos.org/svn/reactos?rev=38678&view=rev Log: - Fix 3 wine tests for OpenFile function Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Jan 10 06:33:22 2009 @@ -263,6 +263,27 @@ lpReOpenBuff->fFixedDisk = (GetDriveTypeA(lpReOpenBuff->szPathName) != DRIVE_REMOVABLE); TRACE("(%s): OF_PARSE, res = '%s'\n", lpFileName, lpReOpenBuff->szPathName); return 0; + } + + if ((uStyle & OF_EXIST) && !(uStyle & OF_CREATE)) + { + DWORD dwAttributes = GetFileAttributesA(lpReOpenBuff->szPathName); + + switch (dwAttributes) + { + case 0xFFFFFFFF: /* File does not exist */ + SetLastError(ERROR_FILE_NOT_FOUND); + lpReOpenBuff->nErrCode = (WORD) ERROR_FILE_NOT_FOUND; + return -1; + + case FILE_ATTRIBUTE_DIRECTORY: + SetLastError(ERROR_ACCESS_DENIED); + lpReOpenBuff->nErrCode = (WORD) ERROR_ACCESS_DENIED; + return -1; + + default: + return 1; + } } if ((uStyle & OF_CREATE) == OF_CREATE) @@ -371,7 +392,7 @@ if (uStyle & OF_EXIST) { NtClose(FileHandle); - return TRUE; + return (HFILE)1; } return (HFILE)FileHandle;

1 0

[cwittich] 38677: add rpcproxy to dtd
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

1 0

[dchapyshev] 38676: - Sync tahoma fonts with Wine head
by dchapyshev＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: dchapyshev Date: Sat Jan 10 03:35:02 2009 New Revision: 38676 URL: http://svn.reactos.org/svn/reactos?rev=38676&view=rev Log: - Sync tahoma fonts with Wine head Modified: trunk/reactos/media/fonts/tahoma.ttf trunk/reactos/media/fonts/tahomabd.ttf Modified: trunk/reactos/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahoma.ttf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahomabd.ttf?r… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 38675: Register the correct windows, fixes the problem that explorer_new's desktop was hiding the taskbar.
by tkreuzer＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: tkreuzer Date: Fri Jan 9 21:39:01 2009 New Revision: 38675 URL: http://svn.reactos.org/svn/reactos?rev=38675&view=rev Log: Register the correct windows, fixes the problem that explorer_new's desktop was hiding the taskbar. Modified: trunk/reactos/dll/win32/shell32/desktop.c Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] Fri Jan 9 21:39:01 2009 @@ -281,8 +281,8 @@ if (SUCCEEDED (IShellDesktop_GetTrayWindow(This->ShellDesk, &hwndTray))) { - SetShellWindowEx (hwndTray, - This->hWnd); + SetShellWindowEx (This->hWnd, + hwndTray); // FIXME: Shouldn't this be the desktop listview? } return TRUE; }

1 0

[weiden] 38674: Register the shell desktop and tray window
by weiden＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: weiden Date: Fri Jan 9 18:58:24 2009 New Revision: 38674 URL: http://svn.reactos.org/svn/reactos?rev=38674&view=rev Log: Register the shell desktop and tray window Modified: trunk/reactos/dll/win32/shell32/desktop.c Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] Fri Jan 9 18:58:24 2009 @@ -22,6 +22,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(desktop); +BOOL WINAPI SetShellWindowEx(HWND, HWND); + #define SHDESK_TAG 0x4b534544 static const WCHAR szProgmanClassName[] = {'P','r','o','g','m','a','n'}; @@ -259,6 +261,7 @@ IShellBrowser *ShellBrowser; FOLDERSETTINGS fs; RECT rcClient; + HWND hwndTray; HRESULT hRet; if (!GetClientRect(This->hWnd, @@ -275,6 +278,12 @@ if (!SUCCEEDED(hRet)) return FALSE; + if (SUCCEEDED (IShellDesktop_GetTrayWindow(This->ShellDesk, + &hwndTray))) + { + SetShellWindowEx (hwndTray, + This->hWnd); + } return TRUE; }

1 0

[tkreuzer] 38673: Inline wrappers user32 -> NtUser
by tkreuzer＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: tkreuzer Date: Fri Jan 9 18:28:06 2009 New Revision: 38673 URL: http://svn.reactos.org/svn/reactos?rev=38673&view=rev Log: Inline wrappers user32 -> NtUser Added: trunk/reactos/dll/win32/user32/include/ntwrapper.h (with props) Added: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h (added) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Fri Jan 9 18:28:06 2009 @@ -1,0 +1,439 @@ +#define EXTINLINE extern inline __attribute__((always_inline)) + +EXTINLINE BOOL WINAPI +EnableScrollBar(HWND hWnd, UINT wSBflags, UINT wArrows) +{ + return NtUserEnableScrollBar(hWnd, wSBflags, wArrows); +} + +EXTINLINE BOOL WINAPI +GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) +{ + return NtUserGetScrollBarInfo(hWnd, idObject, psbi); +} + +EXTINLINE BOOL WINAPI +ShowScrollBar(HWND hWnd, INT wBar, BOOL bShow) +{ + return NtUserShowScrollBar(hWnd, wBar, bShow); +} + +EXTINLINE BOOL WINAPI +CloseDesktop(HDESK hDesktop) +{ + return NtUserCloseDesktop(hDesktop); +} + +EXTINLINE HDESK WINAPI +OpenInputDesktop(DWORD dwFlags, BOOL fInherit, ACCESS_MASK dwDesiredAccess) +{ + return NtUserOpenInputDesktop(dwFlags, fInherit, dwDesiredAccess); +} + +EXTINLINE BOOL WINAPI +PaintDesktop(HDC hdc) +{ + return NtUserPaintDesktop(hdc); +} + +EXTINLINE BOOL WINAPI +SetThreadDesktop(HDESK hDesktop) +{ + return NtUserSetThreadDesktop(hDesktop); +} + +EXTINLINE BOOL WINAPI +SwitchDesktop(HDESK hDesktop) +{ + return NtUserSwitchDesktop(hDesktop); +} + +EXTINLINE BOOL WINAPI +SetShellWindowEx(HWND hwndShell, HWND hwndShellListView) +{ + return NtUserSetShellWindowEx(hwndShell, hwndShellListView); +} + +EXTINLINE DWORD WINAPI +GetGuiResources(HANDLE hProcess, DWORD uiFlags) +{ + return NtUserGetGuiResources(hProcess, uiFlags); +} + +EXTINLINE BOOL WINAPI +GetUserObjectInformationW(HANDLE hObj, int nIndex, PVOID pvInfo, DWORD nLength, LPDWORD lpnLengthNeeded) +{ + return NtUserGetObjectInformation(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); +} + +EXTINLINE BOOL WINAPI +LockWindowUpdate(HWND hWndLock) +{ + return NtUserLockWindowUpdate(hWndLock); +} + +EXTINLINE BOOL WINAPI +LockWorkStation(VOID) +{ + return NtUserLockWorkStation(); +} + +EXTINLINE DWORD WINAPI +RegisterTasklist(DWORD x) +{ + return NtUserRegisterTasklist(x); +} + +EXTINLINE DWORD WINAPI +DragObject(HWND hwnd1, HWND hwnd2, UINT u1, DWORD dw1, HCURSOR hc1) +{ + return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1); +} + +EXTINLINE BOOL WINAPI +KillTimer(HWND hWnd, UINT_PTR IDEvent) +{ + return NtUserKillTimer(hWnd, IDEvent); +} + +EXTINLINE UINT_PTR WINAPI +SetSystemTimer(HWND hWnd, UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc) +{ + return NtUserSetSystemTimer(hWnd, IDEvent, Period, TimerFunc); +} + +EXTINLINE UINT_PTR WINAPI +SetTimer(HWND hWnd, UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc) +{ + return NtUserSetTimer(hWnd, IDEvent, Period, TimerFunc); +} + +EXTINLINE BOOL WINAPI +CloseWindowStation(HWINSTA hWinSta) +{ + return NtUserCloseWindowStation(hWinSta); +} + +EXTINLINE HWINSTA WINAPI +GetProcessWindowStation(VOID) +{ + return NtUserGetProcessWindowStation(); +} + +EXTINLINE BOOL WINAPI +SetProcessWindowStation(HWINSTA hWinSta) +{ + return NtUserSetProcessWindowStation(hWinSta); +} + +EXTINLINE BOOL WINAPI +LockWindowStation(HWINSTA hWinSta) +{ + return NtUserLockWindowStation(hWinSta); +} + +EXTINLINE BOOL WINAPI +UnlockWindowStation(HWINSTA hWinSta) +{ + return NtUserUnlockWindowStation(hWinSta); +} + +EXTINLINE int WINAPI +CopyAcceleratorTableW(HACCEL hAccelSrc, LPACCEL lpAccelDst, int cAccelEntries) +{ + return NtUserCopyAcceleratorTable(hAccelSrc, lpAccelDst, cAccelEntries); +} + +EXTINLINE HACCEL WINAPI +CreateAcceleratorTableW(LPACCEL lpaccl, int cEntries) +{ + return NtUserCreateAcceleratorTable(lpaccl, cEntries); +} + +EXTINLINE BOOL WINAPI +CreateCaret(HWND hWnd, HBITMAP hBitmap, int nWidth, int nHeight) +{ + return NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight); +} + +EXTINLINE UINT WINAPI +GetCaretBlinkTime(VOID) +{ + return NtUserGetCaretBlinkTime(); +} + +EXTINLINE BOOL WINAPI +GetCaretPos(LPPOINT lpPoint) +{ + return NtUserGetCaretPos(lpPoint); +} + +EXTINLINE BOOL WINAPI +CloseClipboard(VOID) +{ + return NtUserCloseClipboard(); +} + +EXTINLINE INT WINAPI +CountClipboardFormats(VOID) +{ + return NtUserCountClipboardFormats(); +} + +EXTINLINE BOOL WINAPI +EmptyClipboard(VOID) +{ + return NtUserEmptyClipboard(); +} + +EXTINLINE HWND WINAPI +GetClipboardOwner(VOID) +{ + return NtUserGetClipboardOwner(); +} + +EXTINLINE DWORD WINAPI +GetClipboardSequenceNumber(VOID) +{ + return NtUserGetClipboardSequenceNumber(); +} + +EXTINLINE HWND WINAPI +GetClipboardViewer(VOID) +{ + return NtUserGetClipboardViewer(); +} + +EXTINLINE HWND WINAPI +GetOpenClipboardWindow(VOID) +{ + return NtUserGetOpenClipboardWindow(); +} + +EXTINLINE INT WINAPI +GetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats) +{ + return NtUserGetPriorityClipboardFormat(paFormatPriorityList, cFormats); +} + +EXTINLINE BOOL WINAPI +IsClipboardFormatAvailable(UINT format) +{ + return NtUserIsClipboardFormatAvailable(format); +} + +EXTINLINE HWND WINAPI +SetClipboardViewer(HWND hWndNewViewer) +{ + return NtUserSetClipboardViewer(hWndNewViewer); +} + +EXTINLINE BOOL WINAPI +ChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext) +{ + return NtUserChangeClipboardChain(hWndRemove, hWndNewNext); +} + +EXTINLINE BOOL WINAPI +GetClipCursor(LPRECT lpRect) +{ + return NtUserGetClipCursor(lpRect); +} + +EXTINLINE BOOL WINAPI +GetCursorInfo(PCURSORINFO pci) +{ + return NtUserGetCursorInfo(pci); +} + +EXTINLINE BOOL WINAPI +ClipCursor(CONST RECT *lpRect) +{ + return NtUserClipCursor((RECT *)lpRect); +} + +EXTINLINE HCURSOR WINAPI +SetCursor(HCURSOR hCursor) +{ + return NtUserSetCursor(hCursor); +} + +EXTINLINE HDC WINAPI +GetDC(HWND hWnd) +{ + return NtUserGetDC(hWnd); +} + +EXTINLINE HDC WINAPI +GetDCEx(HWND hWnd, HRGN hrgnClip, DWORD flags) +{ + return NtUserGetDCEx(hWnd, hrgnClip, flags); +} + +EXTINLINE HDC WINAPI +GetWindowDC(HWND hWnd) +{ + return NtUserGetWindowDC(hWnd); +} + +EXTINLINE BOOL WINAPI +FlashWindowEx(PFLASHWINFO pfwi) +{ + return NtUserFlashWindowEx(pfwi); +} + +EXTINLINE BOOL WINAPI +DrawAnimatedRects(HWND hWnd, int idAni, CONST RECT *lprcFrom, CONST RECT *lprcTo) +{ + return NtUserDrawAnimatedRects(hWnd, idAni, (RECT*)lprcFrom, (RECT*)lprcTo); +} + +EXTINLINE BOOL WINAPI +BlockInput(BOOL fBlockIt) +{ + return NtUserBlockInput(fBlockIt); +} + +EXTINLINE UINT WINAPI +GetDoubleClickTime(VOID) +{ + return NtUserGetDoubleClickTime(); +} + +EXTINLINE BOOL WINAPI +GetKeyboardState(PBYTE lpKeyState) +{ + return NtUserGetKeyboardState((LPBYTE) lpKeyState); +} + +EXTINLINE BOOL WINAPI +RegisterHotKey(HWND hWnd, int id, UINT fsModifiers, UINT vk) +{ + return NtUserRegisterHotKey(hWnd, id, fsModifiers, vk); +} + +EXTINLINE HWND WINAPI +SetFocus(HWND hWnd) +{ + return NtUserSetFocus(hWnd); +} + +EXTINLINE BOOL WINAPI +SetKeyboardState(LPBYTE lpKeyState) +{ + return NtUserSetKeyboardState((LPBYTE)lpKeyState); +} + +EXTINLINE UINT WINAPI +SendInput(UINT nInputs, LPINPUT pInputs, int cbSize) +{ + return NtUserSendInput(nInputs, pInputs, cbSize); +} + +EXTINLINE BOOL WINAPI +WaitMessage(VOID) +{ + return NtUserWaitMessage(); +} + +EXTINLINE HDC WINAPI +BeginPaint(HWND hwnd, LPPAINTSTRUCT lpPaint) +{ + return NtUserBeginPaint(hwnd, lpPaint); +} + +EXTINLINE BOOL WINAPI +EndPaint(HWND hWnd, CONST PAINTSTRUCT *lpPaint) +{ + return NtUserEndPaint(hWnd, lpPaint); +} + +EXTINLINE int WINAPI +ExcludeUpdateRgn(HDC hDC, HWND hWnd) +{ + return NtUserExcludeUpdateRgn(hDC, hWnd); +} + +EXTINLINE BOOL WINAPI +InvalidateRgn(HWND hWnd, HRGN hRgn, BOOL bErase) +{ + return NtUserInvalidateRgn(hWnd, hRgn, bErase); +} + +EXTINLINE BOOL WINAPI +RedrawWindow(HWND hWnd, CONST RECT *lprcUpdate, HRGN hrgnUpdate, UINT flags) +{ + return NtUserRedrawWindow(hWnd, lprcUpdate, hrgnUpdate, flags); +} + +EXTINLINE BOOL WINAPI +DestroyWindow(HWND hWnd) +{ + return NtUserDestroyWindow(hWnd); +} + +EXTINLINE HWND WINAPI +GetForegroundWindow(VOID) +{ + return NtUserGetForegroundWindow(); +} + +EXTINLINE BOOL WINAPI +GetGUIThreadInfo(DWORD idThread, LPGUITHREADINFO lpgui) +{ + return NtUserGetGUIThreadInfo(idThread, lpgui); +} + +EXTINLINE BOOL WINAPI +GetTitleBarInfo(HWND hwnd, PTITLEBARINFO pti) +{ + return NtUserGetTitleBarInfo(hwnd, pti); +} + +EXTINLINE BOOL WINAPI +GetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) +{ + return NtUserGetWindowPlacement(hWnd, lpwndpl); +} + +EXTINLINE BOOL WINAPI +MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint) +{ + return NtUserMoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); +} + +EXTINLINE HWND WINAPI +SetParent(HWND hWndChild, HWND hWndNewParent) +{ + return NtUserSetParent(hWndChild, hWndNewParent); +} + +EXTINLINE BOOL WINAPI +SetWindowPlacement(HWND hWnd, CONST WINDOWPLACEMENT *lpwndpl) +{ + return NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl); +} + +EXTINLINE BOOL WINAPI +SetWindowPos(HWND hWnd, HWND hWndAfter, int X, int Y, int cx, int cy, UINT uFlags) +{ + return NtUserSetWindowPos(hWnd,hWndAfter, X, Y, cx, cy, uFlags); +} + +EXTINLINE BOOL WINAPI +ShowWindow(HWND hWnd, int nCmdShow) +{ + return NtUserShowWindow(hWnd, nCmdShow); +} + +EXTINLINE BOOL WINAPI +ShowWindowAsync(HWND hWnd, int nCmdShow) +{ + return NtUserShowWindowAsync(hWnd, nCmdShow); +} + +EXTINLINE HWND WINAPI +SetActiveWindow(HWND hWnd) +{ + return NtUserSetActiveWindow(hWnd); +} Propchange: trunk/reactos/dll/win32/user32/include/ntwrapper.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 38672: - Update Norwegian translation. See issue #4007 for more details.
by dchapyshev＠svn.reactos.org 09 Jan '09

09 Jan '09

Author: dchapyshev Date: Fri Jan 9 15:02:07 2009 New Revision: 38672 URL: http://svn.reactos.org/svn/reactos?rev=38672&view=rev Log: - Update Norwegian translation. See issue #4007 for more details. Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Fri Jan 9 15:02:07 2009 @@ -2,21 +2,21 @@ IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Velkommen til veiviseren for å legge til maskinvare", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Denne veiviseren hjelper deg å:", -1, 114, 40, 182, 8 + LTEXT "1) Installere programvare som gjør at maskinvaren støttes på din datamaskin.", -1, 121, 56, 184, 16 + LTEXT "2) Feilsøker dine problemer som du kan ha med din maskinvare.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Hvis maskinvaren din fulgte med en installasjons CD, er det anbefalt at du avbryter denne veiviseren og bruker produsentens CD for å installere maskinvaren.", 503, 150, 106, 155, 50 + LTEXT "Klikk Neste, for å fortsette.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,63 +25,63 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Har du koblet maskinvaren til din datamaskin?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Ja, jeg har tilkoblet maskinvaren", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&Nei, jeg har ikke tilkoblet maskinvaren", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Fra listen under, velg en installert maskinvare type, også trykk på Neste for å sjekke egenskaper eller feilsøke et problem som du har.", -1, 21, 8, 275, 22 + LTEXT "For å legge til maskinvare som ikke er vist på listen, trykk ""Legg til ny maskinvare enhet.""", -1, 21, 32, 275, 24 + LTEXT "I&nstallert maskinvare:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "Veiviseren kan søke etter andre maskinvare og automatisk installere det for deg. Eller, hvis du vet riktig hvilken maskinvare modell du ønsker å installere, kan du velge det fra listen.", -1, 21, 8, 280, 24 + LTEXT "Hva ønsker du at veiviseren skal gjøre?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Søk etter og installere maskinvaren automatisk (Anbefalt)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "Installer maskinvaren som jeg &manuelt velger fra listen (Avansert)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Oppdaget maskinvare:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Hvis du ikke ser maskinvare kategori som du ønsker, trykk på vis alle enheter.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Vanlige &maskinvare typer:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "Det vil ta noen minutter å søke etter maskinvare.", -1, 21, 8, 275, 15 + LTEXT "Total prosess:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,58 +89,58 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Fullfører veiviseren for å legge til maskinvare", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Du har nå fullført veiviseren for å legge til maskinvare.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "For å avslutte veiviseren, trykk på Fullført.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Fullfører veiviseren for å legge til maskinvare", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Veiviseren fant følgende maskinvare tilkoblet til din datamaskin:", -1, 114, 32, 193, 19 + LTEXT "For å avslutte veiviseren, trykk på Fullført.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Fullfører veiviseren for å legge til maskinvare", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Her er nåværende status av maskinvaren du valgte:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "For å starte feilsøking som kan hjelpe deg å løse alle problemer som du kan ha, trykk på Fullført.", -1, 114, 136, 193, 16 + LTEXT "For å avslutte veiviseren, trykk på Avbryt.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Kan ikke fortsette veiviseren for å legge til maskinvare", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "For å fortsette, koble til maskinvaren til din datamaskin.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Slå av datamaskinen når jeg trykker på Fullført når jeg trykker på Fullført slik at jeg kan slå på datamaskinen og koble til maskinvaren.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "I de fleste tilfeller ReactOS vil automatisk installere din maskinvare etter at den tilkobles. Hvis ReactOS ikke finner maskinvaren, kan du åpne denne veiviseren for å installere programvaren til maskinvaren.", -1, 114, 98, 193, 32 + LTEXT "For å avslutte veiviseren, trykk på Fullført.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Legg til maskinvare" IDS_CPLDESCRIPTION "Legg til maskinvare for din datamaskin." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_SEARCHTITLE "Vennligst vent mens veiviseren søker..." + IDS_SEARCHTEXT "Denne veiviseren søker etter maskinvare som har blitt tilkoblet til din datamaskin men som ikke har blitt installert." + IDS_ISCONNECTED "Er maskinvaren tilkoblet?" + IDS_PROBELISTTITLE "Følgende maskinvare har blitt installert på din datamaskin" + IDS_ADDNEWDEVICE "Legg til en ny maskinvare enhet" + IDS_SELECTWAYTITLE "Veiviseren kan hjelpe deg å installere andre maskinvare" END

1 0

[dchapyshev] 38671: - Update Slovak translation. Patch by Mario Kacmar (kario@szm.sk)) See issue #4005 for more details.
by dchapyshev＠svn.reactos.org 09 Jan '09

09 Jan '09

Author: dchapyshev Date: Fri Jan 9 12:06:28 2009 New Revision: 38671 URL: http://svn.reactos.org/svn/reactos?rev=38671&view=rev Log: - Update Slovak translation. Patch by Mario Kacmar (kario(a)szm.sk)) See issue #4005 for more details. Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Fri Jan 9 12:06:28 2009 @@ -1,26 +1,27 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 02-02-2008 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 02-02-2008 + * LAST CHANGE: 06-01-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Víta Vás sprievodca pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Tento sprievodca Vám pomôe:", -1, 114, 40, 182, 8 + LTEXT "1) Naintalova softvér pre podporu hardvéru, ktorý ste pridali k Vámu poèítaèu.", -1, 121, 56, 184, 16 + LTEXT "2) Vyriei problémy, ktoré môete ma s Vaím hardvérom.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Ak bolo spolu s Vaím hardvérom dodané aj intalaèné CD, odporúèa sa, aby ste klikli na tlaèidlo Zrui pre zatvorenie tohto sprievodcu a pouili CD od výrobcu pre naintalovanie tohto hardvéru.", 503, 150, 106, 155, 50 + LTEXT "Pre pokraèovanie kliknite na tlaèidlo Ïalej.", -1, 114, 166, 193, 8 //Pokraèujte stlaèením tlaèidla Ïalej. END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -29,12 +30,12 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Pripojili ste u tento hardvér k Vámu poèítaèu?", -1, 20, 11, 275, 8 //tento = daný + AUTORADIOBUTTON "Án&o, u som pripojil hardvér", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&Nie, zatia¾ som nepridal hardvér", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -93,13 +94,13 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Dokonèenie sprievodcu pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Úspene ste dokonèili sprievodcu pridaním hardvéru.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Pre zatvorenie tohto sprievodcu kliknite na tlaèidlo Dokonèi.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 @@ -141,9 +142,9 @@ BEGIN IDS_CPLNAME "Prida hardvér" IDS_CPLDESCRIPTION "Naintaluje nové hardvérové komponenty Váho poèítaèa." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" + IDS_SEARCHTITLE "Poèkajte, prosím, kým sprievodca h¾adá ..." + IDS_SEARCHTEXT "Tento sprievodca práve h¾adá hardvér, ktorý bol nedávno pripojený k Vámu poèítaèu, ale zatia¾ ete nebol naintalovaný." + IDS_ISCONNECTED "Je hardvére pripojený?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" IDS_SELECTWAYTITLE "The wizard can help you install other hardware"

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009