October 2009 - Wine-commits

Stefan Dösinger : wined3d: Get rid of the general shader constant limit.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: f9c4d442a9f9e5cde378c91775c711d82e6d5291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c4d442a9f9e5cde378c9177… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:05:42 2009 -0700 wined3d: Get rid of the general shader constant limit. --- dlls/wined3d/directx.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 06240e5..c145bf9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -408,34 +408,6 @@ static void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_se } } -/** Select the number of report maximum shader constants based on the selected shader modes */ -static void select_shader_max_constants(int ps_selected_mode, int vs_selected_mode, struct wined3d_gl_info *gl_info) -{ - switch (vs_selected_mode) { - case SHADER_GLSL: - gl_info->max_vshader_constantsF = gl_info->max_vs_glsl_constantsF; - break; - case SHADER_ARB: - gl_info->max_vshader_constantsF = gl_info->max_vs_arb_constantsF; - break; - default: - gl_info->max_vshader_constantsF = 0; - break; - } - - switch (ps_selected_mode) { - case SHADER_GLSL: - gl_info->max_pshader_constantsF = gl_info->max_ps_glsl_constantsF; - break; - case SHADER_ARB: - gl_info->max_pshader_constantsF = gl_info->max_ps_arb_constantsF; - break; - default: - gl_info->max_pshader_constantsF = 0; - break; - } -} - /********************************************************** * IWineD3D parts follows **********************************************************/ @@ -3780,10 +3752,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - /* This function should *not* be modifying GL caps - * TODO: move the functionality where it belongs */ - select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info); - /* ------------------------------------------------ The following fields apply to both d3d8 and d3d9 ------------------------------------------------ */ @@ -4882,7 +4850,6 @@ BOOL InitAdapters(IWineD3DImpl *This) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info); fillGLAttribFuncs(&adapter->gl_info); adapter->opengl = TRUE; }

1 0

Stefan Dösinger : wined3d: Use the ARB native constant limit in the GLSL-ARB constants quirk.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 641d6681d43776989bc7c105601dcc620ab71f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=641d6681d43776989bc7c1056… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 22:10:44 2009 +0200 wined3d: Use the ARB native constant limit in the GLSL-ARB constants quirk. Geforce 8 and Geforce 9 cards support 256 env and 1024 native constants. 1024 is the hardware limit we want to use if we overwrite the GLSL reported value with the ARB value on Mac OS (because Mac OS reports more constants than supported by HW on some cards). --- dlls/wined3d/directx.c | 15 +++++++++++---- dlls/wined3d/wined3d_gl.h | 5 ++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c145bf9..b7c0f8a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -688,10 +688,10 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { - TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->max_vs_arb_constantsF); - gl_info->max_vs_glsl_constantsF = gl_info->max_vs_arb_constantsF; - TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->max_ps_arb_constantsF); - gl_info->max_ps_glsl_constantsF = gl_info->max_ps_arb_constantsF; + TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->max_vs_arb_native_constants); + gl_info->max_vs_glsl_constantsF = gl_info->max_vs_arb_native_constants; + TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->max_ps_arb_native_constants); + gl_info->max_ps_glsl_constantsF = gl_info->max_ps_arb_native_constants; } static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) @@ -1593,6 +1593,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str gl_info->max_ps_glsl_constantsF = 0; gl_info->max_vs_arb_constantsF = 0; gl_info->max_ps_arb_constantsF = 0; + gl_info->max_vs_arb_native_constants = 0; gl_info->max_ps_arb_local_constants = 0; /* Retrieve opengl defaults */ @@ -1836,6 +1837,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->max_ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d.\n", gl_info->max_ps_arb_constantsF); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max)); + gl_info->max_ps_arb_native_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native float constants: %d.\n", gl_info->max_ps_arb_native_constants); GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->max_ps_arb_temps = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d.\n", gl_info->max_ps_arb_temps); @@ -1851,6 +1855,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->max_vs_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM float constants: %d.\n", gl_info->max_vs_arb_constantsF); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max)); + gl_info->max_vs_arb_native_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native float constants: %d.\n", gl_info->max_vs_arb_native_constants); GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->max_vs_arb_temps = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native temporaries: %d.\n", gl_info->max_vs_arb_temps); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 446a7a0..7ad25d8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4160,14 +4160,13 @@ struct wined3d_gl_info UINT max_glsl_varyings; float max_shininess; - unsigned int max_vshader_constantsF; - unsigned int max_pshader_constantsF; - unsigned int max_vs_arb_constantsF; + unsigned int max_vs_arb_native_constants; unsigned int max_vs_arb_instructions; unsigned int max_vs_arb_temps; unsigned int max_ps_arb_constantsF; unsigned int max_ps_arb_local_constants; + unsigned int max_ps_arb_native_constants; unsigned int max_ps_arb_instructions; unsigned int max_ps_arb_temps; unsigned int max_vs_glsl_constantsF;

1 0

Stefan Dösinger : wined3d: Take native constants into account when reporting ARB limits.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: f15fc8f41c71dbca404decae7c75da58286e59bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15fc8f41c71dbca404decae7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:09:52 2009 -0700 wined3d: Take native constants into account when reporting ARB limits. --- dlls/wined3d/arb_program_shader.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 855c368..2a618df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4519,6 +4519,9 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { + DWORD vs_consts = min(gl_info->max_vs_arb_constantsF, gl_info->max_vs_arb_native_constants); + DWORD ps_consts = min(gl_info->max_ps_arb_constantsF, gl_info->max_ps_arb_native_constants); + /* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps, * then overwrite the shader specific ones */ @@ -4530,7 +4533,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } - else if (gl_info->max_vs_arb_constantsF >= 256) + else if (vs_consts >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); @@ -4541,7 +4544,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = gl_info->max_vs_arb_constantsF; + pCaps->MaxVertexShaderConst = vs_consts; } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { @@ -4550,7 +4553,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if (gl_info->max_ps_arb_constantsF >= 32) + else if (ps_consts >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); @@ -4562,7 +4565,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } pCaps->PixelShader1xMaxValue = 8.0f; - pCaps->MaxPixelShaderConst = gl_info->max_ps_arb_constantsF; + pCaps->MaxPixelShaderConst = ps_consts; } pCaps->VSClipping = use_nv_clip(gl_info);

1 0

Alexander Nicolaysen Sørnes : include: Add defines for GetProductInfo.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 1c4c2bbf336d7839325ad49d3918a9d19a9660cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4c2bbf336d7839325ad49d3… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Thu Jun 25 23:36:46 2009 +0200 include: Add defines for GetProductInfo. --- include/winbase.h | 1 + include/winnt.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 791d58e..8117430 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1691,6 +1691,7 @@ WINBASEAPI BOOL WINAPI GetProcessShutdownParameters(LPDWORD,LPDWORD); WINBASEAPI BOOL WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); WINBASEAPI DWORD WINAPI GetProcessVersion(DWORD); WINBASEAPI BOOL WINAPI GetProcessWorkingSetSize(HANDLE,PSIZE_T,PSIZE_T); +WINBASEAPI BOOL WINAPI GetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); WINBASEAPI UINT WINAPI GetProfileIntA(LPCSTR,LPCSTR,INT); WINBASEAPI UINT WINAPI GetProfileIntW(LPCWSTR,LPCWSTR,INT); #define GetProfileInt WINELIB_NAME_AW(GetProfileInt) diff --git a/include/winnt.h b/include/winnt.h index 93c7961..fd267c3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1711,6 +1711,51 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); /* + * Product types + */ +#define PRODUCT_UNLICENSED 0xABCDABCD +#define PRODUCT_BUSINESS 0x00000006 +#define PRODUCT_BUSINESS_N 0x00000010 +#define PRODUCT_CLUSTER_SERVER 0x00000012 +#define PRODUCT_DATACENTER_SERVER 0x00000008 +#define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C +#define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 +#define PRODUCT_SERVER_V 0x00000025 +#define PRODUCT_ENTERPRISE 0x00000004 +#define PRODUCT_ENTERPRISE_N 0x0000001B +#define PRODUCT_ENTERPRISE_SERVER 0x0000000A +#define PRODUCT_ENTERPRISE_SERVER_CORE 0x0000000E +#define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029 +#define PRODUCT_ENTERPRISE_SERVER_IA64 0x0000000F +#define PRODUCT_ENTERPRISE_SERVER_V 0x00000026 +#define PRODUCT_HOME_BASIC 0x00000002 +#define PRODUCT_HOME_BASIC_N 0x00000005 +#define PRODUCT_HOME_PREMIUM 0x00000003 +#define PRODUCT_HOME_PREMIUM_N 0x0000001A +#define PRODUCT_HYPERV 0x0000002A +#define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E +#define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 +#define PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY 0x0000001F +#define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 +#define PRODUCT_SERVER_FOR_SMALLBUSINESS_V 0x00000023 +#define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 +#define PRODUCT_STANDARD_SERVER 0x00000007 +#define PRODUCT_STANDARD_SERVER_CORE 0x0000000D +#define PRODUCT_STANDARD_SERVER_CORE_V 0x00000028 +#define PRODUCT_STANDARD_SERVER_V 0x00000024 +#define PRODUCT_STARTER 0x0000000B +#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017 +#define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014 +#define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015 +#define PRODUCT_STORAGE_WORKGROUP_SERVER 0x00000016 +#define PRODUCT_UNDEFINED 0x00000000 +#define PRODUCT_ULTIMATE 0x00000001 +#define PRODUCT_ULTIMATE_N 0x0000001C +#define PRODUCT_WEB_SERVER 0x00000011 +#define PRODUCT_WEB_SERVER_CORE 0x0000001D + + +/* * Language IDs */ @@ -5234,6 +5279,8 @@ typedef enum _JOBOBJECTINFOCLASS MaxJobObjectInfoClass } JOBOBJECTINFOCLASS; +NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); + #ifdef __cplusplus } #endif

1 0

Alexander Nicolaysen Sørnes : ntdll: Add RtlGetProductInfo stub.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: ee0b76632adef21ff637d900a057613985fdf4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0b76632adef21ff637d900a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 25 15:09:37 2009 +0100 ntdll: Add RtlGetProductInfo stub. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/version.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 70647d2..00b29db 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -636,6 +636,7 @@ @ stdcall RtlGetNtProductType(ptr) @ stdcall RtlGetNtVersionNumbers(ptr ptr ptr) @ stdcall RtlGetOwnerSecurityDescriptor(ptr ptr ptr) +@ stdcall RtlGetProductInfo(long long long long ptr) @ stdcall RtlGetProcessHeaps(long ptr) @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) # @ stub RtlGetSecurityDescriptorRMControl diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 24531aa..c1f7cb1 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -527,6 +527,24 @@ done: current_version->wProductType ); } +/*********************************************************************** + * GetProductInfo (NTDLL.@) + * + * Gives info about the current Windows product type, in a format compatible + * with the given Windows version + * + * Returns TRUE if the input is valid, FALSE otherwise + */ +BOOLEAN WINAPI RtlGetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion, + DWORD dwSpMinorVersion, PDWORD pdwReturnedProductType) +{ + FIXME("(%d,%d,%d,%d,%p): stub\n", dwOSMajorVersion, dwOSMinorVersion, + dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); + + *pdwReturnedProductType = PRODUCT_ULTIMATE_N; + + return TRUE; +} /*********************************************************************** * RtlGetVersion (NTDLL.@)

1 0

Alexander Nicolaysen Sørnes : kernel32: Implement GetProductInfo on top of ntdll stub.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: fca16bc519f55f5c2703b1054d6c5fd8ad9a1871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca16bc519f55f5c2703b1054… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 25 15:11:28 2009 +0100 kernel32: Implement GetProductInfo on top of ntdll stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bf6078e..7e278b5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -599,6 +599,7 @@ @ stdcall GetProcessTimes(long ptr ptr ptr ptr) @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) +@ stdcall GetProductInfo(long long long long ptr) @ stub GetProductName @ stdcall GetProfileIntA(str str long) @ stdcall GetProfileIntW(wstr wstr long) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 162da8f..9f21435 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -186,3 +186,18 @@ DWORD WINAPI SetTermsrvAppInstallMode(BOOL bInstallMode) FIXME("(%d): stub\n", bInstallMode); return 0; } + +/*********************************************************************** + * GetProductInfo (KERNEL32.@) + * + * Gives info about the current Windows product type, in a format compatible + * with the given Windows version + * + * Returns TRUE if the input is valid, FALSE otherwise + */ +BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion, + DWORD dwSpMinorVersion, PDWORD pdwReturnedProductType) +{ + return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion, + dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); +}

1 0

Hans Leidekker : winhttp: Implement HTTP_OPTION_PARENT_HANDLE for connection handles.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 253d2c17d6264050c965f550b7103d174a5097d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253d2c17d6264050c965f550b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 26 09:56:33 2009 +0100 winhttp: Implement HTTP_OPTION_PARENT_HANDLE for connection handles. --- dlls/winhttp/session.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 448603f..9992e5b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -229,10 +229,36 @@ static void connect_destroy( object_header_t *hdr ) heap_free( connect ); } +static BOOL connect_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) +{ + connect_t *connect = (connect_t *)hdr; + + switch (option) + { + case WINHTTP_OPTION_PARENT_HANDLE: + { + if (!buffer || *buflen < sizeof(HINTERNET)) + { + *buflen = sizeof(HINTERNET); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + *(HINTERNET *)buffer = ((object_header_t *)connect->session)->handle; + *buflen = sizeof(HINTERNET); + return TRUE; + } + default: + FIXME("unimplemented option %u\n", option); + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } +} + static const object_vtbl_t connect_vtbl = { connect_destroy, - NULL, + connect_query_option, NULL };

1 0

Vladimir Pankratov : setupapi: Update Russian translation.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 49b24053ffd887c7418de07f02940d19dd1e4454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b24053ffd887c7418de07f0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Oct 26 14:48:30 2009 +0500 setupapi: Update Russian translation. --- dlls/setupapi/Ru.rc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ru.rc b/dlls/setupapi/Ru.rc index c5a6eec..2da20e3 100644 --- a/dlls/setupapi/Ru.rc +++ b/dlls/setupapi/Ru.rc @@ -45,3 +45,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Необходимы файлы" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Вставьте установочный диск, и затем\nпроверьте что выбран нужный привод", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Копировать файлы изготовителя из:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Отмена", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Обзор...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Henri Verbeet : wined3d: Remove a redundant ActivateContext() call.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 69bf1304765bdb064cc7bb6aae3c927cd65e816d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bf1304765bdb064cc7bb6aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:15 2009 +0100 wined3d: Remove a redundant ActivateContext() call. --- dlls/wined3d/buffer.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bbf95d7..c82fe17 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -802,10 +802,6 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) /* Nothing to do because we locked directly into the vbo */ if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER)) return; - if (!device->isInDraw) - { - ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); - } ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); checkGLcall("glBindBufferARB");

1 0

Henri Verbeet : wined3d: Add a separate structure for driver info.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 5fbe5ee02782ef73302c1e3610b3bdd52b038ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbe5ee02782ef73302c1e361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:16 2009 +0100 wined3d: Add a separate structure for driver info. --- dlls/wined3d/directx.c | 86 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 3 - dlls/wined3d/wined3d_private.h | 11 ++++- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6984a57..06240e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -991,6 +991,34 @@ static const struct driver_version_information driver_version_table[] = /* TODO: Add information about legacy ATI hardware, Intel and other cards. */ }; +static void init_driver_info(struct wined3d_driver_info *driver_info, WORD vendor, WORD device) +{ + unsigned int i; + + driver_info->name = "Display"; + driver_info->description = "Direct3D HAL"; + driver_info->version_high = MAKEDWORD_VERSION(7, 1); + driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ + + for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) + { + if (vendor == driver_version_table[i].vendor && device == driver_version_table[i].card) + { + TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", vendor, device); + + driver_info->description = driver_version_table[i].description; + driver_info->version_high = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, + driver_version_table[i].hipart_lo); + driver_info->version_low = MAKEDWORD_VERSION(driver_version_table[i].lopart_hi, + driver_version_table[i].lopart_lo); + break; + } + } + + TRACE_(d3d_caps)("Reporting (fake) driver version 0x%08x-0x%08x.\n", + driver_info->version_high, driver_info->version_low); +} + /* Context activation is done by the caller. */ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_renderer) { @@ -1005,28 +1033,6 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren /* Find out if PBOs work as they are supposed to. */ test_pbo_functionality(gl_info); - - /* Fixup the driver version we'll report to the app. */ - gl_info->driver_version = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ - gl_info->driver_version_hipart = MAKEDWORD_VERSION(7, 1); - for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) - { - if (gl_info->gl_vendor == driver_version_table[i].vendor - && gl_info->gl_card == driver_version_table[i].card) - { - TRACE_(d3d_caps)("Found card 0x%04x, 0x%04x in driver version DB.\n", - gl_info->gl_vendor, gl_info->gl_card); - - gl_info->driver_version = MAKEDWORD_VERSION(driver_version_table[i].lopart_hi, - driver_version_table[i].lopart_lo); - gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, - driver_version_table[i].hipart_lo); - gl_info->driver_description = driver_version_table[i].description; - break; - } - } - TRACE_(d3d_caps)("Reporting (fake) driver version 0x%08X-0x%08X.\n", - gl_info->driver_version_hipart, gl_info->driver_version); } static DWORD wined3d_parse_gl_version(const char *gl_version) @@ -1534,7 +1540,7 @@ static GL_Cards wined3d_guess_card(const struct wined3d_gl_info *gl_info, const } /* Context activation is done by the caller. */ -static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) +static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, struct wined3d_gl_info *gl_info) { const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; @@ -2075,6 +2081,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } fixup_extensions(gl_info, gl_renderer); + init_driver_info(driver_info, gl_info->gl_vendor, gl_info->gl_card); add_gl_compat_wrappers(gl_info); HeapFree(GetProcessHeap(), 0, gl_renderer); @@ -2296,6 +2303,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Adapter, DWORD Flags, WINED3DADAPTER_IDENTIFIER* pIdentifier) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + struct wined3d_adapter *adapter; size_t len; TRACE_(d3d_caps)("(%p}->(Adapter: %d, Flags: %x, pId=%p)\n", This, Adapter, Flags, pIdentifier); @@ -2304,25 +2312,22 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad return WINED3DERR_INVALIDCALL; } + adapter = &This->adapters[Adapter]; + /* Return the information requested */ TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n"); if (pIdentifier->driver_size) { - len = min(strlen(This->adapters[Adapter].driver), pIdentifier->driver_size - 1); - memcpy(pIdentifier->driver, This->adapters[Adapter].driver, len); + const char *name = adapter->driver_info.name; + len = min(strlen(name), pIdentifier->driver_size - 1); + memcpy(pIdentifier->driver, name, len); pIdentifier->driver[len] = '\0'; } if (pIdentifier->description_size) { - const char *description; - - if (This->adapters[Adapter].gl_info.driver_description) - description = This->adapters[Adapter].gl_info.driver_description; - else - description = This->adapters[Adapter].description; - + const char *description = adapter->driver_info.description; len = min(strlen(description), pIdentifier->description_size - 1); memcpy(pIdentifier->description, description, len); pIdentifier->description[len] = '\0'; @@ -2344,10 +2349,10 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad pIdentifier->device_name[len] = '\0'; } - pIdentifier->driver_version.u.HighPart = This->adapters[Adapter].gl_info.driver_version_hipart; - pIdentifier->driver_version.u.LowPart = This->adapters[Adapter].gl_info.driver_version; - pIdentifier->vendor_id = This->adapters[Adapter].gl_info.gl_vendor; - pIdentifier->device_id = This->adapters[Adapter].gl_info.gl_card; + pIdentifier->driver_version.u.HighPart = adapter->driver_info.version_high; + pIdentifier->driver_version.u.LowPart = adapter->driver_info.version_low; + pIdentifier->vendor_id = adapter->gl_info.gl_vendor; + pIdentifier->device_id = adapter->gl_info.gl_card; pIdentifier->subsystem_id = 0; pIdentifier->revision = 0; memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); @@ -4702,7 +4707,7 @@ BOOL InitAdapters(IWineD3DImpl *This) goto nogl_adapter; } - ret = IWineD3DImpl_FillGLCaps(&adapter->gl_info); + ret = IWineD3DImpl_FillGLCaps(&adapter->driver_info, &adapter->gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); @@ -4717,9 +4722,6 @@ BOOL InitAdapters(IWineD3DImpl *This) hdc = fake_gl_ctx.dc; - adapter->driver = "Display"; - adapter->description = "Direct3D HAL"; - /* Use the VideoRamSize registry setting when set */ if(wined3d_settings.emulated_textureram) adapter->TextureRam = wined3d_settings.emulated_textureram; @@ -4897,8 +4899,8 @@ nogl_adapter: This->adapters[0].monitorPoint.x = -1; This->adapters[0].monitorPoint.y = -1; - This->adapters[0].driver = "Display"; - This->adapters[0].description = "WineD3D DirectDraw Emulation"; + This->adapters[0].driver_info.name = "Display"; + This->adapters[0].driver_info.description = "WineD3D DirectDraw Emulation"; if(wined3d_settings.emulated_textureram) { This->adapters[0].TextureRam = wined3d_settings.emulated_textureram; } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e77be8b..446a7a0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4141,9 +4141,6 @@ struct wined3d_gl_info GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem; - DWORD driver_version; - DWORD driver_version_hipart; - const char *driver_description; UINT max_buffers; UINT max_lights; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc097fb..98fea80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1228,6 +1228,14 @@ typedef struct WineD3D_PixelFormat int numSamples; } WineD3D_PixelFormat; +struct wined3d_driver_info +{ + const char *name; + const char *description; + DWORD version_high; + DWORD version_low; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -1235,8 +1243,7 @@ struct wined3d_adapter BOOL opengl; POINT monitorPoint; struct wined3d_gl_info gl_info; - const char *driver; - const char *description; + struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ int nCfgs; WineD3D_PixelFormat *cfgs;

1 0