Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 30880: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:07:07 2007 New Revision: 30880 URL: http://svn.reactos.org/svn/reactos?rev=30880&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rbuild (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.rbuild Thu Nov 29 14:07:07 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" allowwarnings="true"> <importlibrary definition="powrprof.spec.def" /> <include base="powrprof">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>advapi32</library> <library>kernel32</library>

1 0

[winesync] 30879: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:06:46 2007 New Revision: 30879 URL: http://svn.reactos.org/svn/reactos?rev=30879&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild trunk/reactos/dll/win32/olepro32/olepro32stubs.c Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32.rbuild (original) +++ trunk/reactos/dll/win32/olepro32/olepro32.rbuild Thu Nov 29 14:06:46 2007 @@ -1,14 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>oleaut32</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32stubs.c (original) +++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c Thu Nov 29 14:06:46 2007 @@ -33,7 +33,7 @@ /*********************************************************************** * DllUnregisterServer (OLEPRO32.258) */ -HRESULT WINAPI DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { FIXME("stub\n"); return S_OK; @@ -42,7 +42,7 @@ /*********************************************************************** * DllRegisterServer (OLEPRO32.257) */ -HRESULT WINAPI DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { FIXME("stub\n"); return S_OK;

1 0

[winesync] 30878: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:06:11 2007 New Revision: 30878 URL: http://svn.reactos.org/svn/reactos?rev=30878&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc (with props) Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg.rbuild trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/oledlg_De.rc trunk/reactos/dll/win32/oledlg/oledlg_En.rc trunk/reactos/dll/win32/oledlg/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc trunk/reactos/dll/win32/oledlg/oledlg_ros.diff trunk/reactos/dll/win32/oledlg/pastespl.c trunk/reactos/dll/win32/oledlg/rsrc.rc 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 (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c Thu Nov 29 14:06:11 2007 @@ -362,7 +362,7 @@ if (ERROR_SUCCESS == RegQueryValueA(hkey, "NotInsertable", keyname, &len)) continue; - RtlMultiByteToUnicodeN(wszclsid, MAX_PATH, NULL, szclsid, MAX_PATH); + RtlMultiByteToUnicodeN(wszclsid, MAX_PATH, NULL, szclsid, MAX_PATH); CLSIDFromString(wszclsid, &clsid); for (i = 0; i < pdlgInfo->lpOleUIInsertObject->cClsidExclude; i++) @@ -402,7 +402,7 @@ for (i = 0; i < count; i++) { - CLSID* lpclsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, + CLSID* lpclsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETITEMDATA, (WPARAM)i, (LPARAM)0); HeapFree(GetProcessHeap(), 0, lpclsid); } @@ -450,7 +450,7 @@ if (index >= 0) { - CLSID* clsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, + CLSID* clsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETITEMDATA, (WPARAM)index, 0); memcpy(&pdlgInfo->lpOleUIInsertObject->clsid, clsid, sizeof(CLSID)); @@ -481,7 +481,7 @@ SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); - RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); + RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid))) { if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATEFILEOBJECT) Modified: trunk/reactos/dll/win32/oledlg/oledlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg.rb… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg.rbuild (original) +++ trunk/reactos/dll/win32/oledlg/oledlg.rbuild Thu Nov 29 14:06:11 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true"> <importlibrary definition="oledlg.spec.def" /> <include base="oledlg">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>ole32</library> <library>comdlg32</library> Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc Thu Nov 29 14:06:11 2007 @@ -35,7 +35,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Storno",IDCANCEL,221,24,66,14 GROUPBOX "Výsledek",IDC_RESULT,7,103,208,41 - CONTROL "Vytvoøit nový",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Vytvoøit nový",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Vytvoøit propojení",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -43,7 +43,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "Pøid&at propojení...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Zobrazit jako ikonu",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Zobrazit jako ikonu",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procházet...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Soubor:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_De.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc Thu Nov 29 14:06:11 2007 @@ -30,7 +30,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Abbrechen",IDCANCEL,221,24,66,14 GROUPBOX "Ergebnis",IDC_RESULT,7,103,208,41 - CONTROL "&Neu erstellen",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Neu erstellen",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "S&teuerung erstellen",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "Steuerung hin&zufügen",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Als &Symbol anzeigen",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Als &Symbol anzeigen",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "D&urchsuchen...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Datei:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_En… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_En.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_En.rc Thu Nov 29 14:06:11 2007 @@ -30,7 +30,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Cancel",IDCANCEL,221,24,66,14 GROUPBOX "Result",IDC_RESULT,7,103,208,41 - CONTROL "Create New",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Create New",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Create Control",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Browse...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Es… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Es.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Es.rc Thu Nov 29 14:06:11 2007 @@ -30,7 +30,7 @@ DEFPUSHBUTTON "Aceptar",IDOK,221,7,66,14 PUSHBUTTON "Cancelar",IDCANCEL,221,24,66,14 GROUPBOX "Resultado",IDC_RESULT,7,103,208,41 - CONTROL "Crear nuevo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Crear nuevo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Crear control",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Añadir control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como icono",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como icono",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Explorar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Archivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Fr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc Thu Nov 29 14:06:11 2007 @@ -34,7 +34,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 GROUPBOX "Résultat",IDC_RESULT,7,103,208,41 - CONTROL "Créer nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Créer nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Créer le contrôle",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -42,7 +42,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Ajoute Contrôle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher comme icône",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Afficher comme icône",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Fichier :",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc Thu Nov 29 14:06:11 2007 @@ -30,7 +30,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Mégse",IDCANCEL,221,24,66,14 GROUPBOX "Eredmény",IDC_RESULT,7,103,208,41 - CONTROL "Új létrehozása",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Új létrehozása",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Vezérlõ létrehozása",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "Vezérlõ hozzá&adása...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Tallóz...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Fájl:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE 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 (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc Thu Nov 29 14:06:11 2007 @@ -30,7 +30,7 @@ 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 | + CONTROL "VKì¬",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Rg[ðì¬",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ 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 | + CONTROL "ACRÆµÄ\¦",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 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 (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc Thu Nov 29 14:06:11 2007 @@ -1,5 +1,5 @@ /* - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,7 +30,7 @@ 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 | + 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 @@ -38,10 +38,10 @@ 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 | + 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 + PUSHBUTTON "Ã£±â...",IDC_BROWSE,155,88,50,14,NOT WS_VISIBLE + LTEXT "ÆÄÀÏ:",IDC_FILELBL,58,21,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END @@ -61,13 +61,13 @@ 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 + 1, 44, 55, 10 CONTROL "¸µÅ©·Î ºÙ¿©³Ö±â(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, - 6, 63, 55, 10 - LTEXT "&As:", -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 + 1, 61, 69, 10 + LTEXT "´Ù¸¥ ÀÌ¸§À¸·Î(&A):", -1, 67, 25, 53, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 66, 36, 150, 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 Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc Thu Nov 29 14:06:11 2007 @@ -31,7 +31,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Annuleren",IDCANCEL,221,24,66,14 GROUPBOX "Resultaat",IDC_RESULT,7,103,208,41 - CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Creëren",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -39,7 +39,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Als pictogram weergeven",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Als pictogram weergeven",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Bladeren...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Bestandsnaam:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_No.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc Thu Nov 29 14:06:11 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -30,7 +30,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Avbryt",IDCANCEL,221,24,66,14 GROUPBOX "Resultat",IDC_RESULT,7,103,208,41 - CONTROL "Opprett ny",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Opprett ny",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Opprett kontroller",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Legg til kontroller . . .",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Vis som ikon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Vis som ikon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Bla . . .",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Fil:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc Thu Nov 29 14:06:11 2007 @@ -21,7 +21,7 @@ UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 310, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wstaw objekt" +CAPTION "Wstaw obiekt" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | @@ -31,7 +31,7 @@ DEFPUSHBUTTON "OK",IDOK,229,7,66,14 PUSHBUTTON "Anuluj",IDCANCEL,229,24,66,14 GROUPBOX "Wynik",IDC_RESULT,7,103,208,41 - CONTROL "Utwórz nowy",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Utwórz nowy",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Utwórz kontrolkê",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,72,10 @@ -39,7 +39,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Dodaj kontrolkê...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Wywietlaj jako ikonê",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Wywietlaj jako ikonê",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,84,10 PUSHBUTTON "Przegl¹daj...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Plik:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -48,7 +48,7 @@ STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Wstaw nowy objekt %s do dokumentu" + IDS_RESULTOBJDESC "Wstaw nowy obiekt %s do dokumentu" IDS_RESULTFILEOBJDESC "Wstaw zawartoæ pliku jako obiekt do dokumentu. Bêdzie mo¿na go aktywowaæ u¿ywaj¹c programu, który go stworzy³." IDS_BROWSE "Przegl¹daj" IDS_NOTOLEMOD "Plik nie wydaje siê byæ poprawnym modu³em OLE. Nie uda³o siê zarejestrowaæ kontrolki OLE." @@ -63,7 +63,7 @@ LTEXT "ród³o:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "&Wklej", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "Wklej &³¹czê", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "Wklej &³¹cze", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 LTEXT "&Jako:", -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 @@ -83,14 +83,14 @@ STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Wstawia zawartoæ schowka do documentu jako %s." + IDS_PS_PASTE_DATA "Wstawia zawartoæ schowka do dokumentu jako %s." IDS_PS_PASTE_OBJECT "Wstawia zawartoæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Wstawia zawartoæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s. Bêdzie wywietlany jako ikona." - IDS_PS_PASTE_LINK_DATA "Wstawia zawartoæ schowka do documentu jako %s. Dane bêd¹ po³¹czone z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." - IDS_PS_PASTE_LINK_OBJECT "Wstawia zawartoæ schowka do documentu jako obraz. Obraz bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Wstawia do documentu skrót do zawartoci schowka. Skrót bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_PASTE_OBJECT_AS_ICON "Wstawia zawartoæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s. Bêdzie wywietlany jako ikona." + IDS_PS_PASTE_LINK_DATA "Wstawia zawartoæ schowka do dokumentu jako %s. Dane bêd¹ po³¹czone z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_PASTE_LINK_OBJECT "Wstawia zawartoæ schowka do dokumentu jako obraz. Obraz bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Wstawia do documentu skrót do zawartoci schowka. Skrót bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." IDS_PS_NON_OLE "Wstawia zawartoæ schowka do dokumentu" IDS_PS_UNKNOWN_TYPE "Nieznany typ" IDS_PS_UNKNOWN_SRC "Nieznane ród³o" - IDS_PS_UNKNOWN_APP "program który go stworzy³" + IDS_PS_UNKNOWN_APP "program, który go stworzy³" } Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc Thu Nov 29 14:06:11 2007 @@ -31,7 +31,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Cancelar",IDCANCEL,221,24,66,14 GROUPBOX "Resultado",IDC_RESULT,7,103,208,41 - CONTROL "Criar novo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Criar novo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Criar controle",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -39,7 +39,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Arquivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Added: trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Sv… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc Thu Nov 29 14:06:11 2007 @@ -1,0 +1,95 @@ +/* + * Copyright 2007 Daniel Nylander + * + * 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 + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Infoga objekt" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Objekttyp:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Avbryt",IDCANCEL,221,24,66,14 + GROUPBOX "Resultat",IDC_RESULT,7,103,208,41 + CONTROL "Skapa ny",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Create Control",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Skapa från fil",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Visa som ikon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Bläddra...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fil:",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 "Infoga ett nytt %s-objekt i ditt dokument" + IDS_RESULTFILEOBJDESC "Insert the contents of the file as an object into your document so that you may activate it using the program which created it." + IDS_BROWSE "Bläddra" + IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." + IDS_NOTOLEMODCAPTION "Add Control" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paste Special" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Källa:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Klistra &in", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Klistra in &länk", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Som:", -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 "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Avbryt", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Hjälp", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Visa som ikon", 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 "Byt &ikon...", 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 "Resultat", -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 "Inserts the contents of the clipboard into your document as %s." + IDS_PS_PASTE_OBJECT "Inserts the contents of the clipboard into your document so that you can activate it using %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserts the contents of the clipboard into your document so that you can activate it using %s. It will be displayed as an icon." + IDS_PS_PASTE_LINK_DATA "Inserts the contents of the clipboard into your document as %s. The data is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT "Inserts a picture of the clipboard contents into your document. The picture is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserts a shortcut which points to the location of the clipboard contents. The shortcut is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_NON_OLE "Inserts the contents of the clipboard into your document." + IDS_PS_UNKNOWN_TYPE "Unknown Type" + IDS_PS_UNKNOWN_SRC "Unknown Source" + IDS_PS_UNKNOWN_APP "the program which created it" +} Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc Thu Nov 29 14:06:11 2007 @@ -32,7 +32,7 @@ DEFPUSHBUTTON "Tamam",IDOK,221,7,66,14 PUSHBUTTON "Ýptal",IDCANCEL,221,24,66,14 GROUPBOX "Sonuç",IDC_RESULT,7,103,208,41 - CONTROL "Yeni Oluþtur",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Yeni Oluþtur",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 CONTROL "Denetim Oluþtur",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 @@ -40,7 +40,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Denetim Ekle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Simge Olarak Göster",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Simge Olarak Göster",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Gözat...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Dosya:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Modified: trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Uk… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc Thu Nov 29 14:06:11 2007 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,221,24,66,14 GROUPBOX "Ðåçóëüòàò",IDC_RESULT,7,103,208,41 - CONTROL "Ñòâîðèòè íîâèé",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + 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 @@ -28,7 +28,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Äîäàòè åëåìåíò óïðàâë³ííÿ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Ó âèãëÿä³ çíà÷êà",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + 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 Modified: trunk/reactos/dll/win32/oledlg/oledlg_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ro… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_ros.diff (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_ros.diff Thu Nov 29 14:06:11 2007 @@ -58,8 +58,8 @@ =================================================================== --- rsrc.rc (revision 25690) +++ rsrc.rc (revision working copy) -@@ -47,3 +47,4 @@ - #include "oledlg_Pl.rc" +@@ -48,3 +48,4 @@ #include "oledlg_Pt.rc" + #include "oledlg_Sv.rc" #include "oledlg_Tr.rc" +#include "oledlg_Uk.rc" 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 (original) +++ trunk/reactos/dll/win32/oledlg/pastespl.c Thu Nov 29 14:06:11 2007 @@ -83,7 +83,7 @@ TRACE("flags %08x %s\n", flags, flagstr); } -static void dump_pastespecial(LPOLEUIPASTESPECIALW ps) +static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) { UINT i; dump_ps_flags(ps->dwFlags); @@ -363,7 +363,7 @@ EnableWindow(GetDlgItem(hdlg, IDOK), 0); } -static void update_src_text(HWND hdlg, ps_struct_t *ps_struct) +static void update_src_text(HWND hdlg, const ps_struct_t *ps_struct) { WCHAR *str; @@ -403,7 +403,7 @@ EnableWindow(change_icon, 0); } -static void update_result_text(HWND hdlg, ps_struct_t *ps_struct) +static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) { WCHAR resource_txt[200]; UINT res_id; 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 (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Thu Nov 29 14:06:11 2007 @@ -46,5 +46,6 @@ #include "oledlg_No.rc" #include "oledlg_Pl.rc" #include "oledlg_Pt.rc" +#include "oledlg_Sv.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc"

1 0

[winesync] 30877: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:05:00 2007 New Revision: 30877 URL: http://svn.reactos.org/svn/reactos?rev=30877&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rb… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rbuild (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild Thu Nov 29 14:05:00 2007 @@ -1,14 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="oleacc" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="oleacc.spec.def" /> <include base="oleacc">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>kernel32</library> <library>ntdll</library>

1 0

[winesync] 30876: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:04:34 2007 New Revision: 30876 URL: http://svn.reactos.org/svn/reactos?rev=30876&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c Thu Nov 29 14:04:34 2007 @@ -432,7 +432,7 @@ if (lpszInfFile) return FALSE; - + return SQLInstallDriverEx(lpszDriver, NULL, lpszPath, cbPathMax, pcbPathOut, ODBC_INSTALL_COMPLETE, &usage); } Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Thu Nov 29 14:04:34 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true"> <importlibrary definition="odbccp32.spec.def" /> <include base="odbccp32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>ole32</library> <library>advapi32</library>

1 0

[winesync] 30875: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:03:59 2007 New Revision: 30875 URL: http://svn.reactos.org/svn/reactos?rev=30875&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/objsel/factory.c trunk/reactos/dll/win32/objsel/objsel.c trunk/reactos/dll/win32/objsel/objsel.rbuild trunk/reactos/dll/win32/objsel/regsvr.c Modified: trunk/reactos/dll/win32/objsel/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c… ============================================================================== --- trunk/reactos/dll/win32/objsel/factory.c (original) +++ trunk/reactos/dll/win32/objsel/factory.c Thu Nov 29 14:03:59 2007 @@ -62,13 +62,13 @@ { ClassFactoryImpl *This = (ClassFactoryImpl *)iface; ULONG ref; - + TRACE("\n"); if (This == NULL) return E_POINTER; - + ref = InterlockedIncrement(&This->ref); - + if (ref == 1) { InterlockedIncrement(&dll_refs); @@ -85,13 +85,13 @@ { ClassFactoryImpl *This = (ClassFactoryImpl *)iface; ULONG ref; - + TRACE("\n"); if (This == NULL) return E_POINTER; - + ref = InterlockedDecrement(&This->ref); - + if (ref == 0) { InterlockedDecrement(&dll_refs); Modified: trunk/reactos/dll/win32/objsel/objsel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.c (original) +++ trunk/reactos/dll/win32/objsel/objsel.c Thu Nov 29 14:03:59 2007 @@ -202,7 +202,7 @@ { Instance->lpVtbl = &IDsObjectPicker_Vtbl; OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance); - + *ppvObj = Instance; return S_OK; } Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rb… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.rbuild (original) +++ trunk/reactos/dll/win32/objsel/objsel.rbuild Thu Nov 29 14:03:59 2007 @@ -1,14 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="objsel.spec.def" /> <include base="objsel">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>ole32</library> <library>oleaut32</library> Modified: trunk/reactos/dll/win32/objsel/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/regsvr.c (original) +++ trunk/reactos/dll/win32/objsel/regsvr.c Thu Nov 29 14:03:59 2007 @@ -127,9 +127,6 @@ static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -216,7 +213,8 @@ WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -336,16 +334,19 @@ WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -454,71 +455,10 @@ } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { + { &CLSID_DsObjectPicker, "DsObjectPicker", NULL, @@ -527,7 +467,7 @@ "Both", NULL, NULL - }, + }, { NULL } /* list terminator */ };

1 0

[winesync] 30874: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:02:32 2007 New Revision: 30874 URL: http://svn.reactos.org/svn/reactos?rev=30874&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/apibuf.c trunk/reactos/dll/win32/netapi32/ds.c trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.rbuild trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c (original) +++ trunk/reactos/dll/win32/netapi32/access.c Thu Nov 29 14:02:32 2007 @@ -29,6 +29,7 @@ #include "lmaccess.h" #include "lmapibuf.h" #include "lmerr.h" +#include "lmuse.h" #include "ntsecapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -131,7 +132,7 @@ /* Fall through */ case 2: FIXME("Level 2 not implemented.\n"); - /* Fall throught */ + /* Fall through */ case 1: { PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; @@ -177,13 +178,8 @@ break; } - if(su) - { - HeapFree(GetProcessHeap(), 0, su->home_dir); - HeapFree(GetProcessHeap(), 0, su->user_comment); - HeapFree(GetProcessHeap(), 0, su->user_logon_script_path); - HeapFree(GetProcessHeap(), 0, su); - } + HeapFree(GetProcessHeap(), 0, su); + return status; } @@ -448,7 +444,7 @@ name_sz = lstrlenW(sAdminUserName); comment_sz = 1; full_name_sz = 1; - + *pdwSize = sizeof(NET_DISPLAY_USER); *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); @@ -487,7 +483,7 @@ name_sz = lstrlenW(sGuestUserName); comment_sz = 1; full_name_sz = 1; - + *pdwSize = sizeof(NET_DISPLAY_USER); *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); @@ -666,7 +662,7 @@ { FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), debugstr_w(domainname), bufptr); - return NERR_DCNotFound; /* say we can't find a domain controller */ + return NERR_DCNotFound; /* say we can't find a domain controller */ } @@ -684,7 +680,7 @@ * USER_MODALS_INFO_0 struct. * 1 Return logon server and domain controller information. bufptr * points to a USER_MODALS_INFO_1 struct. - * 2 Return domain name and identifier. bufptr points to a + * 2 Return domain name and identifier. bufptr points to a * USER_MODALS_INFO_2 struct. * 3 Return lockout information. bufptr points to a USER_MODALS_INFO_3 * struct. @@ -692,7 +688,7 @@ * * RETURNS * Success: NERR_Success. - * Failure: + * Failure: * ERROR_ACCESS_DENIED - the user does not have access to the info. * NERR_InvalidComputer - computer name is invalid. */ @@ -700,7 +696,7 @@ LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) { TRACE("(%s %d %p)\n", debugstr_w(szServer), level, pbuffer); - + switch (level) { case 0: @@ -779,7 +775,7 @@ LsaFreeMemory(domainInfo); break; - } + } case 3: /* return lockout information */ FIXME("level 3 not implemented!\n"); @@ -833,7 +829,7 @@ return NERR_Success; } -NET_API_STATUS NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) +NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); return NERR_Success; Modified: trunk/reactos/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/apibuf.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/apibuf.c (original) +++ trunk/reactos/dll/win32/netapi32/apibuf.c Thu Nov 29 14:02:32 2007 @@ -62,15 +62,15 @@ LPVOID* NewBuffer) { TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); - if (NewByteCount) + if (NewByteCount) { if (OldBuffer) *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); else *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); return *NewBuffer ? NERR_Success : GetLastError(); - } - else + } + else { if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); *NewBuffer = 0; Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?re… ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c (original) +++ trunk/reactos/dll/win32/netapi32/ds.c Thu Nov 29 14:02:32 2007 @@ -78,7 +78,7 @@ * * PARAMS * lpServer [I] Pointer to UNICODE string with Computername - * InfoLevel [I] Type of data to retrieve + * InfoLevel [I] Type of data to retrieve * Buffer [O] Pointer to to the requested data * * RETURNS Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c Thu Nov 29 14:02:32 2007 @@ -53,14 +53,14 @@ * NetServerEnum (NETAPI32.@) */ NET_API_STATUS WINAPI NetServerEnum( - LPCWSTR servername, + LMCSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, DWORD servertype, - LPCWSTR domain, + LMCSTR domain, LPDWORD resume_handle ) { @@ -75,15 +75,15 @@ * NetServerEnumEx (NETAPI32.@) */ NET_API_STATUS WINAPI NetServerEnumEx( - LPCWSTR ServerName, + LMCSTR ServerName, DWORD Level, LPBYTE *Bufptr, DWORD PrefMaxlen, LPDWORD EntriesRead, LPDWORD totalentries, DWORD servertype, - LPCWSTR domain, - LPCWSTR FirstNameToReturn) + LMCSTR domain, + LMCSTR FirstNameToReturn) { FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(ServerName), Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype, @@ -105,7 +105,7 @@ /************************************************************ * NetStatisticsGet (NETAPI32.@) */ -NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR server, LPWSTR service, +NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, DWORD level, DWORD options, LPBYTE *bufptr) { @@ -157,3 +157,11 @@ } return ret; } + +NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, + LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("stub (%p, %d, %p, %d, %p, %p, %p)\n", server, level, bufptr, prefmaxsize, + entriesread, totalentries, resumehandle); + return ERROR_NOT_SUPPORTED; +} Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Thu Nov 29 14:02:32 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true"> <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>iphlpapi</library> <library>ws2_32</library> Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec Thu Nov 29 14:02:32 2007 @@ -199,7 +199,7 @@ @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) @ stub NetUseDel -@ stub NetUseEnum +@ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr) @ stdcall NetUserChangePassword(wstr wstr wstr wstr) Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c (original) +++ trunk/reactos/dll/win32/netapi32/share.c Thu Nov 29 14:02:32 2007 @@ -47,8 +47,8 @@ * NERR_InvalidComputer Invalid computer name * NERR_UserNotFound User name could not be found. */ -NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName, - LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, +NET_API_STATUS WINAPI NetSessionEnum(LMSTR servername, LMSTR UncClientName, + LMSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) { FIXME("Stub (%s %s %s %d %p %d %p %p %p)\n", debugstr_w(servername), @@ -75,7 +75,7 @@ * On failure it returns a system error code (FIXME: find out which) * */ -NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, +NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) { FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(servername), level, bufptr, Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c Thu Nov 29 14:02:32 2007 @@ -46,7 +46,7 @@ * * Checks whether the server name indicates local machine. */ -BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName) +BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) { if (!ServerName) { @@ -141,7 +141,7 @@ /*********************************************************************** * NetWkstaTransportEnum (NETAPI32.@) */ - + struct WkstaTransportEnumData { UCHAR n_adapt; @@ -189,15 +189,15 @@ if (enumData->n_read < spaceFor) { PWKSTA_TRANSPORT_INFO_0 ti; - LPWSTR transport_name, transport_addr; + LMSTR transport_name, transport_addr; MIB_IFROW ifRow; ti = (PWKSTA_TRANSPORT_INFO_0)(*(enumData->pbuf) + enumData->n_read * sizeof(WKSTA_TRANSPORT_INFO_0)); - transport_name = (LPWSTR)(*(enumData->pbuf) + + transport_name = (LMSTR)(*(enumData->pbuf) + totalLANAs * sizeof(WKSTA_TRANSPORT_INFO_0) + enumData->n_read * MAX_TRANSPORT_NAME * sizeof(WCHAR)); - transport_addr = (LPWSTR)(*(enumData->pbuf) + + transport_addr = (LMSTR)(*(enumData->pbuf) + totalLANAs * (sizeof(WKSTA_TRANSPORT_INFO_0) + MAX_TRANSPORT_NAME * sizeof(WCHAR)) + enumData->n_read * MAX_TRANSPORT_ADDR * sizeof(WCHAR)); @@ -246,14 +246,14 @@ /**********************************************************************/ -NET_API_STATUS WINAPI -NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf, +NET_API_STATUS WINAPI +NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, DWORD prefmaxlen, LPDWORD read_entries, PDWORD total_entries, PDWORD hresume) { NET_API_STATUS ret; - TRACE(":%s, 0x%08x, %p, 0x%08x, %p, %p, %p\n", debugstr_w(ServerName), + TRACE(":%s, 0x%08x, %p, 0x%08x, %p, %p, %p\n", debugstr_w(ServerName), level, pbuf, prefmaxlen, read_entries, total_entries,hresume); if (!NETAPI_IsLocalComputer(ServerName)) { @@ -305,7 +305,7 @@ /************************************************************ * NetWkstaUserGetInfo (NETAPI32.@) */ -NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level, +NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); @@ -321,7 +321,7 @@ (LPVOID *) bufptr); ui = (PWKSTA_USER_INFO_0) *bufptr; - ui->wkui0_username = (LPWSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); + ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); /* get data */ if (!GetUserNameW(ui->wkui0_username, &dwSize)) @@ -381,13 +381,13 @@ oth_domains_sz + logon_server_sz) * sizeof(WCHAR), (LPVOID *) bufptr); ui = (WKSTA_USER_INFO_1 *) *bufptr; - ui->wkui1_username = (LPWSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1)); - ui->wkui1_logon_domain = (LPWSTR) ( + ui->wkui1_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1)); + ui->wkui1_logon_domain = (LMSTR) ( ((PBYTE) ui->wkui1_username) + username_sz * sizeof(WCHAR)); - ui->wkui1_oth_domains = (LPWSTR) ( + ui->wkui1_oth_domains = (LMSTR) ( ((PBYTE) ui->wkui1_logon_domain) + logon_domain_sz * sizeof(WCHAR)); - ui->wkui1_logon_server = (LPWSTR) ( + ui->wkui1_logon_server = (LMSTR) ( ((PBYTE) ui->wkui1_oth_domains) + oth_domains_sz * sizeof(WCHAR)); @@ -418,7 +418,7 @@ (LPVOID *) bufptr); ui = (PWKSTA_USER_INFO_1101) *bufptr; - ui->wkui1101_oth_domains = (LPWSTR)(ui + 1); + ui->wkui1101_oth_domains = (LMSTR)(ui + 1); /* get data */ ui->wkui1101_oth_domains[0] = 0; @@ -469,7 +469,7 @@ return ERROR_INVALID_PARAMETER; } -NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level, +NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { NET_API_STATUS ret; @@ -497,7 +497,7 @@ LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; NTSTATUS NtStatus; - + computerNameLen = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameW(computerName, &computerNameLen); computerNameLen++; /* include NULL terminator */ @@ -524,7 +524,7 @@ OSVERSIONINFOW verInfo; info->wki102_platform_id = PLATFORM_ID_NT; - info->wki102_computername = (LPWSTR)(*bufptr + + info->wki102_computername = (LMSTR)(*bufptr + sizeof(WKSTA_INFO_102)); memcpy(info->wki102_computername, computerName, computerNameLen * sizeof(WCHAR));

1 0

[winesync] 30873: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 14:01:17 2007 New Revision: 30873 URL: http://svn.reactos.org/svn/reactos?rev=30873&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc (with props) Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/mciwnd.c trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc trunk/reactos/dll/win32/msvfw32/rsrc.rc Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c Thu Nov 29 14:01:17 2007 @@ -77,12 +77,12 @@ /*********************************************************************** * DrawDibOpen [MSVFW32.@] */ -HDRAWDIB VFWAPI DrawDibOpen(void) +HDRAWDIB VFWAPI DrawDibOpen(void) { WINE_HDD* whdd; TRACE("(void)\n"); - + whdd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_HDD)); TRACE("=> %p\n", whdd); @@ -98,7 +98,7 @@ /*********************************************************************** * DrawDibClose [MSVFW32.@] */ -BOOL VFWAPI DrawDibClose(HDRAWDIB hdd) +BOOL VFWAPI DrawDibClose(HDRAWDIB hdd) { WINE_HDD* whdd = MSVIDEO_GetHddPtr(hdd); WINE_HDD** p; @@ -126,7 +126,7 @@ /*********************************************************************** * DrawDibEnd [MSVFW32.@] */ -BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd) +BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd) { BOOL ret = TRUE; WINE_HDD *whdd = MSVIDEO_GetHddPtr(hdd); @@ -145,7 +145,7 @@ /*if (whdd->lpvbits) HeapFree(GetProcessHeap(), 0, whdd->lpvbuf);*/ - if (whdd->hMemDC) + if (whdd->hMemDC) { SelectObject(whdd->hMemDC, whdd->hOldDib); DeleteDC(whdd->hMemDC); @@ -155,7 +155,7 @@ if (whdd->hDib) DeleteObject(whdd->hDib); whdd->hDib = 0; - if (whdd->hic) + if (whdd->hic) { ICDecompressEnd(whdd->hic); ICClose(whdd->hic); @@ -177,7 +177,7 @@ LPBITMAPINFOHEADER lpbi, INT dxSrc, INT dySrc, - UINT wFlags) + UINT wFlags) { BOOL ret = TRUE; WINE_HDD *whdd; @@ -199,28 +199,28 @@ if (whdd->begun) DrawDibEnd(hdd); - if (lpbi->biCompression) + if (lpbi->biCompression) { DWORD size = 0; whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS); - if (!whdd->hic) + if (!whdd->hic) { WARN("Could not open IC. biCompression == 0x%08x\n", lpbi->biCompression); ret = FALSE; } - if (ret) + if (ret) { size = ICDecompressGetFormat(whdd->hic, lpbi, NULL); - if (size == ICERR_UNSUPPORTED) + if (size == ICERR_UNSUPPORTED) { WARN("Codec doesn't support GetFormat, giving up.\n"); ret = FALSE; } } - if (ret) + if (ret) { whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, size); @@ -228,18 +228,18 @@ ret = FALSE; } - if (ret) + if (ret) { /* FIXME: Use Ex functions if available? */ if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK) ret = FALSE; - + TRACE("biSizeImage == %d\n", whdd->lpbiOut->biSizeImage); TRACE("biCompression == %d\n", whdd->lpbiOut->biCompression); TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount); } } - else + else { DWORD dwSize; /* No compression */ @@ -249,14 +249,14 @@ memcpy(whdd->lpbiOut, lpbi, dwSize); } - if (ret) + if (ret) { /*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0, whdd->lpbiOut->biSizeImage);*/ whdd->hMemDC = CreateCompatibleDC(hdc); TRACE("Creating: %d, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits); whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut, DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0); - if (whdd->hDib) + if (whdd->hDib) { TRACE("Created: %p,%p\n", whdd->hDib, whdd->lpvbits); } @@ -268,7 +268,7 @@ whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib); } - if (ret) + if (ret) { whdd->hdc = hdc; whdd->dxDst = dxDst; @@ -279,8 +279,8 @@ whdd->dySrc = dySrc; whdd->begun = TRUE; whdd->hpal = 0; - } - else + } + else { if (whdd->hic) ICClose(whdd->hic); @@ -315,7 +315,7 @@ if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL)) FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags); - if (!lpBits) + if (!lpBits) { /* Undocumented? */ lpBits = (LPSTR)lpbi + (WORD)(lpbi->biSize) + (WORD)(num_colours(lpbi)*sizeof(RGBQUAD)); @@ -324,9 +324,9 @@ #define CHANGED(x) (whdd->x != x) - if ((!whdd->begun) || - (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || - (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) + if ((!whdd->begun) || + (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || + (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) { TRACE("Something changed!\n"); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); @@ -334,13 +334,13 @@ #undef CHANGED - if ((dxDst == -1) && (dyDst == -1)) + if ((dxDst == -1) && (dyDst == -1)) { dxDst = dxSrc; dyDst = dySrc; } - if (!(wFlags & DDF_UPDATE)) + if (!(wFlags & DDF_UPDATE)) { DWORD biSizeImage = lpbi->biSizeImage; @@ -348,7 +348,7 @@ if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; - if (lpbi->biCompression) + if (lpbi->biCompression) { DWORD flags = 0; @@ -374,7 +374,7 @@ if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY))) ret = FALSE; - + return ret; } @@ -406,7 +406,7 @@ /*********************************************************************** * DrawDibSetPalette [MSVFW32.@] */ -BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) +BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) { WINE_HDD *whdd; @@ -417,7 +417,7 @@ whdd->hpal = hpal; - if (whdd->begun) + if (whdd->begun) { SelectPalette(whdd->hdc, hpal, 0); RealizePalette(whdd->hdc); @@ -438,7 +438,7 @@ /*********************************************************************** * DrawDibGetPalette [MSVFW32.@] */ -HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) +HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) { WINE_HDD *whdd; @@ -453,7 +453,7 @@ /*********************************************************************** * DrawDibRealize [MSVFW32.@] */ -UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) +UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) { WINE_HDD *whdd; HPALETTE oldPal; @@ -464,7 +464,7 @@ whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; - if (!whdd || !(whdd->begun)) + if (!whdd || !(whdd->begun)) { ret = 0; goto out; Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/mciwnd.c (original) +++ trunk/reactos/dll/win32/msvfw32/mciwnd.c Thu Nov 29 14:01:17 2007 @@ -1185,6 +1185,8 @@ if (!mwi->lasterror) SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMAX, 1, SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0)); + + HeapFree(GetProcessHeap(), 0, cmdW); } if (wMsg == MCIWNDM_SETTIMEFORMATA) Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild Thu Nov 29 14:01:17 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true"> <importlibrary definition="msvfw32.spec.def" /> <include base="msvfw32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>winmm</library> <library>comctl32</library> Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc Thu Nov 29 14:01:17 2007 @@ -43,7 +43,7 @@ CONTROL "&Strumieñ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,81,12 EDITTEXT 895,88,76,22,12 - LTEXT "KB/sec",896,114,78,31,10 + LTEXT "KB/s",896,114,78,31,10 } STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc Thu Nov 29 14:01:17 2007 @@ -1,0 +1,51 @@ +/* + * Copyright 2007 Daniel Nylander + * + * 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 + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Videokomprimering" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14 + + LTEXT "&Komprimering:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figurera...",882,129,36,49,14 + PUSHBUTTON "&Om...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Komprimeringsk&valitet:",886,9,34,80,8 + + CONTROL "&Nyckelbildrutor varje",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Datafrekvens",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Hela bildrutor (okomprimerat)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc Thu Nov 29 14:01:17 2007 @@ -27,4 +27,5 @@ #include "msvfw32_Ko.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" +#include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

[winesync] 30872: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 13:55:24 2007 New Revision: 30872 URL: http://svn.reactos.org/svn/reactos?rev=30872&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/msimg32/msimg32.rbuild Modified: trunk/reactos/dll/win32/msimg32/msimg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32.… ============================================================================== --- trunk/reactos/dll/win32/msimg32/msimg32.rbuild (original) +++ trunk/reactos/dll/win32/msimg32/msimg32.rbuild Thu Nov 29 13:55:24 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true"> <importlibrary definition="msimg32.spec.def" /> <include base="msimg32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>gdi32</library> <library>kernel32</library>

1 0

[winesync] 30871: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: winesync Date: Thu Nov 29 13:50:33 2007 New Revision: 30871 URL: http://svn.reactos.org/svn/reactos?rev=30871&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/mpr/mpr_Bg.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_No.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild Thu Nov 29 13:50:33 2007 @@ -1,13 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true"> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>user32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/mpr/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Bg.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Bg.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Bg.rc Thu Nov 29 13:50:33 2007 @@ -1,7 +1,7 @@ /* - * MPR dll resources + * MPR Bulgarian resource * - * Copyright (C) 2004 Juan Lang + * 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 @@ -27,20 +27,20 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âúâåäåòå ïàðîëà çà ìðåæàòà" +CAPTION "Âúâåäåòå ìðåæîâà ïàðîëà" FONT 8, "MS Shell Dlg" { - LTEXT "Âúâåäåòå ñâîèòå ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðåçñúðâúð", -1, 40, 26, 50, 10 -/* LTEXT "Ñòðàíà", -1, 40, 46, 50, 10 */ + LTEXT "Âúâåäåòå âàøåòî ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Ïðîêñè", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ñúõðàíÿâàíå íà ïàðîëàòà (íåáåçîïàñíî)", IDC_SAVEPASSWORD, + CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Äîáðå", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Îòêàç", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Îòìåíè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ko.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc Thu Nov 29 13:50:33 2007 @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Juan Lang - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,7 +40,7 @@ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (Insecure)", IDC_SAVEPASSWORD, + CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (º¸¾È¿¡ ÁÖÀÇ)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "È®ÀÎ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Ãë¼Ò", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_No.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_No.rc Thu Nov 29 13:50:33 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pl.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Pl.rc Thu Nov 29 13:50:33 2007 @@ -28,7 +28,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wprowad has³o do sieci" +CAPTION "Wpisz has³o sieci" FONT 8, "MS Shell Dlg" { LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 @@ -40,7 +40,7 @@ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Zapamiêtaj to has³o (nie bezpieczne)", IDC_SAVEPASSWORD, + CHECKBOX "&Zapisz to has³o (niebezpieczne)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Sv.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Sv.rc Thu Nov 29 13:50:33 2007 @@ -1,7 +1,7 @@ /* - * MPR dll Swedish resources + * MPR dll resources * - * Copyright (C) 2005 Andreas Bjerkeholt + * Copyright (C) 2007 Daniel Nylander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,10 +15,10 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { @@ -39,7 +39,7 @@ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Spara detta lösenord (Osäkert)", IDC_SAVEPASSWORD, + CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff Thu Nov 29 13:50:33 2007 @@ -2,12 +2,12 @@ =================================================================== --- mpr.rc (revision 23782) +++ mpr.rc (working copy) -@@ -39,4 +39,7 @@ +@@ -39,5 +39,7 @@ #include "mpr_No.rc" #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" -+#include "mpr_Sv.rc" + #include "mpr_Sv.rc" #include "mpr_Tr.rc" +#include "mpr_Uk.rc" Index: mpr_Ru.rc @@ -61,57 +61,6 @@ + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} -Index: mpr_Sv.rc -=================================================================== ---- mpr_Sv.rc (revision 23782) -+++ mpr_Sv.rc (working copy) -@@ -0,0 +1,46 @@ -+/* -+ * MPR dll Swedish resources -+ * -+ * Copyright (C) 2005 Andreas Bjerkeholt -+ * -+ * 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_SWEDISH, SUBLANG_NEUTRAL -+ -+STRINGTABLE DISCARDABLE -+{ -+ IDS_ENTIRENETWORK "Hela nätverket" -+} -+ -+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -+CAPTION "Ange nätverkslösenord" -+FONT 8, "MS Shell Dlg" -+{ -+ LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 40, 6, 150, 15 -+ LTEXT "Proxy", -1, 40, 26, 50, 10 -+/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -+ LTEXT "Användare", -1, 40, 66, 50, 10 -+ LTEXT "Lösenord", -1, 40, 86, 50, 10 -+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 -+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 -+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -+ CHECKBOX "&Spara detta lösenord (Osäkert)", IDC_SAVEPASSWORD, -+ 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -+ PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -+} Index: mpr_Uk.rc =================================================================== --- mpr_Uk.rc (revision 23782) Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=30… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c (original) +++ trunk/reactos/dll/win32/mpr/nps.c Thu Nov 29 13:50:33 2007 @@ -82,7 +82,7 @@ hitem = GetDlgItem( hdlg, IDC_USERNAME ); if( hitem ) GetWindowTextA( hitem, lpAuthDlgStruct->lpUsername, lpAuthDlgStruct->cbUsername ); - + password[0] = 0; hitem = GetDlgItem( hdlg, IDC_PASSWORD ); if( hitem ) @@ -119,7 +119,7 @@ lpAuthDlgStruct->lpOUTitle, lpAuthDlgStruct->lpExplainText); return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), - lpAuthDlgStruct->hwndOwner, NPS_ProxyPasswordDialog, + lpAuthDlgStruct->hwndOwner, NPS_ProxyPasswordDialog, (LPARAM) lpAuthDlgStruct ); } Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c Thu Nov 29 13:50:33 2007 @@ -56,8 +56,9 @@ DWORD i; name = HeapAlloc( GetProcessHeap(), 0, 6+cbResource*2 ); - if( name ) - sprintf( name, "X-%02X-", nType ); + if( !name ) return NULL; + + sprintf( name, "X-%02X-", nType ); for(i=0; i<cbResource; i++) { name[5+i*2]=hex((pbResource[i]&0xf0)>>4); @@ -107,7 +108,7 @@ valname = MPR_GetValueName( pbResource, cbResource, nType ); if( valname ) { - r = RegSetValueExA( hkey, valname, 0, REG_BINARY, + r = RegSetValueExA( hkey, valname, 0, REG_BINARY, (LPBYTE)pbPassword, cbPassword ); if( r ) r = WN_CANCEL; @@ -221,9 +222,9 @@ * * NOTES * the parameter count is verifyed - * + * * This function is a huge security risk, as virii and such can use - * it to grab all the passwords in the cache. It's bad enough to + * it to grab all the passwords in the cache. It's bad enough to * store the passwords (insecurely). * * bpPrefix and cbPrefix are used to filter the returned passwords @@ -306,7 +307,7 @@ entry->cbPassword = data_sz; entry->iEntry = i; entry->nType = nType; - r = RegEnumValueA( hkey, i, NULL, &val_sz, NULL, &type, + r = RegEnumValueA( hkey, i, NULL, &val_sz, NULL, &type, &entry->abResource[val_sz], &data_sz ); if( r == ERROR_SUCCESS ) enumPasswordProc( entry, param ); Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c (original) +++ trunk/reactos/dll/win32/mpr/wnet.c Thu Nov 29 13:50:33 2007 @@ -52,6 +52,7 @@ PF_NPOpenEnum openEnum; PF_NPEnumResource enumResource; PF_NPCloseEnum closeEnum; + PF_NPGetResourceInformation getResourceInformation; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -133,7 +134,7 @@ { static const WCHAR szProviderName[] = { 'N','a','m','e',0 }; PWSTR name = NULL; - + size = 0; RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); if (size) @@ -182,6 +183,10 @@ provider->closeEnum = (PF_NPCloseEnum) GetProcAddress(hLib, "NPCloseEnum"); TRACE("closeEnum is %p\n", provider->closeEnum); + provider->getResourceInformation = (PF_NPGetResourceInformation) + GetProcAddress(hLib, "NPGetResourceInformation"); + TRACE("getResourceInformation is %p\n", + provider->getResourceInformation); if (!provider->openEnum || !provider->enumResource || !provider->closeEnum) { @@ -731,7 +736,7 @@ if (index != BAD_PROVIDER_INDEX) { if (providerTable->table[index].openEnum && - providerTable->table[index].dwEnumScopes & dwScope) + providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; @@ -893,7 +898,7 @@ if (*lpBufferSize < sizeof(NETRESOURCEA)) return WN_MORE_DATA; - if (!providerTable || enumerator->providerIndex >= + if (!providerTable || enumerator->providerIndex >= providerTable->numProviders) ret = WN_NO_MORE_ENTRIES; else @@ -964,6 +969,7 @@ if (enumerator->providerDone) { + DWORD dwEnum = 0; enumerator->providerDone = FALSE; if (enumerator->handle) { @@ -972,10 +978,15 @@ enumerator->handle = NULL; enumerator->providerIndex++; } + if (enumerator->dwScope == RESOURCE_CONNECTED) + dwEnum = WNNC_ENUM_LOCAL; + else if (enumerator->dwScope == RESOURCE_GLOBALNET) + dwEnum = WNNC_ENUM_GLOBAL; + else if (enumerator->dwScope == RESOURCE_CONTEXT) + dwEnum = WNNC_ENUM_CONTEXT; for (; enumerator->providerIndex < providerTable->numProviders && - !(enumerator->dwScope & providerTable->table - [enumerator->providerIndex].dwEnumScopes); - enumerator->providerIndex++) + !(providerTable->table[enumerator->providerIndex].dwEnumScopes + & dwEnum); enumerator->providerIndex++) ; } return enumerator->providerIndex < providerTable->numProviders ? @@ -1275,30 +1286,157 @@ /********************************************************************* * WNetGetResourceInformationA [MPR.@] + * + * See WNetGetResourceInformationW */ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, LPVOID lpBuffer, LPDWORD cbBuffer, LPSTR *lplpSystem ) { - FIXME( "(%p, %p, %p, %p): stub\n", + DWORD ret; + + TRACE( "(%p, %p, %p, %p)\n", lpNetResource, lpBuffer, cbBuffer, lplpSystem ); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + if (!providerTable || providerTable->numProviders == 0) + ret = WN_NO_NETWORK; + else if (lpNetResource) + { + LPNETRESOURCEW lpNetResourceW = NULL; + DWORD size = 1024, count = 1; + DWORD len; + + lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); + ret = _thunkNetResourceArrayAToW(lpNetResource, &count, lpNetResourceW, &size); + if (ret == WN_MORE_DATA) + { + lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpNetResourceW) + ret = _thunkNetResourceArrayAToW(lpNetResource, + &count, lpNetResourceW, &size); + else + ret = WN_OUT_OF_MEMORY; + } + if (ret == WN_SUCCESS) + { + LPWSTR lpSystemW = NULL; + LPVOID lpBufferW; + size = 1024; + lpBufferW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpBufferW) + { + ret = WNetGetResourceInformationW(lpNetResourceW, + lpBufferW, &size, &lpSystemW); + if (ret == WN_MORE_DATA) + { + HeapFree(GetProcessHeap(), 0, lpBufferW); + lpBufferW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpBufferW) + ret = WNetGetResourceInformationW(lpNetResourceW, + lpBufferW, &size, &lpSystemW); + else + ret = WN_OUT_OF_MEMORY; + } + if (ret == WN_SUCCESS) + { + ret = _thunkNetResourceArrayWToA(lpBufferW, + &count, lpBuffer, cbBuffer); + lpNetResourceW = lpBufferW; + size = sizeof(NETRESOURCEA); + size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpRemoteName, + -1, NULL, 0, NULL, NULL); + size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpProvider, + -1, NULL, 0, NULL, NULL); + + len = WideCharToMultiByte(CP_ACP, 0, lpSystemW, + -1, NULL, 0, NULL, NULL); + if ((len) && ( size + len < *cbBuffer)) + { + *lplpSystem = (char*)lpBuffer + *cbBuffer - len; + WideCharToMultiByte(CP_ACP, 0, lpSystemW, -1, + *lplpSystem, len, NULL, NULL); + ret = WN_SUCCESS; + } + else + ret = WN_MORE_DATA; + } + else + ret = WN_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, lpBufferW); + } + else + ret = WN_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, lpSystemW); + } + HeapFree(GetProcessHeap(), 0, lpNetResourceW); + } + else + ret = WN_NO_NETWORK; + + if (ret) + SetLastError(ret); + TRACE("Returning %d\n", ret); + return ret; } /********************************************************************* * WNetGetResourceInformationW [MPR.@] - */ + * + * WNetGetResourceInformationW function identifies the network provider + * that owns the resource and gets information about the type of the resource. + * + * PARAMS: + * lpNetResource [ I] the pointer to NETRESOURCEW structure, that + * defines a network resource. + * lpBuffer [ O] the pointer to buffer, containing result. It + * contains NETRESOURCEW structure and strings to + * which the members of the NETRESOURCEW structure + * point. + * cbBuffer [I/O] the pointer to DWORD number - size of buffer + * in bytes. + * lplpSystem [ O] the pointer to string in the output buffer, + * containing the part of the resource name without + * names of the server and share. + * + * RETURNS: + * NO_ERROR if the function succeeds. System error code if the function fails. + */ + DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, LPDWORD cbBuffer, LPWSTR *lplpSystem ) { - FIXME( "(%p, %p, %p, %p): stub\n", - lpNetResource, lpBuffer, cbBuffer, lplpSystem ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + DWORD ret = WN_NO_NETWORK; + DWORD index; + + TRACE( "(%p, %p, %p, %p)\n", + lpNetResource, lpBuffer, cbBuffer, lplpSystem); + + if (!(lpBuffer)) + ret = WN_OUT_OF_MEMORY; + else + { + /* FIXME: For function value of a variable is indifferent, it does + * search of all providers in a network. + */ + for (index = 0; index < providerTable->numProviders; index++) + { + if(providerTable->table[index].getCaps(WNNC_DIALOG) & + WNNC_DLG_GETRESOURCEINFORMATION) + { + if (providerTable->table[index].getResourceInformation) + ret = providerTable->table[index].getResourceInformation( + lpNetResource, lpBuffer, cbBuffer, lplpSystem); + else + ret = WN_NO_NETWORK; + if (ret == WN_SUCCESS) + break; + } + } + } + if (ret) + SetLastError(ret); + return ret; } /*********************************************************************

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs