October 2009 - Wine-Commits

André Hentschel : ntdll: Implement KeyNameInformation.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 3259c81e10541e606b1e3e165174074dbe087d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3259c81e10541e606b1e3e165… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 25 15:40:43 2009 +0100 ntdll: Implement KeyNameInformation. --- dlls/ntdll/reg.c | 9 +++++++++ include/winternl.h | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index f9db5a6..7d24a9b 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -217,6 +217,7 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyBasicInformation: data_ptr = ((KEY_BASIC_INFORMATION *)info)->Name; break; case KeyFullInformation: data_ptr = ((KEY_FULL_INFORMATION *)info)->Class; break; case KeyNodeInformation: data_ptr = ((KEY_NODE_INFORMATION *)info)->Name; break; + case KeyNameInformation: data_ptr = ((KEY_NAME_INFORMATION *)info)->Name; break; default: FIXME( "Information class %d not implemented\n", info_class ); return STATUS_INVALID_PARAMETER; @@ -280,6 +281,14 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i memcpy( info, &keyinfo, min( length, fixed_size ) ); } break; + case KeyNameInformation: + { + KEY_NAME_INFORMATION keyinfo; + fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; + keyinfo.NameLength = reply->namelen; + memcpy( info, &keyinfo, min( length, fixed_size ) ); + } + break; } *result_len = fixed_size + reply->total; if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; diff --git a/include/winternl.h b/include/winternl.h index a78e9e5..633239f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -614,7 +614,8 @@ typedef enum _FSINFOCLASS { typedef enum _KEY_INFORMATION_CLASS { KeyBasicInformation, KeyNodeInformation, - KeyFullInformation + KeyFullInformation, + KeyNameInformation } KEY_INFORMATION_CLASS; typedef enum _KEY_VALUE_INFORMATION_CLASS { @@ -1068,6 +1069,11 @@ typedef struct _KEY_FULL_INFORMATION WCHAR Class[1]; } KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; +typedef struct _KEY_NAME_INFORMATION { + ULONG NameLength; + WCHAR Name[1]; +} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; + typedef struct _KEY_VALUE_ENTRY { PUNICODE_STRING ValueName;

1 0

André Hentschel : ntdll: Stub for RtlNumberGenericTableElements.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 5a9564d9389e8b1a47f01da58fb1bac570623d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9564d9389e8b1a47f01da58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 25 15:35:48 2009 +0100 ntdll: Stub for RtlNumberGenericTableElements. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 00b29db..382feb3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -750,7 +750,7 @@ # @ stub RtlNtPathNameToDosPathName @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) -@ stub RtlNumberGenericTableElements +@ stdcall RtlNumberGenericTableElements(ptr) # @ stub RtlNumberGenericTableElementsAvl @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1477a65..ad4bc10 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -449,6 +449,15 @@ PVOID RtlEnumerateGenericTableWithoutSplaying(PVOID pTable, PVOID *RestartKey) } /****************************************************************************** + * RtlNumberGenericTableElements [NTDLL.@] + */ +ULONG RtlNumberGenericTableElements(PVOID pTable) +{ + FIXME("(%p) stub!\n", pTable); + return 0; +} + +/****************************************************************************** * RtlMoveMemory [NTDLL.@] * * Move a block of memory that may overlap.

1 0

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

Oct. 26, 2009

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

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

Oct. 26, 2009

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

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

Oct. 26, 2009

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 Oct. 26, 2009

Oct. 26, 2009

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

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

Oct. 26, 2009

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: Refuse to parse shaders with an invalid version token.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: de82b55b209c454c903f25bb4dff5a1628f8c325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de82b55b209c454c903f25bb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:17 2009 +0100 wined3d: Refuse to parse shaders with an invalid version token. --- dlls/wined3d/shader_sm1.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index aef817e..64876b3 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -506,7 +506,18 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) { - struct wined3d_sm1_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); + struct wined3d_sm1_data *priv; + BYTE major, minor; + + major = WINED3D_SM1_VERSION_MAJOR(*byte_code); + minor = WINED3D_SM1_VERSION_MINOR(*byte_code); + if (WINED3D_SHADER_VERSION(major, minor) > WINED3D_SHADER_VERSION(3, 0)) + { + WARN("Invalid shader version %u.%u (%#x).\n", major, minor, *byte_code); + return NULL; + } + + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); if (!priv) { ERR("Failed to allocate private data\n");

1 0

Henri Verbeet : wined3d: Print an ERR instead of crashing in context_check_fbo_status().
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 483d5d0a0d74c83aa140b9865ab73f2026a66568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d5d0a0d74c83aa140b9865… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:19 2009 +0100 wined3d: Print an ERR instead of crashing in context_check_fbo_status(). Some version of Mesa will claim the window system provided framebuffer is incomplete when using indirect rendering, although the framebuffer objects spec says this can never happen. Printing an ERR instead of crashing should make it clearer that this isn't a wined3d problem. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66ba358..de50f9e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -288,6 +288,12 @@ static void context_check_fbo_status(struct wined3d_context *context) unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); + if (!context->current_fbo) + { + ERR("FBO 0 is incomplete, driver bug?\n"); + return; + } + /* Dump the FBO attachments */ for (i = 0; i < gl_info->max_buffers; ++i) {

1 0

Vladimir Pankratov : setupapi: Update Russian translation.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

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