September 2010 - Wine-commits

Henri Verbeet : wined3d: Consistently use the same stateblock in state_colormat().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 5013ec83de5edfbc321c50eb5903d5a0e322e775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5013ec83de5edfbc321c50eb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:29 2010 +0200 wined3d: Consistently use the same stateblock in state_colormat(). These should refer to the same stateblock when we're drawing, but it's still ugly. --- dlls/wined3d/state.c | 52 ++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e49d36..991b068 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1234,8 +1234,9 @@ void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); } -static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void state_colormat(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_state *state = &stateblock->state; IWineD3DDeviceImpl *device = stateblock->device; GLenum Parm = 0; @@ -1249,57 +1250,55 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru context->num_untracked_materials = 0; if ((device->strided_streams.use_map & (1 << WINED3D_FFP_DIFFUSE)) - && stateblock->state.render_states[WINED3DRS_COLORVERTEX]) + && state->render_states[WINED3DRS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", - stateblock->state.render_states[WINED3DRS_DIFFUSEMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE]); + state->render_states[WINED3DRS_DIFFUSEMATERIALSOURCE], + state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE], + state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE], + state->render_states[WINED3DRS_SPECULARMATERIALSOURCE]); - if (stateblock->state.render_states[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) { - if (stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) - { + if (state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) Parm = GL_AMBIENT_AND_DIFFUSE; - } else { + else Parm = GL_DIFFUSE; - } - if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT; - if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_EMISSION; - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_SPECULAR; } @@ -1322,32 +1321,31 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru * tracking with glColorMaterial, so apply those here. */ switch (context->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&state->material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&state->material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_AMBIENT: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.Ambient); checkGLcall("glMaterialfv"); break; case GL_EMISSION: - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&device->updateStateBlock->state.material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&state->material.Emissive); checkGLcall("glMaterialfv"); break; case GL_SPECULAR: /* Only change material color if specular is enabled, otherwise it is set to black */ - if (device->stateBlock->state.render_states[WINED3DRS_SPECULARENABLE]) + if (state->render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, - (float *)&device->updateStateBlock->state.material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *)&state->material.Specular); checkGLcall("glMaterialfv"); } else { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f};

1 0

Lauri Kenttä : shell32: Update Finnish translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: ebfa87b987821d76632cad50636e3543db38cc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfa87b987821d76632cad506… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 23 23:32:40 2010 +0300 shell32: Update Finnish translation. --- dlls/shell32/shell32_Fi.rc | 61 +++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index 013448f..fff38b4 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -77,7 +77,7 @@ MENU_SHV_FILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&Valitse" FCIDM_SHVIEW_OPEN MENUITEM "&Selaa", FCIDM_SHVIEW_EXPLORE MENUITEM "&Avaa", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR @@ -94,23 +94,23 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Tiedosto" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "S&ulje", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&N�yt�" BEGIN MENUITEM "&Suuret kuvakkeet", FCIDM_SHVIEW_BIGICON MENUITEM "&Pienet kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "T&iedot", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Ohje" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "Ti&etoja Ohjauspaneelista...", IDM_CPANEL_ABOUT END END @@ -131,17 +131,17 @@ FONT 8, "MS Shell Dlg" SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tietoja %s" +CAPTION "Tietoja ohjelmasta %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Winen &lisenssi...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine:n toi Sinulle:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "K�yt�ss� on versio %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Winen ovat tehneet:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG 0, 0, 227, 95 @@ -150,7 +150,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Anna ohjelma, dokumentti, tai Internet -resurssi, ja Wine avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "Anna ohjelma, dokumentti tai Internet-osoite, niin Wine avaa sen.", 12289, 36, 11, 182, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -172,13 +172,13 @@ STRINGTABLE IDS_SHV_COLUMN9 "Kommentit" IDS_SHV_COLUMN10 "Omistaja" IDS_SHV_COLUMN11 "Ryhm�" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_DELFROM "Alkuper�inen sijainti" + IDS_SHV_COLUMN_DELDATE "Poistoaika" /* special folders */ IDS_DESKTOP "Ty�p�yt�" IDS_MYCOMPUTER "Oma tietokone" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Ohjauspaneeli" /* context menus */ IDS_VIEW_LARGE "&Suuret kuvakkeet" @@ -192,19 +192,18 @@ STRINGTABLE IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" - IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" + IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota kohteen '%1'?" IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota n�m� %1?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETESELECTED_TEXT "Haluatko varmasti tuhota valitut kohteet?" + IDS_TRASHITEM_TEXT "Haluatko varmasti siirt�� kohteen '%1' Roskakoriin?" + IDS_TRASHFOLDER_TEXT "Haluatko varmasti siirt�� kohteen '%1' ja kaiken sen sis�ll�n Roskakoriin?" + IDS_TRASHMULTIPLE_TEXT "Haluatko varmasti siirt�� n�m� %1 kohdetta roskakoriin?" + IDS_CANTTRASH_TEXT "Kohdetta '%1' ei voida siirt�� Roskakoriin. Haluatko sen sijaan poistaa sen kokonaan?" + IDS_OVERWRITEFILE_TEXT "T�ss� kansiossa on jo tiedosto nimelt� '%1'.\n\nKorvataanko entinen tiedosto?" IDS_OVERWRITEFILE_CAPTION "Vahvista tiedoston ylikirjoitus" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "T�ss� kansiossa on jo kansio nimelt� '%1'.\n\n"\ + "Jos kohdekansiossa on samannimisi� tiedostoja kuin valitussa kansiossa,\n"\ + "ne korvataan uusilla. Jatketaanko?" /* message box strings */ IDS_RESTART_TITLE "K�ynnist� uudelleen" @@ -235,15 +234,15 @@ STRINGTABLE IDS_MYPICTURES "Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmatiedostot\\Yhteiset tiedostot" IDS_COMMON_DOCUMENTS "Dokumentit" - IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Administrative Tools" + IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Hallintaty�kalut" IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Uusi hakemisto" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Winen Ohjauspaneeli" + IDS_CPANEL_NAME "Nimi" + IDS_CPANEL_DESCRIPTION "Kuvaus" }

1 0

Lauri Kenttä : user32: Update Finnish translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 41d341cf4ee5ea839a1bca5f33d4180f82e330b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d341cf4ee5ea839a1bca5f3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 23 23:32:41 2010 +0300 user32: Update Finnish translation. --- dlls/user32/resources/user32_Fi.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/resources/user32_Fi.rc b/dlls/user32/resources/user32_Fi.rc index 5ef9d50..221f234 100644 --- a/dlls/user32/resources/user32_Fi.rc +++ b/dlls/user32/resources/user32_Fi.rc @@ -31,7 +31,7 @@ SYSMENU MENU MENUITEM SEPARATOR MENUITEM "&Sulje\tAlt+F4", 61536 MENUITEM SEPARATOR - MENUITEM "&Tietoja Wine:sta...", 61761 + MENUITEM "&Tietoja Winest�...", 61761 } EDITMENU MENU @@ -45,7 +45,7 @@ EDITMENU MENU MENUITEM "L&iit�", WM_PASTE MENUITEM "&Poista", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "&Valitse Kaikki", EM_SETSEL + MENUITEM "&Valitse kaikki", EM_SETSEL END } @@ -61,14 +61,14 @@ BEGIN PUSHBUTTON "&Hylk��", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Kyll�", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ei", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Yrit� uudelleen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Jatka", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ohje", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Valitse Ikkuna" +CAPTION "Valitse ikkuna" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ @@ -80,5 +80,5 @@ END STRINGTABLE { IDS_ERROR "Virhe" - IDS_MDI_MOREWINDOWS "&Lis�� Ikkunoita..." + IDS_MDI_MOREWINDOWS "&Lis�� ikkunoita..." }

1 0

Juan Lang : iphlpapi: Trace enumerated addresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: f22cf51124a03d7bf372b5b8ae16e2e0d2b6769b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22cf51124a03d7bf372b5b8a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 11:11:06 2010 -0700 iphlpapi: Trace enumerated addresses. --- dlls/iphlpapi/iphlpapi_main.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 493fe3f..8207ffd 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -632,6 +632,60 @@ static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) return ERROR_SUCCESS; } +static char *debugstr_ipv4(const in_addr_t *in_addr, char *buf) +{ + const BYTE *addrp; + char *p = buf; + + for (addrp = (const BYTE *)in_addr; + addrp - (const BYTE *)in_addr < sizeof(*in_addr); + addrp++) + { + if (addrp == (const BYTE *)in_addr + sizeof(*in_addr) - 1) + sprintf(p, "%d", *addrp); + else + { + int n; + + sprintf(p, "%d.%n", *addrp, &n); + p += n; + } + } + return buf; +} + +static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) +{ + const IN6_ADDR *addr = &sin->sin6_addr; + char *p = buf; + int i; + BOOL in_zero = FALSE; + + for (i = 0; i < 7; i++) + { + if (!addr->u.Word[i]) + { + if (i == 0) + *p++ = ':'; + if (!in_zero) + { + *p++ = ':'; + in_zero = TRUE; + } + } + else + { + int n; + + sprintf(p, "%x:%n", ntohs(addr->u.Word[i]), &n); + p += n; + in_zero = FALSE; + } + } + sprintf(p, "%x", ntohs(addr->u.Word[7])); + return buf; +} + static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; @@ -685,6 +739,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD *dst++ = 0; ptr = (char *)dst; + TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, + num_v6addrs); if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -693,6 +749,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) { + char addr_buf[16]; + memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); @@ -702,6 +760,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD sa->sin_family = AF_INET; sa->sin_addr.s_addr = v4addrs[i]; sa->sin_port = 0; + TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, + debugstr_ipv4(&sa->sin_addr.s_addr, addr_buf)); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) @@ -727,6 +787,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v6addrs; i++) { + char addr_buf[46]; + memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; @@ -734,6 +796,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); + TRACE("IPv6 %d/%d: %s\n", i + 1, num_v6addrs, + debugstr_ipv6(sa, addr_buf)); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1)

1 0

Juan Lang : iphlpapi: Set flags for adapters returned by GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: df9191ae2d4b79d81fa9ec0902c158119ba22195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9191ae2d4b79d81fa9ec090… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 11:59:34 2010 -0700 iphlpapi: Set flags for adapters returned by GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8207ffd..d06b44c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -746,6 +746,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; + aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) { @@ -776,6 +777,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD IP_ADAPTER_UNICAST_ADDRESS *ua; struct WS_sockaddr_in6 *sa; + aa->Flags |= IP_ADAPTER_IPV6_ENABLED; if (aa->FirstUnicastAddress) { for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next)

1 0

Juan Lang : iphlpapi: Set ConnectionType in GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0905dfc3e7d0c95a479aaf4ad001396c448fac0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0905dfc3e7d0c95a479aaf4ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 10:44:04 2010 -0700 iphlpapi: Set ConnectionType in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d06b44c..6ec06e8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -608,6 +608,16 @@ static DWORD typeFromMibType(DWORD mib_type) } } +static DWORD connectionTypeFromMibType(DWORD mib_type) +{ + switch (mib_type) + { + case MIB_IF_TYPE_PPP: return NET_IF_CONNECTION_DEMAND; + case MIB_IF_TYPE_SLIP: return NET_IF_CONNECTION_DEMAND; + default: return NET_IF_CONNECTION_DEDICATED; + } +} + static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { ULONG ret, i, j; @@ -814,6 +824,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); + aa->ConnectionType = connectionTypeFromMibType(type); getInterfaceMtuByName(name, &aa->Mtu);

1 0

Juan Lang : include: Add ifdef.h.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 53db1245176080d6f102a0fd73811e60ca6f59a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db1245176080d6f102a0fd7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 12:56:15 2010 -0700 include: Add ifdef.h. --- include/Makefile.in | 1 + include/ifdef.h | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 391cef7..c4bb8db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -273,6 +273,7 @@ SRCDIR_INCLUDES = \ icm.h \ icmpapi.h \ idispids.h \ + ifdef.h \ imagehlp.h \ imm.h \ in6addr.h \ diff --git a/include/ifdef.h b/include/ifdef.h new file mode 100644 index 0000000..a3f2b01 --- /dev/null +++ b/include/ifdef.h @@ -0,0 +1,182 @@ +/* WINE ifdef.h + * Copyright 2010 Juan Lang + * + * 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 + */ +#ifndef WINE_IFDEF_H +#define WINE_IFDEF_H + +typedef ULONG32 NET_IF_OBJECT_ID, *PNET_IF_OBJECT_ID; +typedef UINT32 NET_IF_COMPARTMENT_ID, *PNET_IF_COMPARTMENT_ID; +typedef GUID NET_IF_NETWORK_GUID, *PNET_IF_NETWORK_GUID; +typedef ULONG NET_IFINDEX, *PNET_IFINDEX; +typedef NET_IFINDEX IF_INDEX, *PIF_INDEX; +typedef UINT16 NET_IFTYPE, *PNET_IFTYPE; + +#define NET_IF_OPER_STATUS_DOWN_NOT_AUTHENTICATED 0x00000001 +#define NET_IF_OPER_STATUS_DOWN_NOT_MEDIA_CONNECTED 0x00000002 +#define NET_IF_OPER_STATUS_DORMANT_PAUSED 0x00000004 +#define NET_IF_OPER_STATUS_DORMANT_LOW_POWER 0x00000008 + +#define NET_IF_COMPARTMENT_ID_UNSPECIFIED 0 +#define NET_IF_COMPARTMENT_ID_PRIMARY 1 + +#define NET_IF_OID_IF_ALIAS 0x00000001 +#define NET_IF_OID_COMPARTMENT_ID 0x00000002 +#define NET_IF_OID_NETWORK_GUID 0x00000003 +#define NET_IF_OID_IF_ENTRY 0x00000004 + +#define NET_SET_UNSPECIFIED_NETWORK_GUID(x) +#define NET_IS_UNSPECIFIED_NETWORK_GUID(x) + +#define NET_SITEID_UNSPECIFIED 0 +#define NET_SITEID_MAXUSER 0x07ffffff +#define NET_SITEID_MAXSYSTEM 0x0fffffff + +#define NET_IFINDEX_UNSPECIFIED 0 +#define IFI_UNSPECIFIED NET_IFINDEX_UNSPECIFIED + +#define NET_IFLUID_UNSPECIFIED 0 + +#define NIIF_HARDWARE_INTERFACE 0x00000001 +#define NIIF_FILTER_INTERFACE 0x00000002 +#define NIIF_NDIS_WDM_INTERFACE 0x00000020 +#define NIIF_NDIS_ENDPOINT_INTERFACE 0x00000040 +#define NIIF_NDIS_ISCSI_INTERFACE 0x00000080 +#define NIIF_WAN_TUNNEL_TYPE_UNKNOWN 0xffffffff + +#define NET_BUS_NUMBER_UNKNOWN 0xffffffff +#define NET_SLOT_NUMBER_UNKNOWN 0xffffffff +#define NET_FUNCTION_NUMBER_UNKNOWN 0xffffffff + +#define IF_MAX_STRING_SIZE 256 +#define IF_MAX_PHYS_ADDRESS_LENGTH 32 + +typedef enum _NET_IF_ADMIN_STATUS { + NET_IF_ADMIN_STATUS_UP = 1, + NET_IF_ADMIN_STATUS_DOWN = 2, + NET_IF_ADMIN_STATUS_TESTING = 3 +} NET_IF_ADMIN_STATUS, *PNET_IF_ADMIN_STATUS; + +typedef enum _NET_IF_OPER_STATUS { + NET_IF_OPER_STATUS_UP = 1, + NET_IF_OPER_STATUS_DOWN = 2, + NET_IF_OPER_STATUS_TESTING = 3, + NET_IF_OPER_STATUS_UNKNOWN = 4, + NET_IF_OPER_STATUS_DORMANT = 5, + NET_IF_OPER_STATUS_NOT_PRESENT = 6, + NET_IF_OPER_STATUS_LOWER_LAYER_DOWN = 7 +} NET_IF_OPER_STATUS, *PNET_IF_OPER_STATUS; + +typedef enum _NET_IF_RCV_ADDRESS_TYPE { + NET_IF_RCV_ADDRESS_TYPE_OTHER = 1, + NET_IF_RCV_ADDRESS_TYPE_VOLATILE = 2, + NET_IF_RCV_ADDRESS_TYPE_NON_VOLATILE = 3 +} NET_IF_RCV_ADDRESS_TYPE, *PNET_IF_RCV_ADDRESS_TYPE; + +typedef struct _NET_IF_RCV_ADDRESS_LH { + NET_IF_RCV_ADDRESS_TYPE ifRcvAddressType; + USHORT ifRcvAddressLength; + USHORT ifRcvAddressOffset; +} NET_IF_RCV_ADDRESS_LH, *PNET_IF_RCV_ADDRESS_LH; +typedef NET_IF_RCV_ADDRESS_LH NET_IF_RCV_ADDRESS; +typedef NET_IF_RCV_ADDRESS_LH *PNET_IF_RCV_ADDRESS; + +typedef union _NET_LUID_LH { + ULONG64 Value; + struct { + ULONG64 Reserved : 24; + ULONG64 NetLuidIndex : 24; + ULONG64 IfType : 16; + } Info; +} NET_LUID_LH, *PNET_LUID_LH; +typedef NET_LUID_LH NET_LUID; +typedef NET_LUID *PNET_LUID; +typedef NET_LUID IF_LUID; +typedef NET_LUID *PIF_LUID; + +typedef enum _NET_IF_ACCESS_TYPE { + NET_IF_ACCESS_LOOPBACK = 1, + NET_IF_ACCESS_BROADCAST = 2, + NET_IF_ACCESS_POINT_TO_POINT = 2, + NET_IF_ACCESS_POINT_TO_MULTI_POINT = 4, + NET_IF_ACCESS_MAXIMUM = 5 +} NET_IF_ACCESS_TYPE, *PNET_IF_ACCESS_TYPE; + +typedef enum _NET_IF_DIRECTION_TYPE { + NET_IF_DIRECTION_SENDRECEIVE = 0, + NET_IF_DIRECTION_SENDONLY = 1, + NET_IF_DIRECTION_RECEIVEONLY = 2, + NET_IF_DIRECTION_MAXIMUM = 3 +} NET_IF_DIRECTION_TYPE, *PNET_IF_DIRECTION_TYPE; + +typedef enum _NET_IF_CONNECTION_TYPE { + NET_IF_CONNECTION_DEDICATED = 1, + NET_IF_CONNECTION_PASSIVE = 2, + NET_IF_CONNECTION_DEMAND = 3, + NET_IF_CONNECTION_MAXIMUM = 4, +} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE; + +typedef enum _NET_IF_MEDIA_CONNECT_STATE { + MediaConnectStateUnknown = 0, + MediaConnectStateConnected = 1, + MediaConnectStateDisconnected = 2 +} NET_IF_MEDIA_CONNECT_STATE, *PNET_IF_MEDIA_CONNECT_STATE; + +typedef enum _NET_IF_MEDIA_DUPLEX_STATE { + MediaDuplexStateUnknown = 0, + MediaDuplexStateHalf = 1, + MediaDuplexStateFull = 2 +} NET_IF_MEDIA_DUPLEX_STATE, *PNET_IF_MEDIA_DUPLEX_STATE; + +typedef struct _NET_PHYSICAL_LOCATION_LH { + ULONG BusNumber; + ULONG SlotNumber; + ULONG FunctionNumber; +} NET_PHYSICAL_LOCATION_LH, *PNET_PHYSICAL_LOCATION_LH; +typedef NET_PHYSICAL_LOCATION_LH NET_PHYSICAL_LOCATION; +typedef NET_PHYSICAL_LOCATION *PNET_PHYSICAL_LOCATION; + +typedef struct _IF_COUNTED_STRING_LH { + USHORT Length; + WCHAR String[IF_MAX_STRING_SIZE + 1]; +} IF_COUNTED_STRING_LH, *PIF_COUNTED_STRING_LH; +typedef IF_COUNTED_STRING_LH IF_COUNTED_STRING; +typedef IF_COUNTED_STRING *PIF_COUNTED_STRING; + +typedef struct _IF_PHYSICAL_ADDRESS_LH { + USHORT Length; + UCHAR Address[IF_MAX_PHYS_ADDRESS_LENGTH]; +} IF_PHYSICAL_ADDRESS_LH, *PIF_PHYSICAL_ADDRESS_LH; +typedef IF_PHYSICAL_ADDRESS_LH IF_PHYSICAL_ADDRESS; +typedef IF_PHYSICAL_ADDRESS *PIF_PHYSICAL_ADDRESS; + +typedef enum { + TUNNEL_TYPE_NONE = 0, + TUNNEL_TYPE_OTHER = 1, + TUNNEL_TYPE_DIRECT = 2, + TUNNEL_TYPE_6TO4 = 11, + TUNNEL_TYPE_ISATAP = 13, + TUNNEL_TYPE_TEREDO = 14, + TUNNEL_TYPE_IPHTTPS = 15, +} TUNNEL_TYPE; + +typedef enum _IF_ADMINISTRATIVE_STATE { + IF_ADMINISTRATIVE_STATE_DISABLED = 0, + IF_ADMINISTRATIVE_STATE_ENABLED = 1, + IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 +} IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE; + +#endif /* WINE_IFDEF_H*/

1 0

Juan Lang : include: Move IF_OPER_STATUS to ifdef.h.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: accb42f3c3dc107e79381678078f6a9a1d82210f URL: http://source.winehq.org/git/wine.git/?a=commit;h=accb42f3c3dc107e793816780… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 12:57:31 2010 -0700 include: Move IF_OPER_STATUS to ifdef.h. --- include/ifdef.h | 10 ++++++++++ include/iptypes.h | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index a3f2b01..0b52d80 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -179,4 +179,14 @@ typedef enum _IF_ADMINISTRATIVE_STATE { IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 } IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE; +typedef enum { + IfOperStatusUp = 1, + IfOperStatusDown, + IfOperStatusTesting, + IfOperStatusUnknown, + IfOperStatusDormant, + IfOperStatusNotPresent, + IfOperStatusLowerLayerDown +} IF_OPER_STATUS; + #endif /* WINE_IFDEF_H*/ diff --git a/include/iptypes.h b/include/iptypes.h index 9b80f77..82927a9 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -20,6 +20,7 @@ #define WINE_IPTYPES_H_ #include <time.h> +#include <ifdef.h> #define MAX_ADAPTER_DESCRIPTION_LENGTH 128 #define MAX_ADAPTER_NAME_LENGTH 256 @@ -104,16 +105,6 @@ typedef enum { } IP_SUFFIX_ORIGIN; typedef enum { - IfOperStatusUp = 1, - IfOperStatusDown, - IfOperStatusTesting, - IfOperStatusUnknown, - IfOperStatusDormant, - IfOperStatusNotPresent, - IfOperStatusLowerLayerDown -} IF_OPER_STATUS; - -typedef enum { IpDadStateInvalid = 0, IpDadStateTentative, IpDadStateDuplicate,

1 0

Juan Lang : include: Define NDIS_INTERFACE_INFORMATION.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 1a6188e846f6ecee3409f2a12f32d047f3dd73b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6188e846f6ecee3409f2a12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:02:23 2010 -0700 include: Define NDIS_INTERFACE_INFORMATION. --- include/ifdef.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index 0b52d80..80ab755 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -189,4 +189,39 @@ typedef enum { IfOperStatusLowerLayerDown } IF_OPER_STATUS; +typedef struct _NDIS_INTERFACE_INFORMATION { + NET_IF_OPER_STATUS ifOperStatus; + ULONG ifOperStatusFlags; + NET_IF_MEDIA_CONNECT_STATE MediaConnectState; + NET_IF_MEDIA_DUPLEX_STATE MediaDuplexState; + ULONG ifMtu; + BOOLEAN ifPromiscuousMode; + BOOLEAN ifDeviceWakeUpEnable; + ULONG64 XmitLinkSpeed; + ULONG64 RcvLinkSpeed; + ULONG64 ifLastChange; + ULONG64 ifCounterDiscontinuityTime; + ULONG64 ifInUnknownProtos; + ULONG64 ifInDiscards; + ULONG64 ifInErrors; + ULONG64 ifHCInOctets; + ULONG64 ifHCInUcastPkts; + ULONG64 ifHCInMulticastPkts; + ULONG64 ifHCInBroadcastPkts; + ULONG64 ifHCOutOctets; + ULONG64 ifHCOutUcastPkts; + ULONG64 ifHCOutMulticastPkts; + ULONG64 ifHCOutBroadcastPkts; + ULONG64 ifOutErrors; + ULONG64 ifOutDiscards; + ULONG64 ifHCInUcastOctets; + ULONG64 ifHCInMulticastOctets; + ULONG64 ifHCInBroadcastOctets; + ULONG64 ifHCOutUcastOctets; + ULONG64 ifHCOutMulticastOctets; + ULONG64 ifHCOutBroadcastOctets; + NET_IF_COMPARTMENT_ID CompartmentId; + ULONG SupportedStatistics; +} NDIS_INTERFACE_INFORMATION, *PNDIS_INTERFACE_INFORMATION; + #endif /* WINE_IFDEF_H*/

1 0

Piotr Caban : msvcrt: Added 'll' modifier to printf functions.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 120346da8859ac92d77c8a6563ecf2fb871254dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=120346da8859ac92d77c8a656… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 23 15:28:32 2010 +0200 msvcrt: Added 'll' modifier to printf functions. --- dlls/msvcrt/wcs.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9ee737e..d192c23 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -831,7 +831,12 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, /* deal with integer width modifier */ while( *p ) { - if( *p == 'h' || *p == 'l' || *p == 'L' ) + if( *p == 'l' && *(p+1) == 'l' ) + { + flags.IntegerDouble++; + p += 2; + } + else if( *p == 'h' || *p == 'l' || *p == 'L' ) { flags.IntegerLength = *p; p++;

1 0