August 2014 - Wine-commits - list.winehq.org

André Hentschel : wpcap: Trace strings when possible.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: c180d522ae38b0a0ec5b8391bc1058c801594b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c180d522ae38b0a0ec5b8391b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:12 2014 +0200 wpcap: Trace strings when possible. --- dlls/wpcap/wpcap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 1a7f280..4eedbd8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -27,7 +27,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { - TRACE("(%p)\n", p); + TRACE("(%p %p %s %i %u)\n", p, program, debugstr_a(buf), optimize, mask); return pcap_compile(p, program, buf, optimize, mask); } @@ -77,7 +77,7 @@ char* CDECL wine_pcap_lookupdev(char *errbuf) int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp, char *errbuf) { - TRACE("(%p %p %p %p)\n", device, netp, maskp, errbuf); + TRACE("(%s %p %p %p)\n", debugstr_a(device), netp, maskp, errbuf); return pcap_lookupnet(device, netp, maskp, errbuf); } @@ -96,7 +96,7 @@ int CDECL wine_pcap_minor_version(pcap_t *p) pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, char *errbuf) { - TRACE("(%p %i %i %i %p)\n", source, snaplen, promisc, to_ms, errbuf); + TRACE("(%s %i %i %i %p)\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf); return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); }

1 0

André Hentschel : wpcap: Implement pcap_freecode.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 03d067183f2789a215406b53e426c7ad5a4d8b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d067183f2789a215406b53e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:51 2014 +0200 wpcap: Implement pcap_freecode. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4eedbd8..f5402a4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -55,6 +55,12 @@ void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) pcap_freealldevs(alldevs); } +void CDECL wine_pcap_freecode(struct bpf_program *fp) +{ + TRACE("(%p)\n", fp); + return pcap_freecode(fp); +} + char* CDECL wine_pcap_geterr(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index c0ba15e..2af9197 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -27,7 +27,7 @@ @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs -@ stub pcap_freecode +@ cdecl pcap_freecode(ptr) wine_pcap_freecode @ stub pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent

1 0

André Hentschel : wpcap: Implement pcap_snapshot.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: eaad4fea8912589d22fb6c9b6d894c37db06f31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad4fea8912589d22fb6c9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:54:03 2014 +0200 wpcap: Implement pcap_snapshot. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f5402a4..29aa08c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -118,6 +118,12 @@ int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) return pcap_setfilter(p, fp); } +int CDECL wine_pcap_snapshot(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_snapshot(p); +} + int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) { TRACE("(%p %p)\n", p, ps); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2af9197..6dd67a1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -71,7 +71,7 @@ @ stub pcap_setnonblock @ stub pcap_setsampling @ stub pcap_setuserbuffer -@ stub pcap_snapshot +@ cdecl pcap_snapshot(ptr) wine_pcap_snapshot @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror

1 0

André Hentschel : wpcap: Implement pcap_dispatch.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 927f8bee4669239408f8d44e5452014696c4f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=927f8bee4669239408f8d44e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:47:44 2014 +0200 wpcap: Implement pcap_dispatch. --- dlls/wpcap/wpcap.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 29aa08c..b80a4e0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1,7 +1,7 @@ /* * WPcap.dll Proxy. * - * Copyright 2011 André Hentschel + * Copyright 2011, 2014 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ */ #include <pcap/pcap.h> +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -37,6 +39,40 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +typedef struct +{ + void (CALLBACK *pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); + void *user_data; +} PCAP_HANDLER_CALLBACK; + +static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h, const u_char *p) +{ + PCAP_HANDLER_CALLBACK *pcb; + TRACE("(%p %p %p)\n", user_data, h, p); + pcb = (PCAP_HANDLER_CALLBACK *)user_data; + pcb->pfn_cb(pcb->user_data, h, p); + HeapFree(GetProcessHeap(), 0, pcb); + TRACE("Callback COMPLETED\n"); +} + +int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_dispatch(p, cnt, NULL, user); +} + int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) { int ret; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 6dd67a1..92b5052 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -15,7 +15,7 @@ @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ stub pcap_datalink_val_to_name -@ stub pcap_dispatch +@ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file

1 0

André Hentschel : wpcap: Implement pcap_loop.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d45f9144a14d689ea8563c6f9e91ae7b14c37b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45f9144a14d689ea8563c6f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:48:14 2014 +0200 wpcap: Implement pcap_loop. --- dlls/wpcap/wpcap.c | 18 ++++++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b80a4e0..ab1de8f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -123,6 +123,24 @@ int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned i return pcap_lookupnet(device, netp, maskp, errbuf); } +int CDECL wine_pcap_loop(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_loop(p, cnt, NULL, user); +} + int CDECL wine_pcap_major_version(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 92b5052..d6116d2 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -39,7 +39,7 @@ @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev @ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet -@ stub pcap_loop +@ cdecl pcap_loop(ptr long ptr ptr) wine_pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ stub pcap_next

1 0

André Hentschel : wpcap: Implement pcap_breakloop.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 2789538bd576c1651f3fcdafb709e7aa71217bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2789538bd576c1651f3fcdafb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:55:13 2014 +0200 wpcap: Implement pcap_breakloop. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ab1de8f..81ff958 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +void CDECL wine_pcap_breakloop(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_breakloop(p); +} + int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index d6116d2..2cdc6cd 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -6,7 +6,7 @@ @ stub eproto_db @ stub getservent @ stub install_bpf_program -@ stub pcap_breakloop +@ cdecl pcap_breakloop(ptr) wine_pcap_breakloop @ stub pcap_close @ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 59ac973d84516fc079f5eef05ae10b26d76fe55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ac973d84516fc079f5eef05… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Aug 15 19:13:23 2014 +0300 po: Update Finnish translation. --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5ffc43c..9ce1e19 100644 --- a/po/fi.po +++ b/po/fi.po @@ -845,7 +845,7 @@ msgstr "Tiedostoa ei ole" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "Valinta sisältää kohteen, joka ei ole kansio" #: comdlg32.rc:45 msgid "Up One Level" @@ -1036,10 +1036,8 @@ msgid "Open File" msgstr "Avaa tiedosto" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Uusi kansio" +msgstr "Valitse kansio" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Jacek Caban : d3d10_1.idl: Added some missing constants.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 9e942d29509b5a4a455ea79c421b65135b1fd919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e942d29509b5a4a455ea79c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 15 18:18:56 2014 +0200 d3d10_1.idl: Added some missing constants. --- include/d3d10_1.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index bfae754..d0e02d4 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -19,6 +19,29 @@ import "oaidl.idl"; import "ocidl.idl"; +const UINT D3D10_1_DEFAULT_SAMPLE_MASK = 0xffffffff; +const UINT D3D10_1_GS_INPUT_REGISTER_COUNT = 32; +const UINT D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS = 128; +const UINT D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT = 32; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COMPONENTS = 1; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COUNT = 1; +const UINT D3D10_1_SHADER_MAJOR_VERSION = 4; +const UINT D3D10_1_SHADER_MINOR_VERSION = 1; +const UINT D3D10_1_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D10_1_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES = 256; +const UINT D3D10_1_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D10_1_SO_MULTIPLE_BUFFER_ELEMENTS_PER_BUFFER = 1; +const UINT D3D10_1_SO_SINGLE_BUFFER_COMPONENT_LIMIT = 64; +const UINT D3D10_1_STANDARD_VERTEX_ELEMENT_COUNT = 32; +const UINT D3D10_1_SUBPIXEL_FRACTIONAL_BIT_COUNT = 8; +const UINT D3D10_1_VS_INPUT_REGISTER_COUNT = 32; +const UINT D3D10_1_VS_OUTPUT_REGISTER_COUNT = 32; + +cpp_quote("#define D3D10_1_FLOAT16_FUSED_TOLERANCE_IN_ULP (0.6)") +cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)") + import "d3d10.idl"; cpp_quote("#include <d3d10_1shader.h>")

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: b5381dd772f2528965161e50e812870f1f710b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5381dd772f2528965161e50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 15 18:19:09 2014 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index e88ae7f..4e883f7 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -27,6 +27,42 @@ typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY; typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; typedef RECT D3D11_RECT; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT = 14; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT = 15; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT = 16; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT = 15; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT = 64; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT = 128; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT = 128; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT = 16; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT = 16; +const UINT D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT = 32; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COUNT = 4096; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST = 3; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS = 3; +const UINT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX = 10; +const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10; +const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8; +const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7; + const UINT D3D11_DEFAULT_DEPTH_BIAS = 0; cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f") const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16; @@ -66,6 +102,80 @@ const UINT D3D11_SHADER_MAX_TYPES = 65535; const UINT D3D11_SHADER_MINOR_VERSION = 0; const UINT D3D11_VS_OUTPUT_REGISTER_COUNT = 32; +const UINT D3D11_PS_CS_UAV_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_CS_UAV_REGISTER_COUNT = 8; +const UINT D3D11_PS_CS_UAV_REGISTER_READS_PER_INST = 1; +const UINT D3D11_PS_CS_UAV_REGISTER_READ_PORTS = 1; +const UINT D3D11_PS_FRONTFACING_DEFAULT_VALUE = 0xffffffff; +const UINT D3D11_PS_FRONTFACING_FALSE_VALUE = 0; +const UINT D3D11_PS_FRONTFACING_TRUE_VALUE = 0xffffffff; +const UINT D3D11_PS_INPUT_REGISTER_COMPONENTS = 4; +const UINT D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_INPUT_REGISTER_COUNT = 32; +const UINT D3D11_PS_INPUT_REGISTER_READS_PER_INST = 2; +const UINT D3D11_PS_INPUT_REGISTER_READ_PORTS = 1; +cpp_quote("#define D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT (0.0f)") +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT = 1; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COUNT = 1; +const UINT D3D11_PS_OUTPUT_REGISTER_COMPONENTS = 4; +const UINT D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_REGISTER_COUNT = 8; +cpp_quote("#define D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT (0.5f)") + +const UINT D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; + +const UINT D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP = 27; +const UINT D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP = 32; +const UINT D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP = 32; +const UINT D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION = 16384; +const UINT D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT = 1024; +const UINT D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D11_REQ_MAXANISOTROPY = 16; +const UINT D3D11_REQ_MIP_LEVELS = 15; +const UINT D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES = 2048; +const UINT D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH = 16384; +const UINT D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM = 128; +cpp_quote("#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM (0.25f)") +const UINT D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM = 2048; +const UINT D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP = 20; +const UINT D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURE1D_U_DIMENSION = 16384; +const UINT D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION = 16384; +const UINT D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURECUBE_DIMENSION = 16384; + +const UINT D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL = 0; + +const UINT D3D11_SHADER_MAJOR_VERSION = 5; +const UINT D3D11_SHADER_MAX_INSTANCES = 65535; +const UINT D3D11_SHADER_MAX_INTERFACES = 253; +const UINT D3D11_SHADER_MAX_INTERFACE_CALL_SITES = 4096; +const UINT D3D11_SHADER_MAX_TYPES = 65535; +const UINT D3D11_SHADER_MINOR_VERSION = 0; + +const UINT D3D11_SHIFT_INSTRUCTION_PAD_VALUE = 0; +const UINT D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT = 5; + +const UINT D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; + +const UINT D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES = 512; +const UINT D3D11_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP = 0xffffffff; +const UINT D3D11_SO_NO_RASTERIZED_STREAM = 0xffffffff; +const UINT D3D11_SO_OUTPUT_COMPONENT_COUNT = 128; +const UINT D3D11_SO_STREAM_COUNT = 4; + cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") cpp_quote("struct CD3D11_DEFAULT {};") cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;") @@ -343,6 +453,17 @@ typedef enum D3D11_MAP D3D11_MAP_WRITE_NO_OVERWRITE } D3D11_MAP; +typedef enum D3D11_MAP_FLAG +{ + D3D11_MAP_FLAG_DO_NOT_WAIT = 0x00100000 +} D3D11_MAP_FLAG; + +typedef struct D3D11_QUERY_DATA_SO_STATISTICS +{ + UINT64 NumPrimitivesWritten; + UINT64 PrimitivesStorageNeeded; +} D3D11_QUERY_DATA_SO_STATISTICS; + typedef struct D3D11_MAPPED_SUBRESOURCE { void *pData;

1 0

André Hentschel : shlwapi/tests: Fix SHFormatDateTimeW tests for right-to-left locales.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: badfdaf56c446cb37305e9df101cb1d9411afe0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=badfdaf56c446cb37305e9df1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 19:25:29 2014 +0200 shlwapi/tests: Fix SHFormatDateTimeW tests for right-to-left locales. --- dlls/shlwapi/tests/ordinal.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 531844f..cb90d31 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1794,6 +1794,7 @@ static void test_SHFormatDateTimeW(void) INT ret; static const WCHAR spaceW[] = {' ',0}; #define UNICODE_LTR_MARK 0x200e +#define UNICODE_RTL_MARK 0x200f if(!pSHFormatDateTimeW) { @@ -1923,9 +1924,9 @@ if (0) p2 = buff2; while (*p2 != '\0') { - while (*p1 == UNICODE_LTR_MARK) + while (*p1 == UNICODE_LTR_MARK || *p1 == UNICODE_RTL_MARK) p1++; - while (*p2 == UNICODE_LTR_MARK) + while (*p2 == UNICODE_LTR_MARK || *p2 == UNICODE_RTL_MARK) p2++; p1++; p2++; @@ -1949,9 +1950,9 @@ if (0) p2 = buff2; while (*p2 != '\0') { - while (*p1 == UNICODE_LTR_MARK) + while (*p1 == UNICODE_LTR_MARK || *p1 == UNICODE_RTL_MARK) p1++; - while (*p2 == UNICODE_LTR_MARK) + while (*p2 == UNICODE_LTR_MARK || *p2 == UNICODE_RTL_MARK) p2++; p1++; p2++;

1 0