wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

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: 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

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

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

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

Henri Verbeet : wined3d: Pass a wined3d_state structure to ffp_clip_emul().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 7dd4174e05974a2fb58b76614b807319623c6b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4174e05974a2fb58b76614… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:28 2010 +0200 wined3d: Pass a wined3d_state structure to ffp_clip_emul(). --- dlls/wined3d/arb_program_shader.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6fa5fa7..ed80577 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -175,9 +175,9 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar } } -static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) +static inline BOOL ffp_clip_emul(const struct wined3d_state *state) { - return stateblock->state.lowest_disabled_stage < 7; + return state->lowest_disabled_stage < 7; } /* ARB_program_shader private data */ @@ -4450,12 +4450,14 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW WORD int_skip; IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *)shader->baseShader.device; const struct wined3d_gl_info *gl_info = &dev->adapter->gl_info; + const struct wined3d_state *state = &stateblock->state; + find_vs_compile_args(shader, stateblock, &args->super); args->clip.boolclip_compare = 0; if(use_ps(stateblock)) { - IWineD3DPixelShaderImpl *ps = stateblock->state.pixel_shader; + IWineD3DPixelShaderImpl *ps = state->pixel_shader; struct arb_pshader_private *shader_priv = ps->baseShader.backend_data; args->ps_signature = shader_priv->input_signature_idx; @@ -4466,15 +4468,15 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW args->ps_signature = ~0; if(!dev->vs_clipping) { - args->clip.boolclip.clip_texcoord = ffp_clip_emul(stateblock) ? gl_info->limits.texture_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(state) ? gl_info->limits.texture_stages : 0; } /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } if (args->clip.boolclip.clip_texcoord) { - if (stateblock->state.render_states[WINED3DRS_CLIPPING]) - args->clip.boolclip.clipplane_mask = (unsigned char)stateblock->state.render_states[WINED3DRS_CLIPPLANEENABLE]; + if (state->render_states[WINED3DRS_CLIPPING]) + args->clip.boolclip.clipplane_mask = (unsigned char)state->render_states[WINED3DRS_CLIPPLANEENABLE]; /* clipplane_mask was set to 0 by setting boolclip_compare to 0 */ } @@ -4483,7 +4485,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW /* TODO: Figure out if it would be better to store bool constants as bitmasks in the stateblock */ for(i = 0; i < MAX_CONST_B; i++) { - if (stateblock->state.vs_consts_b[i]) + if (state->vs_consts_b[i]) args->clip.boolclip.bools |= ( 1 << i); } @@ -4511,9 +4513,9 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW } else { - args->loop_ctrl[i][0] = stateblock->state.vs_consts_i[i * 4]; - args->loop_ctrl[i][1] = stateblock->state.vs_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = stateblock->state.vs_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->vs_consts_i[i * 4]; + args->loop_ctrl[i][1] = state->vs_consts_i[i * 4 + 1]; + args->loop_ctrl[i][2] = state->vs_consts_i[i * 4 + 2]; } } } @@ -5979,7 +5981,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi srgb_sub_high, 0.0, 0.0, 0.0); } - if(ffp_clip_emul(stateblock) && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); + if (ffp_clip_emul(&stateblock->state) && settings->emul_clipplanes) + shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) {

1 0

Henri Verbeet : wined3d: Directly pass the texture to texture_activate_dimensions().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 23e286613ff688c8f0230301251bc24a7e90de5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e286613ff688c8f02303012… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:27 2010 +0200 wined3d: Directly pass the texture to texture_activate_dimensions(). --- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 10 ++++------ dlls/wined3d/utils.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 3498718..cf85608 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -838,7 +838,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); - texture_activate_dimensions(i, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[i], gl_info); } } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 6576e61..0f1bbb1 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -532,7 +532,7 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } else { - texture_activate_dimensions(stage, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[stage], gl_info); } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 992638a..1e49d36 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3146,12 +3146,10 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct return; } - /* The sampler will also activate the correct texture dimensions, so no need to do it here - * if the sampler for this stage is dirty - */ - if(!isStateDirty(context, STATE_SAMPLER(stage))) { - if (tex_used) texture_activate_dimensions(stage, stateblock, context); - } + /* The sampler will also activate the correct texture dimensions, so no + * need to do it here if the sampler for this stage is dirty. */ + if (!isStateDirty(context, STATE_SAMPLER(stage)) && tex_used) + texture_activate_dimensions(stateblock->state.textures[stage], gl_info); set_tex_op(gl_info, &stateblock->state, FALSE, stage, stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01ca1f9..1317abd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2979,13 +2979,11 @@ void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *des * Requires the caller to activate the correct unit before */ /* GL locking is done by the caller (state handler) */ -void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +void texture_activate_dimensions(IWineD3DBaseTextureImpl *texture, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (stateblock->state.textures[stage]) + if (texture) { - switch (stateblock->state.textures[stage]->baseTexture.target) + switch (texture->baseTexture.target) { case GL_TEXTURE_2D: glDisable(GL_TEXTURE_3D); @@ -3079,7 +3077,7 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine if (sampler >= stateblock->state.lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; - texture_activate_dimensions(sampler, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[sampler], context->gl_info); } void *wined3d_rb_alloc(size_t size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6685412..61cd60d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2646,8 +2646,8 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, enum wined3d_format_id coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; -void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void texture_activate_dimensions(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock,

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to set_tex_op().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 67b7a573b98763c4c83cd3ab5aa275fc50cc6475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b7a573b98763c4c83cd3ab5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:26 2010 +0200 wined3d: Pass a wined3d_state structure to set_tex_op(). --- dlls/wined3d/state.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d824005..992638a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2057,10 +2057,9 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op } /* Setup the texture operations texture stage states */ -static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *iface, +static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { - const struct wined3d_gl_info *gl_info = context->gl_info; GLenum src1, src2, src3; GLenum opr1, opr2, opr3; GLenum comb_target; @@ -2069,7 +2068,6 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if GLenum scal_target; GLenum opr=0, invopr, src3_target, opr3_target; BOOL Handled = FALSE; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); @@ -2109,13 +2107,13 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if /* If a texture stage references an invalid texture unit the stage just * passes through the result from the previous stage */ - if (is_invalid_op(&This->stateBlock->state, Stage, op, arg1, arg2, arg3)) + if (is_invalid_op(state, Stage, op, arg1, arg2, arg3)) { arg1 = WINED3DTA_CURRENT; op = WINED3DTOP_SELECTARG1; } - if (isAlpha && !This->stateBlock->state.textures[Stage] && arg1 == WINED3DTA_TEXTURE) + if (isAlpha && !state->textures[Stage] && arg1 == WINED3DTA_TEXTURE) { get_src_and_opr(WINED3DTA_DIFFUSE, isAlpha, &src1, &opr1); } else { @@ -3058,9 +3056,9 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if DWORD op2; if (isAlpha) - op2 = This->stateBlock->state.texture_states[Stage][WINED3DTSS_COLOROP]; + op2 = state->texture_states[Stage][WINED3DTSS_COLOROP]; else - op2 = This->stateBlock->state.texture_states[Stage][WINED3DTSS_ALPHAOP]; + op2 = state->texture_states[Stage][WINED3DTSS_ALPHAOP]; /* Note: If COMBINE4 in effect can't go back to combine! */ switch (op2) { @@ -3155,7 +3153,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if (tex_used) texture_activate_dimensions(stage, stateblock, context); } - set_tex_op(context, (IWineD3DDevice *)stateblock->device, FALSE, stage, + set_tex_op(gl_info, &stateblock->state, FALSE, stage, stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG1], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG2], @@ -3259,7 +3257,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d } else { - set_tex_op(context, (IWineD3DDevice *)stateblock->device, TRUE, stage, op, arg1, arg2, arg0); + set_tex_op(gl_info, &stateblock->state, TRUE, stage, op, arg1, arg2, arg0); } }

1 0

Vincent Povirk : mscoree: Search for Mono in some predefined paths before using the registry.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d0f7edd2c1df97f8cc858cf08a356a538bbad9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f7edd2c1df97f8cc858cf08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 13:26:04 2010 -0500 mscoree: Search for Mono in some predefined paths before using the registry. This makes it possible for distributions to install Mono in a shared location. --- dlls/mscoree/mscoree_main.c | 123 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 110 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1269f9c..7cc3887 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "wine/unicode.h" +#include "wine/library.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -40,7 +41,34 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -static BOOL get_mono_path(LPWSTR path) +BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) +{ + static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; + static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; + DWORD attributes; + + strcpyW(dll_path, path); + strcatW(dll_path, mono_dll); + attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, libmono_dll); + attributes = GetFileAttributesW(dll_path); + } + + if (attributes != INVALID_FILE_ATTRIBUTES) + { + /* FIXME: Test for appropriate architecture. */ + *abi_version = 1; + return TRUE; + } + + return FALSE; +} + +static BOOL get_mono_path_from_registry(LPWSTR path) { static const WCHAR mono_key[] = {'S','o','f','t','w','a','r','e','\\','N','o','v','e','l','l','\\','M','o','n','o',0}; static const WCHAR defaul_clr[] = {'D','e','f','a','u','l','t','C','L','R',0}; @@ -50,6 +78,8 @@ static BOOL get_mono_path(LPWSTR path) WCHAR version[64], version_key[MAX_PATH]; DWORD len; HKEY key; + WCHAR dll_path[MAX_PATH]; + int abi_version; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, mono_key, 0, KEY_READ, &key)) return FALSE; @@ -77,7 +107,80 @@ static BOOL get_mono_path(LPWSTR path) } RegCloseKey(key); - return TRUE; + return find_mono_dll(path, dll_path, &abi_version); +} + +static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path) +{ + static const WCHAR mono_one_dot_zero[] = {'\\','m','o','n','o','-','1','.','0', 0}; + WCHAR mono_dll_path[MAX_PATH]; + int abi_version; + BOOL found = FALSE; + + strcpyW(mono_path, folder); + strcatW(mono_path, mono_one_dot_zero); + + found = find_mono_dll(mono_path, mono_dll_path, &abi_version); + + if (found && abi_version != 1) + { + ERR("found wrong ABI in %s\n", debugstr_w(mono_path)); + found = FALSE; + } + + return found; +} + +static BOOL get_mono_path(LPWSTR path) +{ + static const WCHAR subdir_mono[] = {'\\','m','o','n','o',0}; + static const WCHAR sibling_mono[] = {'\\','.','.','\\','m','o','n','o',0}; + WCHAR base_path[MAX_PATH]; + const char *unix_data_dir; + WCHAR *dos_data_dir; + int build_tree=0; + static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); + + /* First try c:\windows\mono */ + GetWindowsDirectoryW(base_path, MAX_PATH); + strcatW(base_path, subdir_mono); + + if (get_mono_path_from_folder(base_path, path)) + return TRUE; + + /* Next: /usr/share/wine/mono */ + unix_data_dir = wine_get_data_dir(); + + if (!unix_data_dir) + { + unix_data_dir = wine_get_build_dir(); + build_tree = 1; + } + + if (unix_data_dir) + { + if (!wine_get_dos_file_name) + wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + + if (wine_get_dos_file_name) + { + dos_data_dir = wine_get_dos_file_name(unix_data_dir); + + if (dos_data_dir) + { + strcpyW(base_path, dos_data_dir); + strcatW(base_path, build_tree ? sibling_mono : subdir_mono); + + HeapFree(GetProcessHeap(), 0, dos_data_dir); + + if (get_mono_path_from_folder(base_path, path)) + return TRUE; + } + } + } + + /* Last: the registry */ + return get_mono_path_from_registry(path); } static BOOL get_install_root(LPWSTR install_dir) @@ -139,8 +242,6 @@ static void set_environment(LPCWSTR bin_path) static HMODULE load_mono(void) { - static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; - static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; static const WCHAR bin[] = {'\\','b','i','n',0}; static const WCHAR lib[] = {'\\','l','i','b',0}; static const WCHAR etc[] = {'\\','e','t','c',0}; @@ -148,6 +249,7 @@ static HMODULE load_mono(void) WCHAR mono_path[MAX_PATH], mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int abi_version; EnterCriticalSection(&mono_lib_cs); @@ -167,16 +269,11 @@ static HMODULE load_mono(void) strcatW(mono_etc_path, etc); WideCharToMultiByte(CP_UTF8, 0, mono_etc_path, -1, mono_etc_path_a, MAX_PATH, NULL, NULL); - strcpyW(mono_dll_path, mono_path); - strcatW(mono_dll_path, mono_dll); - mono_handle = LoadLibraryW(mono_dll_path); + if (!find_mono_dll(mono_path, mono_dll_path, &abi_version)) goto end; - if (!mono_handle) - { - strcpyW(mono_dll_path, mono_path); - strcatW(mono_dll_path, libmono_dll); - mono_handle = LoadLibraryW(mono_dll_path); - } + if (abi_version != 1) goto end; + + mono_handle = LoadLibraryW(mono_dll_path); if (!mono_handle) goto end;

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateMeshFVF.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: e4182ead47ff4094dd397afccf3c0e5c59c05b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4182ead47ff4094dd397afcc… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Sep 22 18:42:57 2010 -0500 d3dx9_36: Implement D3DXCreateMeshFVF. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 17 +++++ dlls/d3dx9_36/tests/mesh.c | 140 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 159 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e2e401c..133ce16 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -72,7 +72,7 @@ @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) -@ stub D3DXCreateMeshFVF +@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh @ stub D3DXCreatePMeshFromStream @ stub D3DXCreatePatchMesh diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 166000f..3e5dd47 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1038,6 +1038,23 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, return D3D_OK; } +/************************************************************************* + * D3DXCreateMeshFVF + */ +HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD options, DWORD fvf, + LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) +{ + HRESULT hr; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; + + TRACE("(%u, %u, %u, %u, %p, %p)\n", numfaces, numvertices, options, fvf, device, mesh); + + hr = D3DXDeclaratorFromFVF(fvf, declaration); + if (FAILED(hr)) return hr; + + return D3DXCreateMesh(numfaces, numvertices, options, declaration, device, mesh); +} + HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c55a3c7..2404024 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1208,6 +1208,145 @@ static void D3DXCreateMeshTest(void) DestroyWindow(wnd); } +static void D3DXCreateMeshFVFTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device, *test_device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *d3dxmesh; + int i, size; + D3DVERTEXELEMENT9 test_decl[MAX_FVF_DECL_SIZE]; + DWORD options; + struct mesh mesh; + + static const D3DVERTEXELEMENT9 decl[3] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), }; + + hr = D3DXCreateMeshFVF(0, 0, 0, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateMeshFVF(0, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 0, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, 0, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, 0xdeadbeef, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + /* device */ + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, &test_device); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(test_device == device, "Got result %p, expected %p\n", test_device, device); + + if (hr == D3D_OK) + { + IDirect3DDevice9_Release(device); + } + + /* declaration */ + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, test_decl); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + size = sizeof(decl) / sizeof(decl[0]); + for (i = 0; i < size - 1; i++) + { + ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); + ok(test_decl[i].Type == decl[i].Type, "Returned type %d, expected %d\n", test_decl[i].Type, decl[i].Type); + ok(test_decl[i].Method == decl[i].Method, "Returned method %d, expected %d\n", test_decl[i].Method, decl[i].Method); + ok(test_decl[i].Usage == decl[i].Usage, "Returned usage %d, expected %d\n", test_decl[i].Usage, decl[i].Usage); + ok(test_decl[i].UsageIndex == decl[i].UsageIndex, "Returned usage index %d, expected %d\n", + test_decl[i].UsageIndex, decl[i].UsageIndex); + ok(test_decl[i].Offset == decl[i].Offset, "Returned offset %d, expected %d\n", test_decl[i].Offset, decl[i].Offset); + } + ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + + /* options */ + options = d3dxmesh->lpVtbl->GetOptions(d3dxmesh); + ok(options == D3DXMESH_MANAGED, "Got result %x, expected %x (D3DXMESH_MANAGED)\n", options, D3DXMESH_MANAGED); + + /* rest */ + if (!new_mesh(&mesh, 3, 1)) + { + skip("Couldn't create mesh\n"); + } + else + { + memset(mesh.vertices, 0, mesh.number_of_vertices * sizeof(*mesh.vertices)); + memset(mesh.faces, 0, mesh.number_of_faces * sizeof(*mesh.faces)); + mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + + compare_mesh("createmeshfvf", d3dxmesh, &mesh); + + free_mesh(&mesh); + } + + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -1624,6 +1763,7 @@ START_TEST(mesh) D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); D3DXCreateMeshTest(); + D3DXCreateMeshFVFTest(); D3DXCreateSphereTest(); test_get_decl_length(); test_get_decl_vertex_size(); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 02dc7a9..de34dd3 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -151,6 +151,7 @@ extern "C" { #endif HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); +HRESULT WINAPI D3DXCreateMeshFVF(DWORD, DWORD, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010