April 2010 - Wine-commits - list.winehq.org

Wolfram Sang : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: f00b8b9c135ffc6ec7c62bd7c095a52888cd45aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00b8b9c135ffc6ec7c62bd7c… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Apr 3 16:48:56 2010 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 205 +++++++++++++++++++--------------------------------- tools/config.sub | 99 ++++++++++++++++++------- 2 files changed, 144 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f00b8b9c135ffc6ec7c62…

1 0

Alexandre Julliard : d3dx9_36: Don' t include the bison-generated header from the bison source file.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 4bfc99b86c5290a9c705315b6469831b3c27894d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfc99b86c5290a9c705315b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 15:30:48 2010 +0200 d3dx9_36: Don't include the bison-generated header from the bison source file. --- dlls/d3dx9_36/asmshader.y | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 8bc93c1..93741b6 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -25,7 +25,6 @@ #include "wine/debug.h" #include "d3dx9_36_private.h" -#include "asmshader.tab.h" #include <stdio.h>

1 0

Henri Verbeet : wined3d: Add a separate function for wined3d object initialization.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 5ce986f1de9af55623cab860c033374e0a6fe62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce986f1de9af55623cab860c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:37 2010 +0200 wined3d: Add a separate function for wined3d object initialization. --- dlls/wined3d/directx.c | 24 ++++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 40 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bddb40e..9a2034b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5020,7 +5020,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) } } -BOOL InitAdapters(IWineD3DImpl *This) +static BOOL InitAdapters(IWineD3DImpl *This) { static HMODULE mod_gl; BOOL ret; @@ -5318,7 +5318,7 @@ nogl_adapter: * IWineD3D VTbl follows **********************************************************/ -const IWineD3DVtbl IWineD3D_Vtbl = +static const struct IWineD3DVtbl IWineD3D_Vtbl = { /* IUnknown */ IWineD3DImpl_QueryInterface, @@ -5348,3 +5348,23 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = { wined3d_null_wined3d_object_destroyed, }; + +HRESULT wined3d_init(IWineD3DImpl *wined3d, UINT version, IUnknown *parent) +{ + wined3d->lpVtbl = &IWineD3D_Vtbl; + wined3d->dxVersion = version; + wined3d->ref = 1; + wined3d->parent = parent; + + if (!InitAdapters(wined3d)) + { + WARN("Failed to initialize adapters.\n"); + if (version > 7) + { + MESSAGE("Direct3D%u is not available without OpenGL.\n", version); + return E_FAIL; + } + } + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e226749..2a96698 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -75,27 +75,27 @@ wined3d_settings_t wined3d_settings = FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ }; -IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent) { - IWineD3DImpl* object; +IWineD3D * WINAPI WineDirect3DCreate(UINT version, IUnknown *parent) +{ + IWineD3DImpl *object; + HRESULT hr; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DImpl)); - object->lpVtbl = &IWineD3D_Vtbl; - object->dxVersion = dxVersion; - object->ref = 1; - object->parent = parent; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate wined3d object memory.\n"); + return NULL; + } - if (!InitAdapters(object)) + hr = wined3d_init(object, version, parent); + if (FAILED(hr)) { - WARN("Failed to initialize direct3d adapters, Direct3D will not be available\n"); - if (dxVersion > 7) - { - ERR("Direct3D%d is not available without opengl\n", dxVersion); - HeapFree(GetProcessHeap(), 0, object); - return NULL; - } + WARN("Failed to initialize wined3d object, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return NULL; } - TRACE("Created WineD3D object @ %p for d3d%d support\n", object, dxVersion); + TRACE("Created wined3d object %p for d3d%d support.\n", object, version); return (IWineD3D *)object; } @@ -120,7 +120,7 @@ static void CDECL wined3d_do_nothing(void) { } -static BOOL wined3d_init(HINSTANCE hInstDLL) +static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; HMODULE mod; @@ -333,7 +333,7 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) return TRUE; } -static BOOL wined3d_destroy(HINSTANCE hInstDLL) +static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx = context_get_tls_idx(); unsigned int i; @@ -473,10 +473,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) switch (fdwReason) { case DLL_PROCESS_ATTACH: - return wined3d_init(hInstDLL); + return wined3d_dll_init(hInstDLL); case DLL_PROCESS_DETACH: - return wined3d_destroy(hInstDLL); + return wined3d_dll_destroy(hInstDLL); case DLL_THREAD_DETACH: { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ab732b..038d784 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1567,11 +1567,9 @@ typedef struct IWineD3DImpl struct wined3d_adapter adapters[1]; } IWineD3DImpl; -extern const IWineD3DVtbl IWineD3D_Vtbl DECLSPEC_HIDDEN; - +HRESULT wined3d_init(IWineD3DImpl *wined3d, UINT version, IUnknown *parent) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; -BOOL InitAdapters(IWineD3DImpl *This) DECLSPEC_HIDDEN; /* A helper function that dumps a resource list */ void dumpResources(struct list *list) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply inline dumpResources().
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: fcee05586b9ea7b741cbce238367d0650d765b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcee05586b9ea7b741cbce238… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:38 2010 +0200 wined3d: Simply inline dumpResources(). --- dlls/wined3d/device.c | 12 ++++++++++-- dlls/wined3d/resource.c | 8 -------- dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1b1db6..c699032 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -610,9 +610,17 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ - if (!list_empty(&This->resources)) { + if (!list_empty(&This->resources)) + { + IWineD3DResourceImpl *resource; FIXME("(%p) Device released with resources still bound, acceptable but unexpected\n", This); - dumpResources(&This->resources); + + LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry) + { + WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource); + FIXME("Leftover resource %p with type %s (%#x).\n", + resource, debug_d3dresourcetype(type), type); + } } if(This->contexts) ERR("Context array not freed!\n"); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 154ff8b..67622a3 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -247,11 +247,3 @@ HRESULT resource_get_parent(IWineD3DResource *iface, IUnknown **pParent) *pParent = This->resource.parent; return WINED3D_OK; } - -void dumpResources(struct list *list) { - IWineD3DResourceImpl *resource; - - LIST_FOR_EACH_ENTRY(resource, list, IWineD3DResourceImpl, resource.resource_list_entry) { - FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource))); - } -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 038d784..470c7f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1571,9 +1571,6 @@ HRESULT wined3d_init(IWineD3DImpl *wined3d, UINT version, IUnknown *parent) DECL BOOL wined3d_register_window(HWND window, struct IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; -/* A helper function that dumps a resource list */ -void dumpResources(struct list *list) DECLSPEC_HIDDEN; - /***************************************************************************** * IWineD3DDevice implementation structure */

1 0

Henri Verbeet : wined3d: Make some functions static.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 224c376528c862d589001ccd789838df5161c503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=224c376528c862d589001ccd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:39 2010 +0200 wined3d: Make some functions static. --- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c699032..fd57335 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6250,9 +6250,9 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRE return FALSE; } -void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) { +static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; IWineD3DBaseShaderImpl *shader; @@ -6294,9 +6294,9 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ swapchain->num_contexts = 0; } -HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) { +static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface; struct wined3d_context *context; HRESULT hr; IWineD3DSurfaceImpl *target; @@ -6453,7 +6453,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock); IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock); - delete_opengl_contexts(iface, (IWineD3DSwapChain *) swapchain); + delete_opengl_contexts(iface, swapchain); if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width; @@ -6581,7 +6581,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } } - hr = create_primary_opengl_context(iface, (IWineD3DSwapChain *) swapchain); + hr = create_primary_opengl_context(iface, swapchain); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); /* All done. There is no need to reload resources or shaders, this will happen automatically on the diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a2034b..1513425 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1247,7 +1247,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s -enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more @@ -1491,7 +1491,7 @@ enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info * } -enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx @@ -1647,7 +1647,7 @@ enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_ } -enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { if (strstr(gl_renderer, "X3100")) @@ -1673,7 +1673,7 @@ enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *g } -enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx @@ -1882,7 +1882,7 @@ enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_in } -enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n"); @@ -1893,7 +1893,7 @@ enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl return CARD_NVIDIA_RIVA_128; } -enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 470c7f0..de2a6af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1217,9 +1217,6 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DEC void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; -void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN; -HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN; - /* Macros for doing basic GPU detection based on opengl capabilities */ #define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE]) #define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3])

1 0

Henri Verbeet : wined3d: Rename HW_VENDOR_WINE to HW_VENDOR_SOFTWARE.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: b8211a67d4be1e9132ba963a54930df94cbd8bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8211a67d4be1e9132ba963a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:40 2010 +0200 wined3d: Rename HW_VENDOR_WINE to HW_VENDOR_SOFTWARE. Software adapters like the refrast also return a 0 PCI ID on Windows. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1513425..b67ede8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1238,7 +1238,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "Mesa") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.")) - return HW_VENDOR_WINE; + return HW_VENDOR_SOFTWARE; FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_NVIDIA.\n", debugstr_a(gl_vendor_string)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de2a6af..6f894d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1270,7 +1270,7 @@ enum wined3d_gl_vendor enum wined3d_pci_vendor { - HW_VENDOR_WINE = 0x0000, + HW_VENDOR_SOFTWARE = 0x0000, HW_VENDOR_ATI = 0x1002, HW_VENDOR_NVIDIA = 0x10de, HW_VENDOR_INTEL = 0x8086,

1 0

Henri Verbeet : wined3d: Rename some GL vendors.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: ca1b35aaffd6250fd2c4ff57190b2e5d6c8ea183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1b35aaffd6250fd2c4ff571… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:41 2010 +0200 wined3d: Rename some GL vendors. GL_VENDOR_ATI -> GL_VENDOR_FGLRX because it's much more specific. Besides, AMD also works on the Mesa drivers. --- dlls/wined3d/directx.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b67ede8..253ec4a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -571,7 +571,7 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - return (gl_vendor == GL_VENDOR_ATI); + return gl_vendor == GL_VENDOR_FGLRX; } @@ -1197,7 +1197,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl return GL_VENDOR_NVIDIA; if (strstr(gl_vendor_string, "ATI")) - return GL_VENDOR_ATI; + return GL_VENDOR_FGLRX; if (strstr(gl_vendor_string, "Intel(R)") || strstr(gl_renderer, "Intel(R)") @@ -1214,9 +1214,10 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl || strstr(gl_renderer, "Gallium")) return GL_VENDOR_MESA; - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_WINE.\n", debugstr_a(gl_vendor_string)); + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", + debugstr_a(gl_vendor_string)); - return GL_VENDOR_WINE; + return GL_VENDOR_UNKNOWN; } static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) @@ -1916,7 +1917,7 @@ static const struct vendor_card_selection vendor_card_select_table[] = {GL_VENDOR_APPLE, HW_VENDOR_NVIDIA, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_ATI, "Apple OSX AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel_binary}, - {GL_VENDOR_ATI, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, + {GL_VENDOR_FGLRX, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_MESA, HW_VENDOR_ATI, "Mesa AMD/ATI driver", select_card_ati_mesa}, {GL_VENDOR_MESA, HW_VENDOR_NVIDIA, "Mesa Nouveau driver", select_card_nvidia_mesa}, {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f894d2..726281d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1259,9 +1259,9 @@ typedef struct WineD3D_PixelFormat enum wined3d_gl_vendor { - GL_VENDOR_WINE, + GL_VENDOR_UNKNOWN, GL_VENDOR_APPLE, - GL_VENDOR_ATI, + GL_VENDOR_FGLRX, GL_VENDOR_INTEL, GL_VENDOR_MESA, GL_VENDOR_NVIDIA,

1 0

Mikhail Maroukhine : winedump: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 23547c0ffdfa33a7e93d0bda3db0b17296b3d7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23547c0ffdfa33a7e93d0bda3… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Apr 2 23:44:37 2010 +0700 winedump: Fix compiler warnings with flag -Wcast-qual. --- tools/winedump/search.c | 55 ++++++++++++++++++++++----------------------- tools/winedump/symbol.c | 3 +- tools/winedump/winedump.h | 2 +- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 2893697..2538caf 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -242,34 +242,33 @@ static int symbol_from_prototype (parsed_symbol *sym, const char *proto) static const char *get_type (parsed_symbol *sym, const char *proto, int arg) { int is_const, is_volatile, is_struct, is_signed, is_unsigned, ptrs = 0; - const char *iter, *type_str, *base_type, *catch_unsigned; - char dest_type, *type_str_tmp; + const char *iter, *base_type, *catch_unsigned, *proto_str; + char dest_type, *type_str; assert (sym && sym->symbol); assert (proto && *proto); assert (arg < 0 || (unsigned)arg == sym->argc); - type_str = proto; - proto = str_match (proto, "const", &is_const); - proto = str_match (proto, "volatile", &is_volatile); - proto = str_match (proto, "struct", &is_struct); + proto_str = str_match (proto, "const", &is_const); + proto_str = str_match (proto_str, "volatile", &is_volatile); + proto_str = str_match (proto_str, "struct", &is_struct); if (!is_struct) - proto = str_match (proto, "union", &is_struct); + proto_str = str_match (proto_str, "union", &is_struct); - catch_unsigned = proto; + catch_unsigned = proto_str; - proto = str_match (proto, "unsigned", &is_unsigned); - proto = str_match (proto, "signed", &is_signed); + proto_str = str_match (proto_str, "unsigned", &is_unsigned); + proto_str = str_match (proto_str, "signed", &is_signed); /* Can have 'unsigned const' or 'const unsigned' etc */ if (!is_const) - proto = str_match (proto, "const", &is_const); + proto_str = str_match (proto_str, "const", &is_const); if (!is_volatile) - proto = str_match (proto, "volatile", &is_volatile); + proto_str = str_match (proto_str, "volatile", &is_volatile); - base_type = proto; - iter = str_find_set (proto, " ,*)"); + base_type = proto_str; + iter = str_find_set (proto_str, " ,*)"); if (!iter) return NULL; @@ -279,7 +278,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (strncmp (base_type, "int", 3) && strncmp (base_type, "long", 4) && strncmp (base_type, "short", 5) && strncmp (base_type, "char", 4)) { - iter = proto; + iter = proto_str; base_type = catch_unsigned; } else catch_unsigned = NULL; @@ -288,22 +287,22 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) catch_unsigned = NULL; /* FIXME: skip const/volatile here too */ - for (proto = iter; *proto; proto++) - if (*proto == '*') + for (proto_str = iter; *proto_str; proto_str++) + if (*proto_str == '*') ptrs++; - else if (*proto != ' ') + else if (*proto_str != ' ') break; - if (!*proto) + if (!*proto_str) return NULL; - type_str = type_str_tmp = str_substring (type_str, proto); + type_str = str_substring (proto, proto_str); if (iter == base_type || catch_unsigned) { /* 'unsigned' with no type */ char *tmp = str_create (2, type_str, " int"); - free (type_str_tmp); - type_str = type_str_tmp = tmp; + free (type_str); + type_str = tmp; } symbol_clean_string (type_str); @@ -319,23 +318,23 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) sym->arg_type [arg] = dest_type; sym->arg_flag [arg] = is_const ? CT_CONST : is_volatile ? CT_VOLATILE : 0; - if (*proto == ',' || *proto == ')') + if (*proto_str == ',' || *proto_str == ')') sym->arg_name [arg] = str_create_num (1, arg, "arg"); else { - iter = str_find_set (proto, " ,)"); + iter = str_find_set (proto_str, " ,)"); if (!iter) { - free (type_str_tmp); + free (type_str); return NULL; } - sym->arg_name [arg] = str_substring (proto, iter); - proto = iter; + sym->arg_name [arg] = str_substring (proto_str, iter); + proto_str = iter; } sym->arg_text [arg] = (char*)type_str; } - return proto; + return proto_str; } diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index 13725e5..9fd5c6f 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -287,10 +287,9 @@ int symbol_get_type (const char *string) * * Make a type string more Wine-friendly. Logically const :-) */ -void symbol_clean_string (const char *string) +void symbol_clean_string (char *str) { const char * const *tab = swap_after; - char *str = (char *)string; #define SWAP(i, p, x, y) do { i = p; while ((i = str_replace (i, x, y))); } while(0) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index d7e4e1d..82eb6d8 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -176,7 +176,7 @@ const char *symbol_get_call_convention(const parsed_symbol *sym); const char *symbol_get_spec_type (const parsed_symbol *sym, size_t arg); -void symbol_clean_string (const char *string); +void symbol_clean_string (char *string); int symbol_get_type (const char *string);

1 0

Vincent Povirk : ngen.exe: Add stubbed command.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 4d3e6f4c7f5526ffbe22e48a1c02c66b92da24e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3e6f4c7f5526ffbe22e48a1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 2 10:19:18 2010 -0500 ngen.exe: Add stubbed command. --- configure | 1 + configure.ac | 1 + programs/ngen/Makefile.in | 13 +++++++++++++ programs/ngen/ngen_main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 2 ++ 5 files changed, 50 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0d4e64f..4dc93f3 100755 --- a/configure +++ b/configure @@ -14662,6 +14662,7 @@ wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec installbin wine_fn_config_program net enable_net install +wine_fn_config_program ngen enable_ngen install wine_fn_config_program notepad enable_notepad installbin wine_fn_config_program oleview enable_oleview install wine_fn_config_program ping enable_ping install diff --git a/configure.ac b/configure.ac index 835a128..c73de4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2655,6 +2655,7 @@ WINE_CONFIG_PROGRAM(lodctr,install) WINE_CONFIG_PROGRAM(mshta,install) WINE_CONFIG_PROGRAM(msiexec,installbin) WINE_CONFIG_PROGRAM(net,install) +WINE_CONFIG_PROGRAM(ngen,install) WINE_CONFIG_PROGRAM(notepad,installbin) WINE_CONFIG_PROGRAM(oleview,install) WINE_CONFIG_PROGRAM(ping,install) diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in new file mode 100644 index 0000000..bfdb124 --- /dev/null +++ b/programs/ngen/Makefile.in @@ -0,0 +1,13 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ngen.exe +APPMODE = -mconsole -municode +IMPORTS = kernel32 + +C_SRCS = \ + ngen_main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/ngen/ngen_main.c b/programs/ngen/ngen_main.c new file mode 100644 index 0000000..c379340 --- /dev/null +++ b/programs/ngen/ngen_main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ngen); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a0c5b35..53c3461 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2573,6 +2573,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +10,Microsoft.NET\Framework\v1.1.4322,ngen.exe +10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Stefan Leichter : ws2_32: In setsockopt implement IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP only when supported .
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 5ccbcfdec78e78b54b6707278605f5c3f9e51412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccbcfdec78e78b54b6707278… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Apr 2 19:54:44 2010 +0200 ws2_32: In setsockopt implement IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP only when supported. --- dlls/ws2_32/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0918779..e6a6973 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3524,8 +3524,12 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IPV6: switch(optname) { +#ifdef IPV6_ADD_MEMBERSHIP case WS_IPV6_ADD_MEMBERSHIP: +#endif +#ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: +#endif case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP:

1 0