wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Nikolay Sivov : msxml3: Add a helper to check for error handler being set.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 8f9804ed0bef2810940a49c0ebaf81f577112f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9804ed0bef2810940a49c0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 01:04:44 2010 +0400 msxml3: Add a helper to check for error handler being set. --- dlls/msxml3/saxreader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3a2e534..1fdf48d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -132,6 +132,12 @@ static inline BOOL has_content_handler(const saxlocator *locator) (!locator->vbInterface && locator->saxreader->contentHandler); } +static inline BOOL has_error_handler(const saxlocator *locator) +{ + return (locator->vbInterface && locator->saxreader->vberrorHandler) || + (!locator->vbInterface && locator->saxreader->errorHandler); +} + static HRESULT namespacePush(saxlocator *locator, int ns) { if(locator->nsStackLast>=locator->nsStackSize) @@ -202,8 +208,7 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) xmlStopParser(This->pParserCtxt); This->ret = hr; - if((This->vbInterface && This->saxreader->vberrorHandler) - || (!This->vbInterface && This->saxreader->errorHandler)) + if(has_error_handler(This)) { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, @@ -1299,8 +1304,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if((This->vbInterface && !This->saxreader->vberrorHandler) - || (!This->vbInterface && !This->saxreader->errorHandler)) + if(!has_error_handler(This)) { xmlStopParser(This->pParserCtxt); This->ret = E_FAIL;

1 0

Nikolay Sivov : msxml3/tests: Some encoding switching tests.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 843bd250122bc4b2f0e68f450fc04612c3e14441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843bd250122bc4b2f0e68f450… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 01:00:44 2010 +0400 msxml3/tests: Some encoding switching tests. --- dlls/msxml3/saxreader.c | 21 ++++++---- dlls/msxml3/tests/saxreader.c | 83 ++++++++++++++++++++++++++++++++++++++--- dlls/msxml6/regsvr.c | 8 ++++ 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5f04227..3a2e534 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1241,16 +1241,19 @@ static void libxmlSetDocumentLocator( xmlSAXLocatorPtr loc) { saxlocator *This = ctx; - HRESULT hr; + HRESULT hr = S_OK; - if(This->vbInterface) - hr = IVBSAXContentHandler_putref_documentLocator( - This->saxreader->vbcontentHandler, - (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl); - else - hr = ISAXContentHandler_putDocumentLocator( - This->saxreader->contentHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl); + if(has_content_handler(This)) + { + if(This->vbInterface) + hr = IVBSAXContentHandler_putref_documentLocator( + This->saxreader->vbcontentHandler, + (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl); + else + hr = ISAXContentHandler_putDocumentLocator( + This->saxreader->contentHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl); + } if(FAILED(hr)) format_error_message_from_id(This, hr); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a932bf9..370f4b3 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,8 @@ #include "wine/test.h" +#include "initguid.h" + typedef enum _CH { CH_ENDTEST, CH_PUTDOCUMENTLOCATOR, @@ -44,6 +46,8 @@ typedef enum _CH { CH_SKIPPEDENTITY } CH; +DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); + static const WCHAR szSimpleXML[] = { '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n', '<','B','a','n','k','A','c','c','o','u','n','t','>','\n', @@ -478,12 +482,7 @@ static void test_saxreader(void) hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); - - if(FAILED(hr)) - { - skip("Failed to create SAXXMLReader instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = ISAXXMLReader_getContentHandler(reader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); @@ -598,14 +597,86 @@ static void test_saxreader(void) SysFreeString(bstrData); } +/* UTF-8 data with UTF-8 BOM and UTF-16 in prolog */ +static const CHAR UTF8BOMTest[] = +"\xEF\xBB\xBF<?xml version = \"1.0\" encoding = \"UTF-16\"?>\n" +"<a></a>\n"; + +struct enc_test_entry_t { + const GUID *guid; + const char *clsid; + const char *data; + HRESULT hr; + int todo; +}; + +static const struct enc_test_entry_t encoding_test_data[] = { + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, 1 }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, 1 }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, 0 }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, 0 }, + { 0 } +}; + +static void test_encoding(void) +{ + const struct enc_test_entry_t *entry = encoding_test_data; + static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; + static const CHAR testXmlA[] = "test.xml"; + ISAXXMLReader *reader; + DWORD written; + HANDLE file; + HRESULT hr; + + while (entry->guid) + { + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); + if (hr != S_OK) + { + win_skip("can't create %s instance\n", entry->clsid); + entry++; + continue; + } + + file = CreateFileA(testXmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + WriteFile(file, UTF8BOMTest, sizeof(UTF8BOMTest)-1, &written, NULL); + CloseHandle(file); + + hr = ISAXXMLReader_parseURL(reader, testXmlW); + if (entry->todo) + todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); + else + ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); + + DeleteFileA(testXmlA); + ISAXXMLReader_Release(reader); + + entry++; + } +} + START_TEST(saxreader) { + ISAXXMLReader *reader; HRESULT hr; hr = CoInitialize(NULL); ok(hr == S_OK, "failed to init com\n"); + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + &IID_ISAXXMLReader, (void**)&reader); + + if(FAILED(hr)) + { + skip("Failed to create SAXXMLReader instance\n"); + CoUninitialize(); + return; + } + ISAXXMLReader_Release(reader); + test_saxreader(); + test_encoding(); CoUninitialize(); } diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 70a6fc4..dab7272 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -370,6 +370,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.MXXMLWriter", "6.0" }, + { &CLSID_SAXXMLReader60, + "SAX XML Reader 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.SAXXMLReader.6.0", + "6.0" + }, { &CLSID_SAXAttributes60, "SAX Attribute 6.0", NULL,

1 0

Detlef Riekenberg : include: Add WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 0140a8aacca6d555563d6af87fea3676c15aefd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0140a8aacca6d555563d6af87… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 28 23:42:00 2010 +0200 include: Add WerReportCreate + WerReportCloseHandle. --- include/werapi.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/werapi.h b/include/werapi.h index 54616db..a1db799 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -25,6 +25,9 @@ extern "C" { #endif + +typedef HANDLE HREPORT; + typedef enum _WER_REGISTER_FILE_TYPE { WerRegFileTypeUserDocument = 1, @@ -32,9 +35,34 @@ typedef enum _WER_REGISTER_FILE_TYPE WerRegFileTypeMax } WER_REGISTER_FILE_TYPE; +typedef struct _WER_REPORT_INFORMATION +{ + DWORD dwSize; + HANDLE hProcess; + WCHAR wzConsentKey[64]; + WCHAR wzFriendlyEventName[128]; + WCHAR wzApplicationName[128]; + WCHAR wzApplicationPath[MAX_PATH]; + WCHAR wzDescription[512]; + HWND hwndParent; +} WER_REPORT_INFORMATION, *PWER_REPORT_INFORMATION; + + +typedef enum _WER_REPORT_TYPE +{ + WerReportNonCritical = 0, + WerReportCritical, + WerReportApplicationCrash, + WerReportApplicationHang, + WerReportKernel, + WerReportInvalid +} WER_REPORT_TYPE; + HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); +HRESULT WINAPI WerReportCloseHandle(HREPORT); +HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HREPORT*); #ifdef __cplusplus }

1 0

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in get_loop_control_const().
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: f216dba1e39de775165fc1e4f3b43c8f4e0e28e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f216dba1e39de775165fc1e4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:50:00 2010 +0200 wined3d: Access reg_maps though ins->ctx in get_loop_control_const(). --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39b7015..a93327e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5065,11 +5065,12 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, static void get_loop_control_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, UINT idx, struct wined3d_shader_loop_control *loop_control) { + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; /* Integer constants can either be a local constant, or they can be stored in the shader * type specific compile args. */ - if (This->baseShader.reg_maps.local_int_consts & (1 << idx)) + if (reg_maps->local_int_consts & (1 << idx)) { const local_constant *constant; @@ -5092,7 +5093,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, return; } - switch (This->baseShader.reg_maps.shader_version.type) + switch (reg_maps->shader_version.type) { case WINED3D_SHADER_TYPE_VERTEX: /* Count and aL start value are unsigned */ @@ -5109,7 +5110,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, break; default: - FIXME("Unhandled shader type %#x.\n", This->baseShader.reg_maps.shader_version.type); + FIXME("Unhandled shader type %#x.\n", reg_maps->shader_version.type); break; } }

1 0

Henri Verbeet : wined3d: Access reg_maps though ins->ctx in get_bool_const( ).
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 5b36e29298d132332703dec1541592a3dfb49219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b36e29298d132332703dec15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:59 2010 +0200 wined3d: Access reg_maps though ins->ctx in get_bool_const(). --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 88f0ec0..39b7015 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5034,13 +5034,14 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx) { - BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL vshader = shader_is_vshader_version(reg_maps->shader_version.type); WORD bools = 0; WORD flag = (1 << idx); const local_constant *constant; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - if(This->baseShader.reg_maps.local_bool_consts & flag) + if (reg_maps->local_bool_consts & flag) { /* What good is a if(bool) with a hardcoded local constant? I don't know, but handle it */ LIST_FOR_EACH_ENTRY(constant, &This->baseShader.constantsB, local_constant, entry)

1 0

Henri Verbeet : wined3d: Access reg_maps though ins->ctx in shader_hw_mov() .
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: ac2805e5b3a2def5b3d37ec13b7b9581fed9f6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2805e5b3a2def5b3d37ec13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:58 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_hw_mov(). --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3193534..88f0ec0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1744,11 +1744,12 @@ static void shader_hw_nop(const struct wined3d_shader_instruction *ins) static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; - const char *zero = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ZERO); - const char *one = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ONE); - const char *two = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_TWO); + const char *zero = arb_get_helper_value(reg_maps->shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(reg_maps->shader_version.type, ARB_ONE); + const char *two = arb_get_helper_value(reg_maps->shader_version.type, ARB_TWO); struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char src0_param[256]; @@ -1787,8 +1788,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0'; - } else if (ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + } + else if (reg_maps->shader_version.major == 1 + && !shader_is_pshader_version(reg_maps->shader_version.type) && ins->dst[0].reg.type == WINED3DSPR_ADDR) { src0_param[0] = '\0';

1 0

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in shader_arb_get_register_name().
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 6c5caf7a8ba81b37c79f6c35a2cf30c70915e0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5caf7a8ba81b37c79f6c35a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:57 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_arb_get_register_name(). --- dlls/wined3d/arb_program_shader.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 49263c0..3193534 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -933,7 +933,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; *is_color = FALSE; @@ -947,7 +948,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_INPUT: if (pshader) { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { if (!reg->idx) strcpy(register_name, "fragment.color.primary"); else strcpy(register_name, "fragment.color.secondary"); @@ -972,7 +973,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "out_of_bounds_%u", idx); } } - else if(This->baseShader.reg_maps.input_registers & 0x0300) + else if (reg_maps->input_registers & 0x0300) { /* There are two ways basically: * @@ -1036,7 +1037,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction BOOL aL = FALSE; char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; - if(This->baseShader.reg_maps.shader_version.major < 2) { + if (reg_maps->shader_version.major < 2) + { sprintf(rel_reg, "A0.x"); } else { shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); @@ -1059,7 +1061,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (This->baseShader.reg_maps.usesrelconstF) + if (reg_maps->usesrelconstF) sprintf(register_name, "C[%u]", reg->idx); else sprintf(register_name, "C%u", reg->idx); @@ -1067,9 +1069,11 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ - if (pshader) { - if(This->baseShader.reg_maps.shader_version.major == 1 && - This->baseShader.reg_maps.shader_version.minor <= 3) { + if (pshader) + { + if (reg_maps->shader_version.major == 1 + && reg_maps->shader_version.minor <= 3) + { /* In ps <= 1.3, Tx is a temporary register as destination to all instructions, * and as source to most instructions. For some instructions it is the texcoord * input. Those instructions know about the special use @@ -1082,7 +1086,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major == 1 || ctx->target_version >= NV2) + if (reg_maps->shader_version.major == 1 || ctx->target_version >= NV2) { sprintf(register_name, "A%u", reg->idx); } @@ -1101,7 +1105,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if(This->baseShader.reg_maps.highest_render_target > 0) + if (reg_maps->highest_render_target > 0) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -1134,7 +1138,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { strcpy(register_name, ctx->texcrd_output[reg->idx]); }

1 0

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in shader_glsl_get_register_name().
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 3a41bbdd714662b52bf6724d1b9cfe508383154f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a41bbdd714662b52bf6724d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:56 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_glsl_get_register_name(). This is all part of the ongoing work to make the shader backend interface less dependent on wined3d internals. --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 56920ff..c59a451 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1302,8 +1302,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * static const char * const hwrastout_reg_names[] = {"OUT[10]", "OUT[11].x", "OUT[11].y"}; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; - char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + char pshader = shader_is_pshader_version(reg_maps->shader_version.type); *is_color = FALSE; @@ -1324,10 +1325,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } /* pixel shaders >= 3.0 */ - if (This->baseShader.reg_maps.shader_version.major >= 3) + if (reg_maps->shader_version.major >= 3) { DWORD idx = ((IWineD3DPixelShaderImpl *)This)->input_reg_map[reg->idx]; - unsigned int in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); + unsigned int in_count = vec4_varyings(reg_maps->shader_version.major, gl_info); if (reg->rel_addr) {

1 0

Charles Davis : kernel32/tests: Add a test for opening short paths of differing case.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 2d18a012a8cc0058509f4afcb0d325c505780b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18a012a8cc0058509f4afcb… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 27 21:58:55 2010 -0600 kernel32/tests: Add a test for opening short paths of differing case. --- dlls/kernel32/tests/path.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0065ebf..2775ab1 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -555,6 +555,28 @@ static void test_CleanupPathA(CHAR *origdir, CHAR *curdir) ok(RemoveDirectoryA(curdir),"RemoveDirectoryA failed\n"); } +/* test that short path name functions work regardless of case */ +static void test_ShortPathCase(const char *tmpdir, const char *dirname, + const char *filename) +{ + char buf[MAX_PATH], shortbuf[MAX_PATH]; + HANDLE hndl; + int i; + + snprintf(buf,sizeof(buf),"%s\\%s\\%s",tmpdir,dirname,filename); + GetShortPathNameA(buf,shortbuf,sizeof(shortbuf)); + hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); + ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); + CloseHandle(hndl); + /* Now for the real test */ + for(i=0;i<strlen(shortbuf);i++) + if (i % 2) + shortbuf[i] = toupper(shortbuf[i]); + hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); + ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); + CloseHandle(hndl); +} + /* This routine will test Get(Full|Short|Long)PathNameA */ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) { @@ -878,6 +900,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) sprintf(tmpstr,"Long File %c",funny_chars[i]); test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1); } + /* Now try it on mixed case short names */ + test_ShortPathCase(curdir,SHORTDIR,LONGFILE); + test_ShortPathCase(curdir,LONGDIR,SHORTFILE); + test_ShortPathCase(curdir,LONGDIR,LONGFILE); } static void test_GetTempPathA(char* tmp_dir)

1 0

Travis Athougies : d3dcompiler_43/tests: Added HLSL test suite.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 7c56eb88729d7c12313985e48fca7fc7aa0f2737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c56eb88729d7c12313985e48… Author: Travis Athougies <iammisc(a)gmail.com> Date: Sun Oct 24 23:54:20 2010 -0700 d3dcompiler_43/tests: Added HLSL test suite. --- dlls/d3dcompiler_43/tests/Makefile.in | 5 +- dlls/d3dcompiler_43/tests/hlsl.c | 368 +++++++++++++++++++++++++++++++++ 2 files changed, 371 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c56eb88729d7c1231398…

1 0

← Newer
1
2
3
4
5
6
7
...
118
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010