Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/06: [BROWSEUI] Add Portuguese (neutral) translation.
by Jose Carlos Jesus 20 Jun '19

20 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7df98d73b32486b805f69… commit 7df98d73b32486b805f697567f6415d19ddb9ece Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jun 20 09:22:43 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 20 17:15:15 2019 +0200 [BROWSEUI] Add Portuguese (neutral) translation. --- dll/win32/browseui/browseui.rc | 3 ++ dll/win32/browseui/lang/pt-BR.rc | 4 +-- dll/win32/browseui/lang/{pt-BR.rc => pt-PT.rc} | 46 +++++++++++++------------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index 6f307a46ca..7af77a53e3 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -95,6 +95,9 @@ IDR_TASKBARLIST REGISTRY "res/taskbarlist.rgs" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index b9eaa654de..4f24d1015b 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Brazilian Portuguese translation by Edison Henrique Andreassy (ehasis(a)hotmail.com) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN /* Menus */ @@ -106,7 +106,7 @@ BEGIN END MENUITEM "&Open Folder", IDM_OPEN_FOLDER MENUITEM "&Show Text", IDM_SHOW_TEXT - END + END END /* Dialogs */ diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-PT.rc similarity index 85% copy from dll/win32/browseui/lang/pt-BR.rc copy to dll/win32/browseui/lang/pt-PT.rc index b9eaa654de..fcf94690a7 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -41,7 +41,7 @@ BEGIN BEGIN MENUITEM "&Pesquisa\tCtrl+E", IDM_EXPLORERBAR_SEARCH MENUITEM "&Favoritos\tCtrl+I", IDM_EXPLORERBAR_FAVORITES - MENUITEM "&Media", IDM_EXPLORERBAR_MEDIA + MENUITEM "&Média", IDM_EXPLORERBAR_MEDIA MENUITEM "&Histórico\tCtrl+H", IDM_EXPLORERBAR_HISTORY MENUITEM "P&astas", IDM_EXPLORERBAR_FOLDERS MENUITEM "", IDM_EXPLORERBAR_SEPARATOR @@ -55,7 +55,7 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Página inicial\tAlt+Home", IDM_GOTO_HOMEPAGE END - MENUITEM "Atuali&zar", IDM_VIEW_REFRESH + MENUITEM "Actuali&zar", IDM_VIEW_REFRESH END POPUP "&Favoritos", FCIDM_MENU_FAVORITES BEGIN @@ -66,8 +66,8 @@ BEGIN END POPUP "F&erramentas", FCIDM_MENU_TOOLS BEGIN - MENUITEM "&Maper unidade de rede...", IDM_TOOLS_MAPNETWORKDRIVE - MENUITEM "&Desconectar unidade de rede...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "&Mapear unidades de rede...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "&Desligar unidade de rede...", IDM_TOOLS_DISCONNECTNETWORKDRIVE MENUITEM "&Sincrinizar...", IDM_TOOLS_SYNCHRONIZE MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Opções de pasta...", IDM_TOOLS_FOLDEROPTIONS @@ -91,22 +91,22 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w Title", IDM_BAND_TITLE - MENUITEM "&Close Toolbar", IDM_BAND_CLOSE + MENUITEM "Mostrar título", IDM_BAND_TITLE + MENUITEM "&Fechar barra de ferramentas", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "&Vista", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "Icones &grandes", IDM_LARGE_ICONS + MENUITEM "Icones &pequenos", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT - END + MENUITEM "&Abrir pasta", IDM_OPEN_FOLDER + MENUITEM "&Exibir texto", IDM_SHOW_TEXT + END END /* Dialogs */ @@ -158,13 +158,13 @@ END STRINGTABLE BEGIN - IDS_CANCELLING "Cancelando..." + IDS_CANCELLING "A cancelar..." IDS_REMAINING "Restante" END STRINGTABLE BEGIN - 800 "Contém comandos para trabalhar com os itens selecionados." + 800 "Contém comandos para trabalhar com os itens seleccionados." END STRINGTABLE @@ -195,8 +195,8 @@ END STRINGTABLE BEGIN - 9121 "Conecta à unidade de rede." - 9122 "Faz a desconexão de uma unidade de rede." + 9121 "Liga à unidade de rede." + 9122 "Desliga uma unidade de rede." END STRINGTABLE @@ -216,7 +216,7 @@ END STRINGTABLE BEGIN 9362 "Exibe o conteúdo da pasta 'Favoritos'." - 9363 "Adiciona a página atual à lista de favoritos." + 9363 "Adiciona a página actual à lista de favoritos." END STRINGTABLE @@ -254,7 +254,7 @@ END STRINGTABLE BEGIN IDS_NOTEXTLABELS "Sem rótulos de texto" - IDS_SELECTIVETEXTONRIGHT "Texto seletivo à direita" + IDS_SELECTIVETEXTONRIGHT "Texto selectivo à direita" END STRINGTABLE @@ -288,17 +288,17 @@ STRINGTABLE BEGIN IDS_BACK "Voltar para %s" IDS_FORWARD "Avançar para %s" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "Opções de pasta" END STRINGTABLE BEGIN - IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Atualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Tela inteira|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" + IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Actualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Tela inteira|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "Escolha uma pasta" + IDS_TOOLBAR_ERR_TITLE "Barra de ferramentas" + IDS_TOOLBAR_ERR_TEXT "Não pode criar a barra de ferramentas." END

1 0

[reactos] 01/06: [ACLUI] Add Portuguese (neutral) translation.
by Jose Carlos Jesus 20 Jun '19

20 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64785cf7d359375f28102… commit 64785cf7d359375f281029301efd5297cf23ad8b Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jun 20 09:09:44 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 20 17:15:14 2019 +0200 [ACLUI] Add Portuguese (neutral) translation. --- dll/win32/aclui/aclui.rc | 5 ++++- dll/win32/aclui/lang/pt-PT.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dll/win32/aclui/aclui.rc b/dll/win32/aclui/aclui.rc index e0fbedfea7..aa98d59473 100644 --- a/dll/win32/aclui/aclui.rc +++ b/dll/win32/aclui/aclui.rc @@ -68,6 +68,9 @@ IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -94,4 +97,4 @@ IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif diff --git a/dll/win32/aclui/lang/pt-PT.rc b/dll/win32/aclui/lang/pt-PT.rc new file mode 100644 index 0000000000..ab5fa539a8 --- /dev/null +++ b/dll/win32/aclui/lang/pt-PT.rc @@ -0,0 +1,31 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Seguran�a" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nome do &group ou utilizadore:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Propriet�rio:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + PUSHBUTTON "A&dicionar...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&Remover", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "Permitir", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Recusar", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Para permiss�es especiais ou defini��es avan�adas, clique em Avan�adas.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "A&van�adas", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE +BEGIN + IDS_PSP_TITLE "Permiss�es para %1" + IDS_UNKNOWN "Desconhecido" + IDS_SPECIAL_PERMISSIONS "Permiss�es especiais" + IDS_PERMISSIONS_FOR "Permiss�es para %1" + IDS_PERMISSIONS "Permiss�es" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +END

1 0

[reactos] 01/01: Create FUNDING.yml (#1658)
by Filip Š 20 Jun '19

20 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=242b4b0e722484a1ebdf0… commit 242b4b0e722484a1ebdf0814260c0ff3b228f7f1 Author: Filip Š <filip.stamcar(a)hotmail.com> AuthorDate: Thu Jun 20 16:07:06 2019 +0200 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 20 23:07:06 2019 +0900 Create FUNDING.yml (#1658) GitHub now supports sponsorships in the repository. https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-rep… --- .github/FUNDING.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000000..283f9f1195 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +liberapay: ReactOS +custom: https://reactos.org/donating

1 0

[reactos] 01/01: [WIN32SS][NTGDI] usWinAscent and usWinDescent must be treated as signed (#1670)
by Katayama Hirofumi MZ 20 Jun '19

20 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=641a0ea99be50975e7949… commit 641a0ea99be50975e79498e48ae73b2edfc5c616 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 20 18:58:45 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 20 18:58:45 2019 +0900 [WIN32SS][NTGDI] usWinAscent and usWinDescent must be treated as signed (#1670) TT_OS2.usWinAscent and TT_OS2.usWinDescent must be treated as FT_Short. These values affect font metrics. This PR will fix CORE-14994. --- win32ss/gdi/ntgdi/freetype.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 6a2fae1ed7..027ccdb66e 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1868,21 +1868,17 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, return; } - if (pOS2->usWinAscent + pOS2->usWinDescent == 0) + if ((FT_Short)pOS2->usWinAscent + (FT_Short)pOS2->usWinDescent == 0) { Ascent = pHori->Ascender; Descent = -pHori->Descender; } else { - Ascent = pOS2->usWinAscent; - Descent = pOS2->usWinDescent; + Ascent = (FT_Short)pOS2->usWinAscent; + Descent = (FT_Short)pOS2->usWinDescent; } - if (FontGDI->Magic != FONTGDI_MAGIC) - { - IntRequestFontSize(NULL, FontGDI, 0, 0); - } TM->tmAscent = FontGDI->tmAscent; TM->tmDescent = FontGDI->tmDescent; TM->tmHeight = TM->tmAscent + TM->tmDescent; @@ -2649,7 +2645,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, } Ntm->ntmSizeEM = Otm->otmEMSquare; - Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent; + Ntm->ntmCellHeight = (FT_Short)pOS2->usWinAscent + (FT_Short)pOS2->usWinDescent; Ntm->ntmAvgWidth = 0; ExFreePoolWithTag(Otm, GDITAG_TEXT); @@ -3273,12 +3269,20 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) return FT_Request_Size(face, &req); } - /* See also: https://docs.microsoft.com/en-us/typography/opentype/spec/os2#fsselection */ + /* + * NOTE: We cast TT_OS2.usWinAscent and TT_OS2.usWinDescent to signed FT_Short. + * Why? See: https://docs.microsoft.com/en-us/typography/opentype/spec/os2#uswindescent + * + * > usWinDescent is "usually" a positive value ... + * + * We can read it as "not always". See CORE-14994. + * See also: https://docs.microsoft.com/en-us/typography/opentype/spec/os2#fsselection + */ #define FM_SEL_USE_TYPO_METRICS 0x80 if (lfHeight > 0) { /* case (A): lfHeight is positive */ - Sum = pOS2->usWinAscent + pOS2->usWinDescent; + Sum = (FT_Short)pOS2->usWinAscent + (FT_Short)pOS2->usWinDescent; if (Sum == 0 || (pOS2->fsSelection & FM_SEL_USE_TYPO_METRICS)) { Ascent = pHori->Ascender; @@ -3287,8 +3291,8 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) } else { - Ascent = pOS2->usWinAscent; - Descent = pOS2->usWinDescent; + Ascent = (FT_Short)pOS2->usWinAscent; + Descent = (FT_Short)pOS2->usWinDescent; } FontGDI->tmAscent = FT_MulDiv(lfHeight, Ascent, Sum); @@ -3306,8 +3310,8 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) } else { - FontGDI->tmAscent = FT_MulDiv(-lfHeight, pOS2->usWinAscent, face->units_per_EM); - FontGDI->tmDescent = FT_MulDiv(-lfHeight, pOS2->usWinDescent, face->units_per_EM); + FontGDI->tmAscent = FT_MulDiv(-lfHeight, (FT_Short)pOS2->usWinAscent, face->units_per_EM); + FontGDI->tmDescent = FT_MulDiv(-lfHeight, (FT_Short)pOS2->usWinDescent, face->units_per_EM); } FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent; FontGDI->tmInternalLeading = FontGDI->tmHeight + lfHeight;

1 0

[reactos] 01/01: [NETCFGX] Add the interfaces INetCfgBindingInterface and IEnumNetCfgBindingInterface (stubs only).
by Eric Kohl 19 Jun '19

19 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e57f103d53d35b0093112… commit e57f103d53d35b0093112f73102ca106a51830e7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 19 22:38:31 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 19 22:38:31 2019 +0200 [NETCFGX] Add the interfaces INetCfgBindingInterface and IEnumNetCfgBindingInterface (stubs only). --- dll/win32/netcfgx/CMakeLists.txt | 1 + dll/win32/netcfgx/netcfgbindinginterface_iface.c | 301 +++++++++++++++++++++++ dll/win32/netcfgx/netcfgbindingpath_iface.c | 2 +- dll/win32/netcfgx/precomp.h | 4 + 4 files changed, 307 insertions(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 79ff37cc4d..bde3f69f9d 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE classfactory.c installer.c netcfg_iface.c + netcfgbindinginterface_iface.c netcfgbindingpath_iface.c inetcfgcomp_iface.c tcpipconf_notify.c diff --git a/dll/win32/netcfgx/netcfgbindinginterface_iface.c b/dll/win32/netcfgx/netcfgbindinginterface_iface.c new file mode 100644 index 0000000000..7258399d01 --- /dev/null +++ b/dll/win32/netcfgx/netcfgbindinginterface_iface.c @@ -0,0 +1,301 @@ +#include "precomp.h" + +typedef struct +{ + const INetCfgBindingInterface *lpVtbl; + LONG ref; +} INetCfgBindingInterfaceImpl; + +typedef struct +{ + const IEnumNetCfgBindingInterface *lpVtbl; + LONG ref; +} IEnumNetCfgBindingInterfaceImpl; + + +/*************************************************************** + * INetCfgBindingInterface + */ + +HRESULT +WINAPI +INetCfgBindingInterface_fnQueryInterface( + INetCfgBindingInterface *iface, + REFIID iid, + LPVOID *ppvObj) +{ + INetCfgBindingInterfaceImpl *This = (INetCfgBindingInterfaceImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetCfgBindingInterface)) + { + *ppvObj = This; + return S_OK; + } + + return E_NOINTERFACE; +} + +ULONG +WINAPI +INetCfgBindingInterface_fnAddRef( + INetCfgBindingInterface *iface) +{ + INetCfgBindingInterfaceImpl *This = (INetCfgBindingInterfaceImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +WINAPI +INetCfgBindingInterface_fnRelease( + INetCfgBindingInterface *iface) +{ + INetCfgBindingInterfaceImpl *This = (INetCfgBindingInterfaceImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree(This); + } + return refCount; +} + +HRESULT +WINAPI +INetCfgBindingInterface_fnGetName( + INetCfgBindingInterface *iface, + LPWSTR *ppszwInterfaceName) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingInterface_fnGetUpperComponent( + INetCfgBindingInterface *iface, + INetCfgComponent **ppnccItem) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingInterface_fnGetLowerComponent( + INetCfgBindingInterface *iface, + INetCfgComponent **ppnccItem) +{ + return E_NOTIMPL; +} + +static const INetCfgBindingInterfaceVtbl vt_NetCfgBindingInterface = +{ + INetCfgBindingInterface_fnQueryInterface, + INetCfgBindingInterface_fnAddRef, + INetCfgBindingInterface_fnRelease, + INetCfgBindingInterface_fnGetName, + INetCfgBindingInterface_fnGetUpperComponent, + INetCfgBindingInterface_fnGetLowerComponent, +}; + +HRESULT +WINAPI +INetCfgBindingInterface_Constructor( + IUnknown *pUnkOuter, + REFIID riid, + LPVOID *ppv) +{ + INetCfgBindingInterfaceImpl *This; + + if (!ppv) + return E_POINTER; + + This = (INetCfgBindingInterfaceImpl *)CoTaskMemAlloc(sizeof(INetCfgBindingInterfaceImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const INetCfgBindingInterface*)&vt_NetCfgBindingInterface; + + if (!SUCCEEDED(INetCfgBindingInterface_QueryInterface((INetCfgBindingInterface*)This, riid, ppv))) + { + return E_NOINTERFACE; + } + + INetCfgBindingInterface_Release((INetCfgBindingInterface*)This); + return S_OK; +} + + +/*************************************************************** + * IEnumNetCfgBindingInterface + */ + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_fnQueryInterface( + IEnumNetCfgBindingInterface *iface, + REFIID iid, + LPVOID *ppvObj) +{ + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_IEnumNetCfgBindingInterface)) + { + *ppvObj = This; + return S_OK; + } + + return E_NOINTERFACE; +} + + +ULONG +WINAPI +IEnumNetCfgBindingInterface_fnAddRef( + IEnumNetCfgBindingInterface *iface) +{ + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +WINAPI +IEnumNetCfgBindingInterface_fnRelease( + IEnumNetCfgBindingInterface *iface) +{ + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + return refCount; +} + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_fnNext( + IEnumNetCfgBindingInterface *iface, + ULONG celt, + INetCfgBindingInterface **rgelt, + ULONG *pceltFetched) +{ +#if 0 + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + HRESULT hr; + + if (!iface || !rgelt) + return E_POINTER; + + if (celt != 1) + return E_INVALIDARG; + + if (!This->pCurrent) + return S_FALSE; + + hr = INetCfgBindingInterface_Constructor(NULL, &IID_INetCfgBindingInterface, (LPVOID*)rgelt); + if (SUCCEEDED(hr)) + { + This->pCurrent = This->pCurrent->pNext; + if (pceltFetched) + *pceltFetched = 1; + } + return hr; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_fnSkip( + IEnumNetCfgBindingInterface *iface, + ULONG celt) +{ +#if 0 + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + + if (!This->pCurrent) + return S_FALSE; + + while (celt-- > 0 && This->pCurrent) + This->pCurrent = This->pCurrent->pNext; + + if (!celt) + return S_OK; + else + return S_FALSE; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_fnReset( + IEnumNetCfgBindingInterface *iface) +{ +#if 0 + IEnumNetCfgBindingInterfaceImpl *This = (IEnumNetCfgBindingInterfaceImpl*)iface; + + This->pCurrent = This->pHead; + return S_OK; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_fnClone( + IEnumNetCfgBindingInterface *iface, + IEnumNetCfgBindingInterface **ppenum) +{ + return E_NOTIMPL; +} + +static const IEnumNetCfgBindingInterfaceVtbl vt_EnumNetCfgBindingInterface = +{ + IEnumNetCfgBindingInterface_fnQueryInterface, + IEnumNetCfgBindingInterface_fnAddRef, + IEnumNetCfgBindingInterface_fnRelease, + IEnumNetCfgBindingInterface_fnNext, + IEnumNetCfgBindingInterface_fnSkip, + IEnumNetCfgBindingInterface_fnReset, + IEnumNetCfgBindingInterface_fnClone +}; + +HRESULT +WINAPI +IEnumNetCfgBindingInterface_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + IEnumNetCfgBindingInterfaceImpl *This; + + if (!ppv) + return E_POINTER; + + This = (IEnumNetCfgBindingInterfaceImpl *)CoTaskMemAlloc(sizeof(IEnumNetCfgBindingInterfaceImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const IEnumNetCfgBindingInterface*)&vt_EnumNetCfgBindingInterface; +#if 0 + This->pCurrent = pItem; + This->pHead = pItem; + This->pNCfg = pNCfg; +#endif + + if (!SUCCEEDED (IEnumNetCfgBindingInterface_QueryInterface((INetCfgBindingInterface*)This, riid, ppv))) + { + IEnumNetCfgBindingInterface_Release((INetCfg*)This); + return E_NOINTERFACE; + } + + IEnumNetCfgBindingInterface_Release((IEnumNetCfgBindingInterface*)This); + return S_OK; +} diff --git a/dll/win32/netcfgx/netcfgbindingpath_iface.c b/dll/win32/netcfgx/netcfgbindingpath_iface.c index ad5f982cb4..6ca2ad27ed 100644 --- a/dll/win32/netcfgx/netcfgbindingpath_iface.c +++ b/dll/win32/netcfgx/netcfgbindingpath_iface.c @@ -131,7 +131,7 @@ INetCfgBindingPath_fnEnumBindingInterfaces( INetCfgBindingPath *iface, IEnumNetCfgBindingInterface **ppenumInterface) { - return E_NOTIMPL; + return IEnumNetCfgBindingInterface_Constructor(NULL, &IID_IEnumNetCfgBindingInterface, (LPVOID *)ppenumInterface); } static const INetCfgBindingPathVtbl vt_NetCfgBindingPath = diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index efb5d6439f..4230377bd8 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -64,6 +64,10 @@ extern HINSTANCE netcfgx_hInstance; HRESULT WINAPI INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem,INetCfg * iface); HRESULT WINAPI IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * iface); +/* netcfgbindinginterface_iface.c */ +HRESULT WINAPI INetCfgBindingInterface_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); +HRESULT WINAPI IEnumNetCfgBindingInterface_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); + /* netcfgbindingpath_iface.c */ HRESULT WINAPI INetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI IEnumNetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, DWORD dwFlags);

1 0

[reactos] 02/02: [EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262.
by Andreas Maier 19 Jun '19

19 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d6c9e844c9b5e8a33344… commit 8d6c9e844c9b5e8a33344c9768e0d2fa305445c5 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Tue Jun 18 22:40:27 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 19 20:37:04 2019 +0200 [EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262. In CNotifyToolbar::AddButton tbBtn.iBitmap (imagelist-index) was inialised with 0. Tigthvnc adds the icon wihtout NIF_ICON flag. So the wrong icon index was kept and later replaced. --- base/shell/explorer/syspager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 2186933150..8d4f9145ce 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -742,6 +742,7 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) tbBtn.dwData = (DWORD_PTR)notifyItem; tbBtn.iString = (INT_PTR) text; tbBtn.idCommand = GetButtonCount(); + tbBtn.iBitmap = -1; if (iconData->uFlags & NIF_STATE) {

1 0

[reactos] 01/02: [EXPLORER] fix traces
by Andreas Maier 19 Jun '19

19 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7796df375a29c2881803d… commit 7796df375a29c2881803de4d4ce6e4b0d43245ae Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Tue Jun 18 21:00:43 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 19 20:37:04 2019 +0200 [EXPLORER] fix traces --- base/shell/explorer/syspager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 44ccff9b90..2186933150 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -449,14 +449,14 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam) { // We've been kicked, we have updates to our list (or we're exiting the thread) if (This->m_Loop) - TRACE("Updating watched icon list"); + TRACE("Updating watched icon list\n"); } else if ((Status >= WAIT_OBJECT_0 + 1) && (Status < Size)) { IconWatcherData *Icon; Icon = This->GetListEntry(NULL, WatchList[Status], false); - TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf", Icon->ProcessId); + TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf\n", Icon->ProcessId); TRAYNOTIFYDATAW tnid = {0}; tnid.dwSignature = NI_NOTIFY_SIG; @@ -837,7 +837,7 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData) InternalIconData * notifyItem; TBBUTTONINFO tbbi = { 0 }; - TRACE("Updating icon %d from hWnd %08x flags%s%s state%s%s", + TRACE("Updating icon %d from hWnd %08x flags%s%s state%s%s\n", iconData->uID, iconData->hWnd, (iconData->uFlags & NIF_ICON) ? " ICON" : "", (iconData->uFlags & NIF_STATE) ? " STATE" : "", @@ -847,7 +847,7 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData) int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); if (index < 0) { - WARN("Icon %d from hWnd %08x DOES NOT EXIST!", iconData->uID, iconData->hWnd); + WARN("Icon %d from hWnd %08x DOES NOT EXIST!\n", iconData->uID, iconData->hWnd); return AddButton(iconData); } @@ -946,7 +946,7 @@ BOOL CNotifyToolbar::RemoveButton(_In_ CONST NOTIFYICONDATA *iconData) int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); if (index < 0) { - TRACE("Icon %d from hWnd %08x ALREADY MISSING!", iconData->uID, iconData->hWnd); + TRACE("Icon %d from hWnd %08x ALREADY MISSING!\n", iconData->uID, iconData->hWnd); return FALSE; }

1 0

[reactos] 01/01: [NETCFGX] Add the interfaces INetCfgBindingPath and IEnumNetCfgBindingPath (stubs only).
by Eric Kohl 18 Jun '19

18 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec9c8fdf258b9204e9cb4… commit ec9c8fdf258b9204e9cb4d855989aaa776a31882 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jun 18 22:35:46 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jun 18 22:35:46 2019 +0200 [NETCFGX] Add the interfaces INetCfgBindingPath and IEnumNetCfgBindingPath (stubs only). --- dll/win32/netcfgx/CMakeLists.txt | 1 + dll/win32/netcfgx/inetcfgcomp_iface.c | 2 +- dll/win32/netcfgx/netcfgbindingpath_iface.c | 350 ++++++++++++++++++++++++++++ dll/win32/netcfgx/precomp.h | 4 + 4 files changed, 356 insertions(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 99313a57a4..79ff37cc4d 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE classfactory.c installer.c netcfg_iface.c + netcfgbindingpath_iface.c inetcfgcomp_iface.c tcpipconf_notify.c propertypage.c diff --git a/dll/win32/netcfgx/inetcfgcomp_iface.c b/dll/win32/netcfgx/inetcfgcomp_iface.c index 76c8f8dda1..3f72f980a1 100644 --- a/dll/win32/netcfgx/inetcfgcomp_iface.c +++ b/dll/win32/netcfgx/inetcfgcomp_iface.c @@ -111,7 +111,7 @@ INetCfgComponentBindings_fnEnumBindingPaths( DWORD dwFlags, IEnumNetCfgBindingPath **ppIEnum) { - return E_NOTIMPL; + return IEnumNetCfgBindingPath_Constructor(NULL, &IID_IEnumNetCfgBindingPath, (LPVOID *)ppIEnum, dwFlags); } HRESULT diff --git a/dll/win32/netcfgx/netcfgbindingpath_iface.c b/dll/win32/netcfgx/netcfgbindingpath_iface.c new file mode 100644 index 0000000000..ad5f982cb4 --- /dev/null +++ b/dll/win32/netcfgx/netcfgbindingpath_iface.c @@ -0,0 +1,350 @@ +#include "precomp.h" + +typedef struct +{ + const INetCfgBindingPath *lpVtbl; + LONG ref; +} INetCfgBindingPathImpl; + +typedef struct +{ + const IEnumNetCfgBindingPath *lpVtbl; + LONG ref; +} IEnumNetCfgBindingPathImpl; + + +/*************************************************************** + * INetCfgBindingPath + */ + +HRESULT +WINAPI +INetCfgBindingPath_fnQueryInterface( + INetCfgBindingPath *iface, + REFIID iid, + LPVOID *ppvObj) +{ + INetCfgBindingPathImpl *This = (INetCfgBindingPathImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetCfgBindingPath)) + { + *ppvObj = This; + return S_OK; + } + + return E_NOINTERFACE; +} + +ULONG +WINAPI +INetCfgBindingPath_fnAddRef( + INetCfgBindingPath * iface) +{ + INetCfgBindingPathImpl * This = (INetCfgBindingPathImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +WINAPI +INetCfgBindingPath_fnRelease( + INetCfgBindingPath *iface) +{ + INetCfgBindingPathImpl *This = (INetCfgBindingPathImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree(This); + } + return refCount; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnIsSamePathAs( + INetCfgBindingPath *iface, + INetCfgBindingPath *pPath) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnIsSubPathOf( + INetCfgBindingPath *iface, + INetCfgBindingPath *pPath) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnIsEnabled( + INetCfgBindingPath *iface) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnEnable( + INetCfgBindingPath *iface, + BOOL fEnable) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnGetPathToken( + INetCfgBindingPath *iface, + LPWSTR *ppszwPathToken) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnGetOwner( + INetCfgBindingPath *iface, + INetCfgComponent **ppComponent) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnGetDepth( + INetCfgBindingPath *iface, + ULONG *pcInterfaces) +{ + return E_NOTIMPL; +} + +HRESULT +WINAPI +INetCfgBindingPath_fnEnumBindingInterfaces( + INetCfgBindingPath *iface, + IEnumNetCfgBindingInterface **ppenumInterface) +{ + return E_NOTIMPL; +} + +static const INetCfgBindingPathVtbl vt_NetCfgBindingPath = +{ + INetCfgBindingPath_fnQueryInterface, + INetCfgBindingPath_fnAddRef, + INetCfgBindingPath_fnRelease, + INetCfgBindingPath_fnIsSamePathAs, + INetCfgBindingPath_fnIsSubPathOf, + INetCfgBindingPath_fnIsEnabled, + INetCfgBindingPath_fnEnable, + INetCfgBindingPath_fnGetPathToken, + INetCfgBindingPath_fnGetOwner, + INetCfgBindingPath_fnGetDepth, + INetCfgBindingPath_fnEnumBindingInterfaces, +}; + +HRESULT +WINAPI +INetCfgBindingPath_Constructor( + IUnknown *pUnkOuter, + REFIID riid, + LPVOID *ppv) +{ + INetCfgBindingPathImpl *This; + + if (!ppv) + return E_POINTER; + + This = (INetCfgBindingPathImpl *)CoTaskMemAlloc(sizeof(INetCfgBindingPathImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const INetCfgBindingPath*)&vt_NetCfgBindingPath; + + if (!SUCCEEDED (INetCfgBindingPath_QueryInterface ((INetCfgBindingPath*)This, riid, ppv))) + { + return E_NOINTERFACE; + } + + INetCfgBindingPath_Release((INetCfgBindingPath*)This); + return S_OK; +} + + +/*************************************************************** + * IEnumNetCfgBindingPath + */ + +HRESULT +WINAPI +IEnumNetCfgBindingPath_fnQueryInterface( + IEnumNetCfgBindingPath *iface, + REFIID iid, + LPVOID *ppvObj) +{ + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_IEnumNetCfgBindingPath)) + { + *ppvObj = This; + return S_OK; + } + + return E_NOINTERFACE; +} + + +ULONG +WINAPI +IEnumNetCfgBindingPath_fnAddRef( + IEnumNetCfgBindingPath *iface) +{ + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +WINAPI +IEnumNetCfgBindingPath_fnRelease( + IEnumNetCfgBindingPath *iface) +{ + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + return refCount; +} + +HRESULT +WINAPI +IEnumNetCfgBindingPath_fnNext( + IEnumNetCfgBindingPath *iface, + ULONG celt, + INetCfgBindingPath **rgelt, + ULONG *pceltFetched) +{ +#if 0 + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + HRESULT hr; + + if (!iface || !rgelt) + return E_POINTER; + + if (celt != 1) + return E_INVALIDARG; + + if (!This->pCurrent) + return S_FALSE; + + hr = INetCfgBindingPath_Constructor (NULL, &IID_INetCfgComponent, (LPVOID*)rgelt); + if (SUCCEEDED(hr)) + { + This->pCurrent = This->pCurrent->pNext; + if (pceltFetched) + *pceltFetched = 1; + } + return hr; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingPath_fnSkip( + IEnumNetCfgBindingPath *iface, + ULONG celt) +{ +#if 0 + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + + if (!This->pCurrent) + return S_FALSE; + + while (celt-- > 0 && This->pCurrent) + This->pCurrent = This->pCurrent->pNext; + + if (!celt) + return S_OK; + else + return S_FALSE; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingPath_fnReset( + IEnumNetCfgBindingPath *iface) +{ +#if 0 + IEnumNetCfgBindingPathImpl *This = (IEnumNetCfgBindingPathImpl*)iface; + + This->pCurrent = This->pHead; + return S_OK; +#endif + + return E_NOTIMPL; +} + +HRESULT +WINAPI +IEnumNetCfgBindingPath_fnClone( + IEnumNetCfgBindingPath *iface, + IEnumNetCfgBindingPath **ppenum) +{ + return E_NOTIMPL; +} + +static const IEnumNetCfgBindingPathVtbl vt_EnumNetCfgBindingPath = +{ + IEnumNetCfgBindingPath_fnQueryInterface, + IEnumNetCfgBindingPath_fnAddRef, + IEnumNetCfgBindingPath_fnRelease, + IEnumNetCfgBindingPath_fnNext, + IEnumNetCfgBindingPath_fnSkip, + IEnumNetCfgBindingPath_fnReset, + IEnumNetCfgBindingPath_fnClone +}; + +HRESULT +WINAPI +IEnumNetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, DWORD dwFlags) +{ + IEnumNetCfgBindingPathImpl *This; + + if (!ppv) + return E_POINTER; + + This = (IEnumNetCfgBindingPathImpl *)CoTaskMemAlloc(sizeof(IEnumNetCfgBindingPathImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const IEnumNetCfgBindingPath*)&vt_EnumNetCfgBindingPath; +#if 0 + This->pCurrent = pItem; + This->pHead = pItem; + This->pNCfg = pNCfg; +#endif + + if (!SUCCEEDED (IEnumNetCfgBindingPath_QueryInterface((INetCfgBindingPath*)This, riid, ppv))) + { + IEnumNetCfgBindingPath_Release((INetCfg*)This); + return E_NOINTERFACE; + } + + IEnumNetCfgBindingPath_Release((IEnumNetCfgBindingPath*)This); + return S_OK; +} diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index ceaa12e571..efb5d6439f 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -64,6 +64,10 @@ extern HINSTANCE netcfgx_hInstance; HRESULT WINAPI INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem,INetCfg * iface); HRESULT WINAPI IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * iface); +/* netcfgbindingpath_iface.c */ +HRESULT WINAPI INetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); +HRESULT WINAPI IEnumNetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, DWORD dwFlags); + /* tcpipconf_notify.c */ HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);

1 0

[reactos] 01/01: [NETCFGX] NetPropPageProvider: Handle the Min and Max values for INT, LONG and WORD types properly
by Eric Kohl 18 Jun '19

18 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da533a8a422048ca7ca2… commit 2da533a8a422048ca7ca2520741c600092e7ef82 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jun 18 21:46:40 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jun 18 21:47:29 2019 +0200 [NETCFGX] NetPropPageProvider: Handle the Min and Max values for INT, LONG and WORD types properly CORE-15095 --- dll/win32/netcfgx/propertypage.c | 106 ++++++++++++++++++++++++++++++++------- 1 file changed, 88 insertions(+), 18 deletions(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 87be83650f..a7ded46a05 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -43,8 +43,20 @@ typedef struct _PARAMETER INT iBase; INT iStep; - LONG lMin; - LONG lMax; + + union + { + struct + { + LONG lMin; + LONG lMax; + } l; + struct + { + DWORD dwMin; + DWORD dwMax; + } dw; + } u; } PARAMETER, *PPARAMETER; typedef struct _PARAMETER_ARRAY @@ -236,6 +248,41 @@ GetLongValue( } +static DWORD +GetDWordValue( + _In_ HKEY hKey, + _In_ PWSTR pValueName, + _In_ DWORD dwDefault, + _Out_ PDWORD pValue) +{ + WCHAR szBuffer[24]; + DWORD dwLength = 0; + DWORD dwRegType; + PWSTR ptr = NULL; + + dwLength = sizeof(szBuffer); + RegQueryValueExW(hKey, + pValueName, + NULL, + &dwRegType, + (LPBYTE)szBuffer, + &dwLength); + + if (dwRegType == REG_SZ && dwLength >= sizeof(WCHAR)) + { + *pValue = wcstoul(szBuffer, &ptr, 10); + if (*pValue == 0 && ptr != NULL) + *pValue = dwDefault; + } + else + { + *pValue = dwDefault; + } + + return ERROR_SUCCESS; +} + + static DWORD GetEnumOptions( @@ -388,6 +435,7 @@ BuildParameterArray( PWSTR pszType = NULL; LONG lError; LONG lDefaultMin, lDefaultMax; + DWORD dwDefaultMin, dwDefaultMax; BOOL ret = FALSE; hDriverKey = SetupDiOpenDevRegKey(DeviceInfoSet, @@ -543,26 +591,43 @@ BuildParameterArray( } else if (ParamArray->Array[dwIndex].Type == WORD_TYPE) { - lDefaultMin = 0L; - lDefaultMax = 65535L; // MAX_WORD; + dwDefaultMin = 0UL; + dwDefaultMax = 65535UL; // MAX_WORD; } #if 0 else if (ParamArray->Array[dwIndex].Type == DWORD_TYPE) { - lDefaultMin = 0; - lDefaultMax = 4294967295; //MAX_DWORD; + dwDefaultMin = 0UL; + dwDefaultMax = 4294967295UL; //MAX_DWORD; } #endif - GetLongValue(hParamKey, - L"Min", - lDefaultMin, - &ParamArray->Array[dwIndex].lMin); - - GetLongValue(hParamKey, - L"Max", - lDefaultMax, - &ParamArray->Array[dwIndex].lMax); + if (ParamArray->Array[dwIndex].Type == INT_TYPE || + ParamArray->Array[dwIndex].Type == LONG_TYPE) + { + GetLongValue(hParamKey, + L"Min", + lDefaultMin, + &ParamArray->Array[dwIndex].u.l.lMin); + + GetLongValue(hParamKey, + L"Max", + lDefaultMax, + &ParamArray->Array[dwIndex].u.l.lMax); + } + else if (ParamArray->Array[dwIndex].Type == WORD_TYPE || + ParamArray->Array[dwIndex].Type == DWORD_TYPE) + { + GetDWordValue(hParamKey, + L"Min", + dwDefaultMin, + &ParamArray->Array[dwIndex].u.dw.dwMin); + + GetDWordValue(hParamKey, + L"Max", + dwDefaultMax, + &ParamArray->Array[dwIndex].u.dw.dwMax); + } GetIntValue(hParamKey, L"Base", @@ -773,10 +838,15 @@ DisplayParameter( else SendMessage(hwndControl, UDM_SETBASE, 10, 0); - if (Parameter->Type != DWORD_TYPE) + if (Parameter->Type == INT_TYPE || Parameter->Type == LONG_TYPE) + { + TRACE("SetMin %ld SetMax %ld\n", Parameter->u.l.lMin, Parameter->u.l.lMax); + SendMessage(hwndControl, UDM_SETRANGE32, Parameter->u.l.lMin, Parameter->u.l.lMax); + } + else if (Parameter->Type == WORD_TYPE) { - TRACE("SetMin %ld SetMax %ld\n", Parameter->lMin, Parameter->lMax); - SendMessage(hwndControl, UDM_SETRANGE32, Parameter->lMin, Parameter->lMax); + TRACE("SetMin %lu SetMax %lu\n", Parameter->u.dw.dwMin, Parameter->u.dw.dwMax); + SendMessage(hwndControl, UDM_SETRANGE32, (INT)Parameter->u.dw.dwMin, (INT)Parameter->u.dw.dwMax); } hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT);

1 0

[reactos] 01/01: [URLMON] Directly call cabinet!Extract instead of calling it via advpack!ExtractFilesW CORE-15795
by Mark Jansen 17 Jun '19

17 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8ef4912a7230bdeef25d… commit c8ef4912a7230bdeef25d90dc7120c70c79bad74 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 15 22:32:22 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jun 17 19:51:58 2019 +0200 [URLMON] Directly call cabinet!Extract instead of calling it via advpack!ExtractFilesW CORE-15795 --- dll/win32/urlmon/axinstall.c | 129 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dll/win32/urlmon/axinstall.c b/dll/win32/urlmon/axinstall.c index 5eac00d46c7..86beb09e568 100644 --- a/dll/win32/urlmon/axinstall.c +++ b/dll/win32/urlmon/axinstall.c @@ -72,13 +72,142 @@ static inline BOOL file_exists(const WCHAR *file_name) return GetFileAttributesW(file_name) != INVALID_FILE_ATTRIBUTES; } +#ifdef __REACTOS__ + +/* The following definitions were copied from dll/win32/advpack32/files.c */ + +/* SESSION Operation */ +#define EXTRACT_FILLFILELIST 0x00000001 +#define EXTRACT_EXTRACTFILES 0x00000002 + +struct FILELIST{ + LPSTR FileName; + struct FILELIST *next; + BOOL DoExtract; +}; + +typedef struct { + INT FileSize; + ERF Error; + struct FILELIST *FileList; + INT FileCount; + INT Operation; + CHAR Destination[MAX_PATH]; + CHAR CurrentFile[MAX_PATH]; + CHAR Reserved[MAX_PATH]; + struct FILELIST *FilterList; +} SESSION; + +static HRESULT (WINAPI *pExtract)(SESSION*, LPCSTR); + + +/* The following functions were copied from dll/win32/advpack32/files.c + All unused arguments are removed */ + +static void free_file_node(struct FILELIST *pNode) +{ + HeapFree(GetProcessHeap(), 0, pNode->FileName); + HeapFree(GetProcessHeap(), 0, pNode); +} + +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } +} + +HRESULT WINAPI Modified_ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir) +{ + SESSION session; + HMODULE hCabinet; + HRESULT res = S_OK; + LPSTR szConvertedList = NULL; + + TRACE("(%s, %s)\n", debugstr_a(CabName), debugstr_a(ExpandDir)); + + if (!CabName || !ExpandDir) + return E_INVALIDARG; + + if (GetFileAttributesA(ExpandDir) == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + + hCabinet = LoadLibraryA("cabinet.dll"); + if (!hCabinet) + return E_FAIL; + + ZeroMemory(&session, sizeof(SESSION)); + + pExtract = (void *)GetProcAddress(hCabinet, "Extract"); + if (!pExtract) + { + res = E_FAIL; + goto done; + } + + lstrcpyA(session.Destination, ExpandDir); + + session.Operation |= (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES); + res = pExtract(&session, CabName); + +done: + free_file_list(&session); + FreeLibrary(hCabinet); + HeapFree(GetProcessHeap(), 0, szConvertedList); + + return res; +} + + + +HRESULT WINAPI Modified_ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir) +{ + char *cab_name = NULL, *expand_dir = NULL; + HRESULT hres = S_OK; + + TRACE("(%s, %s, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir)); + + if(CabName) { + cab_name = heap_strdupWtoA(CabName); + if(!cab_name) + return E_OUTOFMEMORY; + } + + if(ExpandDir) { + expand_dir = heap_strdupWtoA(ExpandDir); + if(!expand_dir) + hres = E_OUTOFMEMORY; + } + + /* cabinet.dll, which does the real job of extracting files, doesn't have UNICODE API, + so we need W->A conversion at some point anyway. */ + if(SUCCEEDED(hres)) + hres = Modified_ExtractFilesA(cab_name, expand_dir); + + heap_free(cab_name); + heap_free(expand_dir); + return hres; +} + +#endif + + static HRESULT extract_cab_file(install_ctx_t *ctx) { size_t path_len, file_len; WCHAR *ptr; HRESULT hres; +#ifdef __REACTOS__ + hres = Modified_ExtractFilesW(ctx->cache_file, ctx->tmp_dir); +#else hres = ExtractFilesW(ctx->cache_file, ctx->tmp_dir, 0, NULL, NULL, 0); +#endif if(FAILED(hres)) { WARN("ExtractFilesW failed: %08x\n", hres); return hres;

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