May 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Tidy up shader_hw_rsq_rcp.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 5cfbfbc8b3e59994e745e40c0de8b0d095b5765a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfbfbc8b3e59994e745e40c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 21:48:34 2009 +0200 wined3d: Tidy up shader_hw_rsq_rcp. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec4bea7..c77c664 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1553,12 +1553,11 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) +static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - const char *instruction; + const char *instruction, *sat; - char tmpLine[256]; char dst[50]; char src[50]; @@ -1571,22 +1570,20 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) break; } - strcpy(tmpLine, instruction); + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) sat = "_SAT"; + else sat = ""; + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ - strcat(tmpLine, " "); - strcat(tmpLine, dst); - strcat(tmpLine, ", "); shader_arb_get_src_param(ins, &ins->src[0], 0, src); - strcat(tmpLine, src); if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used */ - strcat(tmpLine, ".w"); + strcat(src, ".w"); } - shader_addline(buffer, "%s;\n", tmpLine); + shader_addline(buffer, "%s%s %s, %s;\n", instruction, sat, dst, src); } static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) @@ -2224,10 +2221,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_map2gl, - /* WINED3DSIH_RCP */ vshader_hw_rsq_rcp, + /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ NULL, /* WINED3DSIH_RET */ NULL, - /* WINED3DSIH_RSQ */ vshader_hw_rsq_rcp, + /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ NULL,

1 0

Gerald Pfeifer : cryptui: Remove double assignment in import_store_dlg_proc ().
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 8986cd1ed74f4134ee26a1a7b5f7b676523df365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8986cd1ed74f4134ee26a1a7b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 9 15:35:32 2009 +0200 cryptui: Remove double assignment in import_store_dlg_proc(). --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f6fb60c..f15420b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5170,7 +5170,7 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, selectInfo.dwSize = sizeof(selectInfo); selectInfo.parent = hwnd; selectInfo.dwFlags = CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE; - selectInfo.pwszTitle = selectInfo.pwszTitle = NULL; + selectInfo.pwszTitle = NULL; selectInfo.pEnumData = &enumData; selectInfo.pfnSelectedStoreCallback = NULL; if ((store = CryptUIDlgSelectStoreW(&selectInfo)))

1 0

Joris Huizer : pdh: Return correct error on allocation failure.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 9e39e8a7e93caddf051ab6ef655bbb7482dcb50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e39e8a7e93caddf051ab6ef6… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sun May 10 21:27:12 2009 +0200 pdh: Return correct error on allocation failure. --- dlls/pdh/pdh_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 8e91caf..9ca174b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1098,6 +1098,8 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf } heap_free( bufferW ); } + else + ret = PDH_MEMORY_ALLOCATION_FAILURE; } done:

1 0

Austin English : secur32/tests: Sign compare fixes.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 07c214170d05cb9943559b9a085df731b533661a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c214170d05cb9943559b9a0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 10:39:46 2009 -0500 secur32/tests: Sign compare fixes. --- dlls/secur32/tests/secur32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 21bb83a..0ad6f0f 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -48,7 +48,7 @@ static void testGetComputerObjectNameA(void) char name[256]; ULONG size; BOOLEAN rc; - int i; + UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(name); @@ -73,7 +73,7 @@ static void testGetComputerObjectNameW(void) WCHAR nameW[256]; ULONG size; BOOLEAN rc; - int i; + UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(nameW)/sizeof(nameW[0]); @@ -101,7 +101,7 @@ static void testGetUserNameExA(void) char name[256]; ULONG size; BOOLEAN rc; - int i; + UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(name); @@ -148,7 +148,7 @@ static void testGetUserNameExW(void) WCHAR nameW[256]; ULONG size; BOOLEAN rc; - int i; + UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(nameW);

1 0

Henri Verbeet : d3d10core: Improve the shader input/ output signature parsing code.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: d6fa27f5a1acf2dab87f8a58086439ed5eb5b987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6fa27f5a1acf2dab87f8a580… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 17:44:25 2009 +0200 d3d10core: Improve the shader input/output signature parsing code. Make a copy of the string data, and move the function to shader.c. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/inputlayout.c | 67 ++--------------------------------- dlls/d3d10core/shader.c | 65 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3f782ba..fade879 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -155,6 +155,8 @@ struct d3d10_pixel_shader }; HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWORD **shader_code); +HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s); +void shader_free_signature(struct wined3d_shader_signature *s); /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index d78ecad..f6f50bc 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -24,74 +24,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -struct input_signature_element -{ - const char *semantic_name; - UINT semantic_idx; - DWORD unknown; /* system value semantic? */ - DWORD component_type; - UINT register_idx; - DWORD mask; -}; - -struct input_signature -{ - struct input_signature_element *elements; - UINT element_count; -}; - -static HRESULT parse_isgn(const char *data, struct input_signature *is) -{ - struct input_signature_element *e; - const char *ptr = data; - unsigned int i; - DWORD count; - - read_dword(&ptr, &count); - TRACE("%u elements\n", count); - - skip_dword_unknown(&ptr, 1); - - e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); - if (!e) - { - ERR("Failed to allocate input signature memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < count; ++i) - { - UINT name_offset; - - read_dword(&ptr, &name_offset); - e[i].semantic_name = data + name_offset; - read_dword(&ptr, &e[i].semantic_idx); - read_dword(&ptr, &e[i].unknown); - read_dword(&ptr, &e[i].component_type); - read_dword(&ptr, &e[i].register_idx); - read_dword(&ptr, &e[i].mask); - - TRACE("semantic: %s, semantic idx: %u, unknown %#x, type %u, register idx: %u, use_mask %#x, input_mask %#x\n", - e[i].semantic_name, e[i].semantic_idx, e[i].unknown, e[i].component_type, - e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); - } - - is->elements = e; - is->element_count = count; - - return S_OK; -} - static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - struct input_signature *is = ctx; - const char *ptr = data; + struct wined3d_shader_signature *is = ctx; char tag_str[5]; switch(tag) { case TAG_ISGN: - return parse_isgn(ptr, is); + return shader_parse_signature(data, data_size, is); default: memcpy(tag_str, &tag, 4); @@ -105,7 +46,7 @@ HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) { - struct input_signature is; + struct wined3d_shader_signature is; HRESULT hr; UINT i; @@ -157,7 +98,7 @@ HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC } } - HeapFree(GetProcessHeap(), 0, is.elements); + shader_free_signature(&is); return S_OK; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 8b3d01e..42af6d0 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -55,6 +55,71 @@ HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWO return hr; } +HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) +{ + struct wined3d_shader_signature_element *e; + unsigned int string_data_offset; + unsigned int string_data_size; + const char *ptr = data; + char *string_data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); + if (!e) + { + ERR("Failed to allocate input signature memory.\n"); + return E_OUTOFMEMORY; + } + + /* 2 DWORDs for the header, 6 for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); + string_data_size = data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); + if (!string_data) + { + ERR("Failed to allocate string data memory.\n"); + HeapFree(GetProcessHeap(), 0, e); + return E_OUTOFMEMORY; + } + memcpy(string_data, data + string_data_offset, string_data_size); + + for (i = 0; i < count; ++i) + { + UINT name_offset; + + read_dword(&ptr, &name_offset); + e[i].semantic_name = string_data + (name_offset - string_data_offset); + read_dword(&ptr, &e[i].semantic_idx); + read_dword(&ptr, &e[i].sysval_semantic); + read_dword(&ptr, &e[i].component_type); + read_dword(&ptr, &e[i].register_idx); + read_dword(&ptr, &e[i].mask); + + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " + "type %u, register idx: %u, use_mask %#x, input_mask %#x\n", + e[i].semantic_name, e[i].semantic_idx, e[i].sysval_semantic, e[i].component_type, + e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + } + + s->elements = e; + s->element_count = count; + s->string_data = string_data; + + return S_OK; +} + +void shader_free_signature(struct wined3d_shader_signature *s) +{ + HeapFree(GetProcessHeap(), 0, s->string_data); + HeapFree(GetProcessHeap(), 0, s->elements); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10VertexShader *iface,

1 0

Henri Verbeet : d3d10core: Parse pixelshader output signatures and pass them to CreatePixelShader().
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: bb3b5a73054807cbd913fbcd5a4390c326921152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3b5a73054807cbd913fbcd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 17:44:25 2009 +0200 d3d10core: Parse pixelshader output signatures and pass them to CreatePixelShader(). --- dlls/d3d10core/d3d10core_private.h | 10 +++++++++- dlls/d3d10core/device.c | 22 +++++++++++++--------- dlls/d3d10core/shader.c | 32 ++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index fade879..7600e23 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -39,8 +39,15 @@ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +struct d3d10_shader_info +{ + const DWORD *shader_code; + struct wined3d_shader_signature *output_signature; +}; + /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); const char *debug_dxgi_format(DXGI_FORMAT format); @@ -152,9 +159,10 @@ struct d3d10_pixel_shader LONG refcount; IWineD3DPixelShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; -HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWORD **shader_code); +HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info); HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s); void shader_free_signature(struct wined3d_shader_signature *s); diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 29547a8..b5b191a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1025,19 +1025,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if { struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_pixel_shader *object; - const DWORD *shader_code; + struct d3d10_shader_info shader_info; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", iface, byte_code, byte_code_length, shader); - hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_code); - if (FAILED(hr)) - { - ERR("Failed to extract shader, hr %#x\n", hr); - return hr; - } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1048,11 +1041,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if object->vtbl = &d3d10_pixel_shader_vtbl; object->refcount = 1; + shader_info.output_signature = &object->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + hr = IWineD3DDevice_CreatePixelShader(This->wined3d_device, - shader_code, NULL, &object->wined3d_shader, (IUnknown *)object); + shader_info.shader_code, &object->output_signature, + &object->wined3d_shader, (IUnknown *)object); if (FAILED(hr)) { ERR("CreatePixelShader failed, hr %#x\n", hr); + shader_free_signature(&object->output_signature); HeapFree(GetProcessHeap(), 0, object); return hr; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 42af6d0..f5b64b9 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -26,31 +26,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - const DWORD **shader_data = ctx; + struct d3d10_shader_info *shader_info = ctx; char tag_str[5]; + HRESULT hr; switch(tag) { + case TAG_OSGN: + hr = shader_parse_signature(data, data_size, shader_info->output_signature); + if (FAILED(hr)) return hr; + break; + case TAG_SHDR: - *shader_data = (const DWORD *)data; - return S_OK; + shader_info->shader_code = (const DWORD *)data; + break; default: memcpy(tag_str, &tag, 4); tag_str[4] = '\0'; FIXME("Unhandled chunk %s\n", tag_str); - return S_OK; + break; } + + return S_OK; } -HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWORD **shader_code) +HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info) { HRESULT hr; - hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_code); - if (!*shader_code) hr = E_FAIL; + shader_info->shader_code = NULL; + memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature)); - if (FAILED(hr)) ERR("Failed to parse shader, hr %#x\n", hr); + hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info); + if (!shader_info->shader_code) hr = E_FAIL; + + if (FAILED(hr)) + { + ERR("Failed to parse shader, hr %#x\n", hr); + shader_free_signature(shader_info->output_signature); + } return hr; } @@ -347,6 +362,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa if (!refcount) { + shader_free_signature(&This->output_signature); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d10core: Release the wined3d shader when the d3d10 pixel shader is destroyed.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: cc4d5dc97f8f9cad448135a4c579fa875cab1a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4d5dc97f8f9cad448135a4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 17:44:25 2009 +0200 d3d10core: Release the wined3d shader when the d3d10 pixel shader is destroyed. --- dlls/d3d10core/shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index f5b64b9..41b5a1a 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -362,6 +362,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa if (!refcount) { + IWineD3DPixelShader_Release(This->wined3d_shader); shader_free_signature(&This->output_signature); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::PSSetShader().
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 32eb6986121936f424faf4e1e4fbe749814825e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32eb6986121936f424faf4e1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 17:44:25 2009 +0200 d3d10core: Implement ID3D10Device::PSSetShader(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b5b191a..bbc527b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -124,7 +124,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device *iface, ID3D10PixelShader *shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *This = (struct d3d10_device *)iface; + struct d3d10_pixel_shader *ps = (struct d3d10_pixel_shader *)shader; + + TRACE("iface %p, shader %p\n", iface, shader); + + IWineD3DDevice_SetPixelShader(This->wined3d_device, ps ? ps->wined3d_shader : NULL); } static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device *iface,

1 0

Juan Lang : inetmib1/tests: Trace the SNMP error code and index rather than GetLastError on failure.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: f893387da8fbfd45d41e70c497a6c437b66fc129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f893387da8fbfd45d41e70c49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 4 19:51:40 2009 -0700 inetmib1/tests: Trace the SNMP error code and index rather than GetLastError on failure. --- dlls/inetmib1/tests/main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 6c83d58..c52cc43 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -88,7 +88,7 @@ static void testQuery(void) error = 0xdeadbeef; index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); @@ -105,7 +105,7 @@ static void testQuery(void) error = 0xdeadbeef; index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || error == ERROR_FILE_NOT_FOUND /* Win9x */, "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %d\n", @@ -125,7 +125,7 @@ static void testQuery(void) error = 0xdeadbeef; index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); /* The index is 1-based rather than 0-based */ @@ -147,7 +147,7 @@ static void testQuery(void) error = 0xdeadbeef; index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); ok(index == 1, "expected index 1, got %d\n", index); @@ -169,7 +169,7 @@ static void testQuery(void) error = 0xdeadbeef; index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); @@ -252,7 +252,7 @@ static void testQuery(void) moreData = TRUE; noChange = FALSE; ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); @@ -274,7 +274,7 @@ static void testQuery(void) moreData = TRUE; do { ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); @@ -340,7 +340,7 @@ static void testQuery(void) noChange = FALSE; do { ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); @@ -406,7 +406,7 @@ static void testQuery(void) noChange = FALSE; do { ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); /* FIXME: error and index aren't checked here because the UDP table is * the last OID currently supported by Wine, so the last GetNext fails. * todo_wine is also not effective because it will succeed for all but

1 0

Henri Verbeet : wined3d: Use the output signature to map SM4 pixel shader outputs to the appropriate register .
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 9a579a43b1769ca3de23062ffc93d994b065b82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a579a43b1769ca3de23062ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 17:44:25 2009 +0200 wined3d: Use the output signature to map SM4 pixel shader outputs to the appropriate register. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/pixelshader.c | 3 +- dlls/wined3d/device.c | 9 +++-- dlls/wined3d/pixelshader.c | 7 ++-- dlls/wined3d/shader_sm1.c | 7 +++- dlls/wined3d/shader_sm4.c | 77 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/vertexshader.c | 7 ++-- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 34 +++++++++++++++++- 10 files changed, 134 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a579a43b1769ca3de230…

1 0