October 2009 - Wine-commits

Jörg Höhle : mciwave: Pause/ resume is not accepted from every state.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: bf4665780cf067fe8a014cf00b1353a65f1e278d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4665780cf067fe8a014cf00… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:37:40 2009 +0200 mciwave: Pause/resume is not accepted from every state. --- dlls/mciwave/mciwave.c | 42 ++++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 8eb6bad..a0415bd 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1130,16 +1130,23 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; - if (wmw->dwStatus == MCI_MODE_PLAY) { + switch (wmw->dwStatus) { + case MCI_MODE_PLAY: wmw->dwStatus = MCI_MODE_PAUSE; + dwRet = waveOutPause(wmw->hWave); + break; + case MCI_MODE_RECORD: + wmw->dwStatus = MCI_MODE_PAUSE; + dwRet = waveInStop(wmw->hWave); + break; + case MCI_MODE_PAUSE: + dwRet = MMSYSERR_NOERROR; + break; + default: + return MCIERR_NONAPPLICABLE_FUNCTION; } - - if (wmw->fInput) dwRet = waveInStop(wmw->hWave); - else dwRet = waveOutPause(wmw->hWave); - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; } @@ -1149,18 +1156,29 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - DWORD dwRet = 0; + DWORD dwRet; TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; - if (wmw->dwStatus == MCI_MODE_PAUSE) { - wmw->dwStatus = MCI_MODE_PLAY; + switch (wmw->dwStatus) { + case MCI_MODE_PAUSE: + if (wmw->fInput) { + wmw->dwStatus = MCI_MODE_RECORD; + dwRet = waveInStart(wmw->hWave); + } else { + wmw->dwStatus = MCI_MODE_PLAY; + dwRet = waveOutRestart(wmw->hWave); + } + break; + case MCI_MODE_PLAY: + case MCI_MODE_RECORD: + dwRet = MMSYSERR_NOERROR; + break; + default: + return MCIERR_NONAPPLICABLE_FUNCTION; } - - if (wmw->fInput) dwRet = waveInStart(wmw->hWave); - else dwRet = waveOutRestart(wmw->hWave); return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; }

1 0

Jörg Höhle : mciwave: Do not lie about state when winmm fails in Pause or Resume.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 3c6496d7b5ec76a722c9f2d7bf3d965d15461c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6496d7b5ec76a722c9f2d7b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 21:30:33 2009 +0200 mciwave: Do not lie about state when winmm fails in Pause or Resume. --- dlls/mciwave/mciwave.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index a0415bd..664cc44 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1134,20 +1134,28 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM switch (wmw->dwStatus) { case MCI_MODE_PLAY: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveOutPause(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { /* When playthread was not started yet, winmm not opened, error 5 MMSYSERR_INVALHANDLE */ + ERR("waveOutPause error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_RECORD: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveInStop(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { + ERR("waveInStop error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_PAUSE: dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /************************************************************************** @@ -1164,12 +1172,21 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR switch (wmw->dwStatus) { case MCI_MODE_PAUSE: + /* Only update dwStatus if wave* succeeds and will exchange buffers buffers. */ if (wmw->fInput) { - wmw->dwStatus = MCI_MODE_RECORD; dwRet = waveInStart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_RECORD; + else { + ERR("waveInStart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } else { - wmw->dwStatus = MCI_MODE_PLAY; dwRet = waveOutRestart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PLAY; + else { + ERR("waveOutRestart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } break; case MCI_MODE_PLAY: @@ -1177,9 +1194,9 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /**************************************************************************

1 0

Jörg Höhle : mciwave: Do not transition via Resume from Record into Play.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 3fc7da7f5e946016a382191d1add46a912a7cc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc7da7f5e946016a382191d1… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:40:28 2009 +0200 mciwave: Do not transition via Resume from Record into Play. --- dlls/mciwave/mciwave.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 664cc44..de78287 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -726,18 +726,18 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - wmw->fInput = FALSE; - if (wmw->hFile == 0) { WARN("Can't play: no file=%s!\n", debugstr_w(wmw->openParms.lpstrElementName)); return MCIERR_FILE_NOT_FOUND; } - if (wmw->dwStatus == MCI_MODE_PAUSE) { + if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput) { /* FIXME: parameters (start/end) in lpParams may not be used */ return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); } + wmw->fInput = FALSE; + /** This function will be called again by a thread when async is used. * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. @@ -972,16 +972,16 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmw->dwStatus == MCI_MODE_PAUSE && wmw->fInput) { + /* FIXME: parameters (start/end) in lpParams may not be used */ + return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); + } + /* FIXME : since there is no way to determine in which mode the device is * open (recording/playback) automatically switch from a mode to another */ wmw->fInput = TRUE; - if (wmw->dwStatus == MCI_MODE_PAUSE) { - /* FIXME: parameters (start/end) in lpParams may not be used */ - return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); - } - /** This function will be called again by a thread when async is used. * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread.

1 0

Jörg Höhle : mciwave: Send notification after everything else.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 7d002f228c410d4855803e0891006641ca955891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d002f228c410d4855803e089… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:41:10 2009 +0200 mciwave: Send notification after everything else. --- dlls/mciwave/mciwave.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index de78287..5270f25 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -884,14 +884,14 @@ cleanUp: } CloseHandle(wmw->hEvent); + wmw->dwStatus = MCI_MODE_STOP; + if (lpParms && (dwFlags & MCI_NOTIFY)) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wmw->openParms.wDeviceID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); } - wmw->dwStatus = MCI_MODE_STOP; - return dwRet; } @@ -1108,14 +1108,14 @@ cleanUp: } CloseHandle(wmw->hEvent); + wmw->dwStatus = MCI_MODE_STOP; + if (lpParms && (dwFlags & MCI_NOTIFY)) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wmw->openParms.wDeviceID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); } - wmw->dwStatus = MCI_MODE_STOP; - return dwRet; }

1 0

Stefan Dösinger : wined3d: Remove dead code.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 9ee65081324e54f479f6c30a1c2452b139c01416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee65081324e54f479f6c30a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 22:20:52 2009 +0200 wined3d: Remove dead code. --- dlls/wined3d/arb_program_shader.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a618df..9b1d06a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,12 +84,6 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } -/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vs_arb_constantsF) - 1, - * so upload them above that - */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vs_arb_constantsF) - 1) -#define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 - /* ARB_program_shader private data */ struct control_frame

1 0

Stefan Dösinger : wined3d: Use the native constant limit for fitting private constants.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 0c72464abf2af8c166c5bc618d4faeb9215e7b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c72464abf2af8c166c5bc618… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:17:22 2009 -0700 wined3d: Use the native constant limit for fitting private constants. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b1d06a..abbdf41 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -629,13 +629,13 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s */ if (pshader) { - max_constantsF = gl_info->max_ps_arb_constantsF; + max_constantsF = gl_info->max_ps_arb_native_constants; } else { if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = gl_info->max_vs_arb_constantsF - reserved_vs_const(iface, gl_info); + max_constantsF = gl_info->max_vs_arb_native_constants - reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -665,7 +665,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if (ctx->target_version >= NV2) *num_clipplanes = gl_info->max_clipplanes; else *num_clipplanes = min(gl_info->max_clipplanes, 4); - max_constantsF = gl_info->max_vs_arb_constantsF; + max_constantsF = gl_info->max_vs_arb_native_constants; } } @@ -698,6 +698,21 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s } } + /* After subtracting privately used constants from the hardware limit(they are loaded as + * local constants), make sure the shader doesn't violate the env constant limit + */ + if(pshader) + { + max_constantsF = min(max_constantsF, gl_info->max_ps_arb_constantsF); + } + else + { + max_constantsF = min(max_constantsF, gl_info->max_vs_arb_constantsF); + } + + /* Avoid declaring more constants than needed */ + max_constantsF = min(max_constantsF, This->baseShader.limits.constant_float); + /* we use the array-based constants array if the local constants are marked for loading, * because then we use indirect addressing, or when the local constant list is empty, * because then we don't know if we're using indirect addressing or not. If we're hardcoding

1 0

Rico Schüller : d3d10: Improve d3d10_variable_type().
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 0da0fa7e4d604b99791ae2857d2a476daa461347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da0fa7e4d604b99791ae2857… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:34 2009 +0100 d3d10: Improve d3d10_variable_type(). --- dlls/d3d10/effect.c | 52 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index af78987..0d1eab0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -299,17 +299,49 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) { - switch (t) + if(is_object) { - case 1: return D3D10_SVT_FLOAT; - case 2: return D3D10_SVT_INT; - case 3: return D3D10_SVT_UINT; - case 4: return D3D10_SVT_BOOL; - default: - FIXME("Unknown variable type %#x.\n", t); - return 0; + switch (t) + { + case 1: return D3D10_SVT_STRING; + case 2: return D3D10_SVT_BLEND; + case 3: return D3D10_SVT_DEPTHSTENCIL; + case 4: return D3D10_SVT_RASTERIZER; + case 5: return D3D10_SVT_PIXELSHADER; + case 6: return D3D10_SVT_VERTEXSHADER; + case 7: return D3D10_SVT_GEOMETRYSHADER; + + case 10: return D3D10_SVT_TEXTURE1D; + case 11: return D3D10_SVT_TEXTURE1DARRAY; + case 12: return D3D10_SVT_TEXTURE2D; + case 13: return D3D10_SVT_TEXTURE2DARRAY; + case 14: return D3D10_SVT_TEXTURE2DMS; + case 15: return D3D10_SVT_TEXTURE2DMSARRAY; + case 16: return D3D10_SVT_TEXTURE3D; + case 17: return D3D10_SVT_TEXTURECUBE; + + case 19: return D3D10_SVT_RENDERTARGETVIEW; + case 20: return D3D10_SVT_DEPTHSTENCILVIEW; + case 21: return D3D10_SVT_SAMPLER; + default: + FIXME("Unknown variable type %#x.\n", t); + return 0; + } + } + else + { + switch (t) + { + case 1: return D3D10_SVT_FLOAT; + case 2: return D3D10_SVT_INT; + case 3: return D3D10_SVT_UINT; + case 4: return D3D10_SVT_BOOL; + default: + FIXME("Unknown variable type %#x.\n", t); + return 0; + } } } @@ -352,7 +384,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con read_dword(&ptr, &tmp); t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT); + t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); TRACE("Type description: %#x.\n", tmp);

1 0

André Hentschel : ntdll: Stub for RtlNumberGenericTableElements.
by Alexandre Julliard 26 Oct '09

26 Oct '09

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

André Hentschel : ntdll: Implement KeyNameInformation.
by Alexandre Julliard 26 Oct '09

26 Oct '09

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

Stefan Dösinger : wined3d: Use the shader backend reported constant limit outside the shader backend.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 70d6304a21d6c932ce02c55c6acd64940cc55979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d6304a21d6c932ce02c55c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 16:23:34 2009 -0700 wined3d: Use the shader backend reported constant limit outside the shader backend. --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/stateblock.c | 42 +++++++++++++++++++++--------------------- dlls/wined3d/vertexshader.c | 22 +++++++++++----------- 4 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d6304a21d6c932ce02c…

1 0