August 2015 - Wine-Devel - list.winehq.org

Re: reg: implement reg query operation
by Stefan Dösinger Aug. 5, 2015

Aug. 5, 2015

Hi, > +#define MAX_NAME_BUFFER 255 > +#define MAX_VALUE_BUFFER 16383 I don't like this. Ideally the code should query the lengths from the Registry APIs and allocate appropriate buffers. If the Reg* functions guarantee a maximum size use defines from the public headers. > +static const WCHAR fmt_value[] = {' ',' ',' ','%','s',' ','%','s',' ','%','s','\n',0}; This is used in print_value() only, you can move it into this function. > +static const WCHAR no_name[] = { 'n','o','_','n','a','m','e',0 }; Is this used for the default value? Is "no_name" the right choice? Does this need localization? > + hkey = get_rootkey(key_name); > + subkey_name = strchrW(key_name, '\\'); > + if (NULL == hkey || NULL == subkey_name) > + { > + reg_printfW(fmt_err, key_name); > + return 1; > + } Are you sure that this is the right behavior? I haven't checked, but I can imagine that I can e.g. have a string value directly in HKEY_CURRENT_USER, in which case subkey_name would be NULL. > + value_buffer = HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_BUFFER); Please check for allocation errors. If you do stay with the fixed size buffer, do you need HeapAlloc at all? Can't you just put this on the stack? On a related note, passing value_buffer to the two helper functions but not its length, and setting value_len in those functions is ugly. This way the helper functions depend on an implementation detail of their caller. Yeah, the #define makes it a bit better, but it's still not pretty. > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /ve", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /v test0", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /s", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); Some tests for error cases would be helpful as well, including all the error checks you have in your code. I expect scripts to parse the output of this command. Please add some tests that check the output. There's infrastructure for reading command output in other program tests that you can use. The following are style issues. I'm pointing them out while I'm at it, please fix them as well. > +static void query_sub(HKEY hkey, WCHAR* key_name, WCHAR* value_buffer) (Style) WCHAR *key_name please. "WCHAR*" is more common in C++. > + HKEY hsubkey = NULL; > + HKEY hkey = NULL; (Style) Please drop the h from these names. > + ret = RegOpenKeyExW( hkey, subkey_name+1, 0, KEY_READ, &hsubkey ); (Style) inconsistent space after parenthesis. > + if (ret == ERROR_SUCCESS ) Same > + static const WCHAR* reg_type[] = { > + type_none, > + type_sz, (Style) { placement

2 1

Re: widl: Added support for -ns_prefix option.
by Sebastian Lackner Aug. 5, 2015

Aug. 5, 2015

On 04.08.2015 14:26, Jacek Caban wrote: > --- > tools/widl/header.c | 10 ++++++++-- > tools/widl/parser.l | 3 +++ > tools/widl/typetree.c | 12 ++++++++++-- > tools/widl/widl.c | 6 ++++++ > tools/widl/widl.h | 1 + > tools/widl/widl.man.in | 2 ++ > 6 files changed, 30 insertions(+), 4 deletions(-) > [...] > winrt_mode = 1; > break; > + case RT_NS_PREFIX: > + use_abi_namespace = 1; > case WIN32_OPTION: > do_win32 = 1; > do_win64 = 0; Is there maybe a break missing?

2 1

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). (try 2)
by Nikolay Sivov Aug. 5, 2015

Aug. 5, 2015

On 31.07.2015 12:12, Zhenbo Li wrote: > try 2: > Test get_ownerDocument for more xml nodes. > > --- > dlls/msxml3/node.c | 2 ++ > dlls/msxml3/tests/domdoc.c | 51 > ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 53 insertions(+) > Hi. This looks fine to me. It would be nice to test attribute node too (I don't think it appears in children list, but it's been a while since I looked into it), but it's not a blocking issue.

1 0

Re:TestBot job 15747 results: quartz: waveparser support wav file generated by ffmpeg
by Changhui LIU Aug. 5, 2015

Aug. 5, 2015

Hi Alexandre: The error code 80040256 is VFW_E_NO_AUDIO_HARDWARE, According to MSDN, the detail info is: Cannot play back the audio stream: no audio hardware is available, or the hardware is not supported. So these test failed on 64 bit windows is not caused by my patch: http://source.winehq.org/patches/data/113403 ------------------ Regards, Changhui Liu ------------------ Original ------------------ From: "Marvin"<testbot(a)winehq.org>; Date: Tue, Aug 4, 2015 07:04 PM To: "liuchanghui"<liuchanghui(a)linuxdeepin.com>; Subject: TestBot job 15747 results: quartz: waveparser support wav file generated by ffmpeg VM Status Number of test failures build completed w2000pro completed 0 wxppro completed 0 w2003std completed 0 wvistau64 completed 2 w2008s64 completed 2 w7u completed 0 w8 completed 0 wvistau64 completed 2 w2008s64 completed 2 === build (build) === No build failures found === w2000pro (32 bit filtergraph) === No test failures found === wxppro (32 bit filtergraph) === No test failures found === w2003std (32 bit filtergraph) === No test failures found === wvistau64 (32 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (32 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w7u (32 bit filtergraph) === No test failures found === w8 (32 bit filtergraph) === No test failures found === wvistau64 (64 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (64 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0

1 0

Re: [PATCH] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2)
by Matteo Bruni Aug. 4, 2015

Aug. 4, 2015

2015-08-02 22:29 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > Fixes bug 38976. > > Try 2: Remove useless hr assignments. > --- > dlls/d3dx9_36/mesh.c | 4 ++ > dlls/d3dx9_36/tests/mesh.c | 168 ++++++++++++++++++++++++--------------------- > 2 files changed, 94 insertions(+), 78 deletions(-) > > diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c > index d0459da..39d279d 100644 > --- a/dlls/d3dx9_36/mesh.c > +++ b/dlls/d3dx9_36/mesh.c > @@ -5847,6 +5847,10 @@ static HRESULT triangulate(struct triangulation_array *triangulations) > int i; > struct point2d_index *idx_ptr; > > + /* Glyphs without outlines do not generate any vertices. */ > + if (!glyph->outlines.count) > + return D3D_OK; > + > for (i = 0; i < glyph->outlines.count; i++) > nb_vertices += glyph->outlines.items[i].count; > > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 0243a61..16c79ea 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -3617,57 +3617,17 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da > return S_OK; > } > > -static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > - float deviation, float extrusion, float otmEMSquare) > +static BOOL compute_text_mesh(struct mesh *mesh, const char *text, > + float deviation, float extrusion, float otmEMSquare, const struct glyphinfo *glyphs) > { > - HRESULT hr = E_FAIL; > DWORD nb_vertices, nb_faces; > DWORD nb_corners, nb_outline_points; > int textlen = 0; > - float offset_x; > - char *raw_outline = NULL; > - struct glyphinfo *glyphs = NULL; > - GLYPHMETRICS gm; > int i; > struct vertex *vertex_ptr; > face *face_ptr; > > - if (deviation == 0.0f) > - deviation = 1.0f / otmEMSquare; > - > textlen = strlen(text); > - glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, textlen * sizeof(*glyphs)); > - if (!glyphs) { > - hr = E_OUTOFMEMORY; > - goto error; > - } > - > - offset_x = 0.0f; > - for (i = 0; i < textlen; i++) > - { > - /* get outline points from data returned from GetGlyphOutline */ > - const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > - int datasize; > - > - glyphs[i].offset_x = offset_x; > - > - datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > - if (datasize < 0) { > - hr = E_FAIL; > - goto error; > - } > - HeapFree(GetProcessHeap(), 0, raw_outline); > - raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); > - if (!raw_outline) { > - hr = E_OUTOFMEMORY; > - goto error; > - } > - datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, datasize, raw_outline, &identity); > - > - create_outline(&glyphs[i], raw_outline, datasize, deviation, otmEMSquare); > - > - offset_x += gm.gmCellIncX / (float)otmEMSquare; > - } > > /* corner points need an extra vertex for the different side faces normals */ > nb_corners = 0; > @@ -3691,7 +3651,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > nb_faces = nb_outline_points * 2; > > if (!new_mesh(mesh, nb_vertices, nb_faces)) > - goto error; > + return FALSE; > > /* convert 2D vertices and faces into 3D mesh */ > vertex_ptr = mesh->vertices; > @@ -3801,24 +3761,11 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > vertex_ptr++; > } > > - hr = D3D_OK; > -error: > - if (glyphs) { > - for (i = 0; i < textlen; i++) > - { > - int j; > - for (j = 0; j < glyphs[i].outlines.count; j++) > - HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items[j].items); > - HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items); > - } > - HeapFree(GetProcessHeap(), 0, glyphs); > - } > - HeapFree(GetProcessHeap(), 0, raw_outline); > - > - return hr == D3D_OK; > + return TRUE; > } > > -static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, int textlen, float extrusion) > +static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, > + size_t textlen, float extrusion, const struct glyphinfo *glyphs) > { > HRESULT hr; > DWORD number_of_vertices, number_of_faces; > @@ -3936,13 +3883,20 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str > > first_vtx1 = vtx_idx1; > first_vtx2 = vtx_idx2; > - for (; vtx_idx1 < number_of_vertices; vtx_idx1++) { > - if (vertices[vtx_idx1].normal.z != 0) > - break; > - } > - for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) { > - if (mesh->vertices[vtx_idx2].normal.z != 0) > - break; > + /* Glyphs without outlines do not generate any vertices. */ > + if (glyphs[i].outlines.count > 0) > + { > + for (; vtx_idx1 < number_of_vertices; vtx_idx1++) > + { > + if (vertices[vtx_idx1].normal.z != 0) > + break; > + } > + > + for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) > + { > + if (mesh->vertices[vtx_idx2].normal.z != 0) > + break; > + } > } > nb_outline_vertices1 = vtx_idx1 - first_vtx1; > nb_outline_vertices2 = vtx_idx2 - first_vtx2; > @@ -4124,15 +4078,19 @@ error: > static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, float extrusion) > { > HRESULT hr; > - ID3DXMesh *d3dxmesh; > - struct mesh mesh; > + ID3DXMesh *d3dxmesh = NULL; > + struct mesh mesh = {0}; > char name[256]; > OUTLINETEXTMETRICA otm; > GLYPHMETRICS gm; > + struct glyphinfo *glyphs = NULL; > GLYPHMETRICSFLOAT *glyphmetrics_float = HeapAlloc(GetProcessHeap(), 0, sizeof(GLYPHMETRICSFLOAT) * strlen(text)); > int i; > LOGFONTA lf; > + float offset_x; > + size_t textlen; > HFONT font = NULL, oldfont = NULL; > + char *raw_outline = NULL; > > sprintf(name, "text ('%s', %f, %f)", text, deviation, extrusion); > > @@ -4141,7 +4099,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > if (hr != D3D_OK) > { > skip("Couldn't create text with D3DXCreateText\n"); > - return; > + goto error; > } > > /* must select a modified font having lfHeight = otm.otmEMSquare before > @@ -4149,21 +4107,25 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > if (!GetObjectA(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf) > || !GetOutlineTextMetricsA(hdc, sizeof(otm), &otm)) > { > - d3dxmesh->lpVtbl->Release(d3dxmesh); > skip("Couldn't get text outline\n"); > - return; > + goto error; > } > lf.lfHeight = otm.otmEMSquare; > lf.lfWidth = 0; > if (!(font = CreateFontIndirectA(&lf))) > { > - d3dxmesh->lpVtbl->Release(d3dxmesh); > skip("Couldn't create the modified font\n"); > - return; > + goto error; > } > + > + textlen = strlen(text); > + glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, textlen * sizeof(*glyphs)); > + if (!glyphs) > + goto error; > + > oldfont = SelectObject(hdc, font); > > - for (i = 0; i < strlen(text); i++) > + for (i = 0; i < textlen; i++) > { > const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > @@ -4175,8 +4137,42 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > compare_float(glyphmetrics_float[i].gmfCellIncY, gm.gmCellIncY / (float)otm.otmEMSquare); > } > > + if (deviation == 0.0f) > + deviation = 1.0f / otm.otmEMSquare; > + > + offset_x = 0.0f; > + for (i = 0; i < textlen; i++) > + { > + /* get outline points from data returned from GetGlyphOutline */ > + const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > + int datasize; > + > + glyphs[i].offset_x = offset_x; > + > + datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > + if (datasize < 0) > + { > + SelectObject(hdc, oldfont); > + goto error; > + } > + HeapFree(GetProcessHeap(), 0, raw_outline); > + raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); > + if (!raw_outline) > + { > + SelectObject(hdc, oldfont); > + goto error; > + } > + datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, datasize, raw_outline, &identity); > + > + create_outline(&glyphs[i], raw_outline, datasize, deviation, otm.otmEMSquare); > + > + offset_x += gm.gmCellIncX / (float)otm.otmEMSquare; > + } > + > + SelectObject(hdc, oldfont); > + > ZeroMemory(&mesh, sizeof(mesh)); > - if (!compute_text_mesh(&mesh, hdc, text, deviation, extrusion, otm.otmEMSquare)) > + if (!compute_text_mesh(&mesh, text, deviation, extrusion, otm.otmEMSquare, glyphs)) > { > skip("Couldn't create mesh\n"); > d3dxmesh->lpVtbl->Release(d3dxmesh); > @@ -4184,13 +4180,26 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > } > mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; > > - compare_text_outline_mesh(name, d3dxmesh, &mesh, strlen(text), extrusion); > + compare_text_outline_mesh(name, d3dxmesh, &mesh, textlen, extrusion, glyphs); > > +error: > free_mesh(&mesh); > > - d3dxmesh->lpVtbl->Release(d3dxmesh); > - SelectObject(hdc, oldfont); > + if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); > HeapFree(GetProcessHeap(), 0, glyphmetrics_float); > + > + if (glyphs) > + { > + for (i = 0; i < textlen; i++) > + { > + int j; > + for (j = 0; j < glyphs[i].outlines.count; j++) > + HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items[j].items); > + HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items); > + } > + HeapFree(GetProcessHeap(), 0, glyphs); > + } > + HeapFree(GetProcessHeap(), 0, raw_outline); > } It looks like there is a minor (preexisting) issue here, the font is not deleted. Maybe fix that in a followup patch, while you're at it? The patch itself is fine to me though.

1 0

Re: [include] - add new file tcpestats.h
by Sebastian Lackner Aug. 4, 2015

Aug. 4, 2015

On 04.08.2015 01:19, Vijay Kiran Kamuju wrote: > Changelog > include - add new file tcpestats.h > Your patch contains the same whitespace errors as the mingw header files. As far as I know, copying header files is not allowed, you have to type them yourself (even when the mingw header files are under a public domain license). (If someone else knows better, please correct me.) Regards, Sebastian

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.(try 2)
by Sebastian Lackner Aug. 4, 2015

Aug. 4, 2015

On 04.08.2015 19:58, YongHao Hu wrote: > try 2: > Fix nameless union.(thanks Piotr) > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > > > + ULONG ReparseTag; > + USHORT ReparseDataLength; > + USHORT Reserved; > + union foo > + { > + struct > + { Please use DUMMYUNIONNAME instead, like in the other include files. It should look like this: union { ... } DUMMYUNIONNAME; Regards, Sebastian

1 0

Re: [5/5] msvcirt: Implement filebuf::open/close
by Piotr Caban Aug. 4, 2015

Aug. 4, 2015

On 08/03/15 16:49, Iván Matellanes wrote: > @@ -884,8 +893,16 @@ filebuf* __thiscall filebuf_attach(filebuf *this, filedesc fd) > DEFINE_THISCALL_WRAPPER(filebuf_close, 4) > filebuf* __thiscall filebuf_close(filebuf *this) > { > - FIXME("(%p) stub\n", this); > - return NULL; > + TRACE("(%p)\n", this); > + if (this->fd == -1) > + return NULL; > + > + streambuf_lock(&this->base); > + call_streambuf_sync(&this->base); Please handle call_streambuf_sync failure here. > /* ?fd(a)filebuf@@QBEHXZ */ > @@ -911,8 +928,46 @@ int __thiscall filebuf_is_open(const filebuf *this) > DEFINE_THISCALL_WRAPPER(filebuf_open, 16) > filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode mode, int protection) > { > - FIXME("(%p %s %d %d) stub\n", this, name, mode, protection); > - return NULL; > + const int inout_mode[4] = {-1, _O_RDONLY, _O_WRONLY, _O_RDWR}; > + const int share_mode[4] = {_SH_DENYRW, _SH_DENYWR, _SH_DENYRD, _SH_DENYNO}; > + int op_flags, sh_flags, fd; > + > + TRACE("(%p %s %d %d)\n", this, name, mode, protection); It will be easier to read the logs if mode and protection is printed as hexadecimal value. The same way op_flags and sh_flags should be printed. > + if (this->fd != -1) > + return NULL; > + > + /* mode */ > + if (mode & (OPENMODE_app|OPENMODE_trunc)) > + mode |= OPENMODE_out; > + op_flags = inout_mode[mode & (OPENMODE_in|OPENMODE_out)]; > + if (op_flags < 0) > + return NULL; > + if (mode & OPENMODE_app) > + op_flags |= _O_APPEND; > + if ((mode & OPENMODE_trunc) || > + ((mode & OPENMODE_out) && !(mode & (OPENMODE_in|OPENMODE_app|OPENMODE_ate)))) > + op_flags |= _O_TRUNC; > + if (!(mode & OPENMODE_nocreate)) > + op_flags |= _O_CREAT; > + if (mode & OPENMODE_noreplace) > + op_flags |= _O_EXCL; > + op_flags |= (mode & OPENMODE_binary) ? _O_BINARY : _O_TEXT; > + > + /* share protection */ > + sh_flags = (protection & filebuf_sh_none) ? share_mode[(protection >> 9) & 3] : _SH_DENYNO; > + > + TRACE("op_flags %d, sh_flags %d\n", op_flags, sh_flags); > + fd = _sopen(name, op_flags, sh_flags, _S_IREAD|_S_IWRITE); > + if (fd < 0) > + return NULL; > + > + streambuf_lock(&this->base); > + this->fd = fd; > + this->close = 1; > + if (mode & OPENMODE_ate) > + call_streambuf_seekoff(&this->base, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); Please handle seek failure here. Thanks, Piotr

1 0

Re: wine.inf: Add UTC Time Zone (try 4)
by Sebastian Lackner Aug. 4, 2015

Aug. 4, 2015

On 04.08.2015 03:05, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..30cf5ab 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Looks good, thanks! :)

1 0

Re: quartz: waveparser support wav file generated by ffmpeg
by Marvin Aug. 4, 2015

Aug. 4, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15747 Your paranoid android. === wvistau64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === wvistau64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0

1 0

Re: [PATCH 4/5] d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces.
by Stefan Dösinger Aug. 4, 2015

Aug. 4, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-04 um 08:53 schrieb Henri Verbeet: > + texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef; > + hr = IDirect3DDevice9_SetTexture(device, 0, texture); > + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); I guess you're not testing GetTexture because it crashes when trying to AddRef the texture? > + if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl) > + { > + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); > + return NULL; > + } Minor copypaste bug ("IDirect3DBaseTexture8"). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVwHkaAAoJEN0/YqbEcdMwAykP/3XM3HslUzcvJ+d5Jz59febN pBoVG5dJO0uboxYAjuv1Fj6Ft9+CWvcSOva6Oo1cnwV06ojY82oFC5XIQp+UB9xQ nU+T8In0b5IPX82uTSEM6k/uVE3Yycc41DmvD1/VxF29el64Oifn1afOcAg7TRAV f93+yR464vBzx7esXRpXkF5X1xvmsW1LtnJe3Z1uHqNMiZwixn9M33kuceMz0ZqD H9o8Hxn1sESurxR/2cEZFFzHne36l067NY2/HsJ9yeBk90zay+99iojMcWCLhhF2 CHj6xynbxWZCGFSRQM29HtCt/P5nl6lrg/jXeFY8AwmAf0n9NMBOyxqb8c7BVFx/ bSO75oPiyHS8xzBxdgqCuJka18QlTuy40UwNwQTU6TckcHl+MyezthLKAFSRV42i zGjcV0S725bQWy2/S4ep+fuxWaJNT5JKULvcqQxHDo3h/NBLyvHI+fNXMhZGJWdH Z1Xl2lGhoihIieu+2Xo5Jt+ghuecs8RQYIfamsYGQJDIuyovE8PAKGoPy/S+CzyN ypOPjXwhDTEIJpMm0/Gaxc49FkjbHiLjcevJS6wRP5JQJzIrKy94SwPCIhRiQoj7 dLgsiPAppEGLgkhFTQ1DcYvkS4UcPMlN8K0dmcXFiMWgzmfeKm2gnZ9+2p2WfhZf 5FGMz4ENg5TuWxay3YRj =4SY2 -----END PGP SIGNATURE-----

2 1

Re: loader: Add UTC Time Zone
by Sebastian Lackner Aug. 3, 2015

Aug. 3, 2015

On 03.08.2015 16:32, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..1627ad6 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" I just saw that we have also a unix timezone Etc/UTC, this might be more appropriate (especially to avoid confusion with "GMT Standard Time", which is a separate entry in the file). > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" For all other entries it contains a human readable name. Something like "Coordinated Universal Time" for both Dlt and Std might be a bit better. > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Two other remarks: * When you send an updated version, please append "(try N)" to your subject, to make clear which version is newer. * A subject starting with "wine.inf:" might be better, since your patch only touches this single file, not the loader itself. Sorry for not pointing out all those things earlier. Best regards, Sebastian

2 3

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by Piotr Caban Aug. 3, 2015

Aug. 3, 2015

On 07/29/15 20:01, YongHao Hu wrote: > + union > + { > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + ULONG Flags; > + WCHAR PathBuffer[1]; > + } SymbolicLinkReparseBuffer; > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + WCHAR PathBuffer[1]; > + } MountPointReparseBuffer; > + struct > + { > + UCHAR DataBuffer[1]; > + } GenericReparseBuffer; > + }; This will not work on some compilers (nameless unions). Thanks, Piotr

1 0

Re: winex11.drv: Unmaximize restored windows when necessary.
by Vincent Povirk Aug. 3, 2015

Aug. 3, 2015

I don't think it's possible to sync the window modes correctly without maximizing first or messing with user32 internals. Is there something else I can follow up on?

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner Aug. 3, 2015

Aug. 3, 2015

On 03.08.2015 14:48, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2ab6ff3 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 This is still wrong unfortunately, there should only be one "," before the 1, otherwise it is not interpreted correctly. > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner Aug. 3, 2015

Aug. 3, 2015

On 02.08.2015 14:12, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2a7505c 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Hello Philippe, thanks for working on this. The line above is unfortunately not completely correct, you forgot to specify the type of the registry key (it should be a binary key in this case). It should look like this: HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Besides that the patch is fine. Regards, Sebastian > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

2 1

Re: [PATCH 1/4] reg: Add path/key conversion functions
by Stefan Dösinger Aug. 3, 2015

Aug. 3, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Thanks for picking up this work! Please submit patches with your real name. We need this for proper copyright attribution. Since this is derived from Jonathan work please mention this as well. The patch doesn't apply for me, I suspect that this is because of the no-break spaces instead of normal spaces. I highly recommend to use git send-email to send the mail. I haven't looked at the code itself. I hope I get around to look at it later today or on Sunday and compare it to the last suggestions I gave Jonathan. If you don't hear from me by Monday please ping me again. Cheers, Stefan Am 2015-07-31 um 11:46 schrieb xantares 09: > --- programs/reg/reg.c | 166 > +++++++++++++++++++++++++++------------------------- 1 file > changed, 86 insertions(+), 80 deletions(-) > > diff --git a/programs/reg/reg.c b/programs/reg/reg.c index > 4ec25bc..cf6425e 100644 --- a/programs/reg/reg.c +++ > b/programs/reg/reg.c @@ -22,6 +22,32 @@ > > #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) > > +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static > const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR > short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[] > = {'H','K','U',0}; +static const WCHAR short_hkcc[] = > {'H','K','C','C',0}; +static const WCHAR long_hklm[] = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > +static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; > +static const WCHAR long_hkcr[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > +static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; > +static const WCHAR long_hkcc[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > + > +static const struct +{ + HKEY key; + const WCHAR > *short_name; + const WCHAR *long_name; +} +root_rels[] = +{ + > {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, + > {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, + > {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, + {HKEY_USERS, > short_hku, long_hku}, + {HKEY_CURRENT_CONFIG, short_hkcc, > long_hkcc}, +}; + static const WCHAR type_none[] = > {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] = > {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] = > {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51 > +121,56 @@ static int reg_message(int msg) return > reg_printfW(formatW, msg_buffer); } > > -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) > +static inline BOOL path_rootname_cmp(const WCHAR *input_path, > const WCHAR *rootkey_name) { - int i; + DWORD length = > strlenW(rootkey_name); > > - for (i = 0; i < len; i++) + return (!strncmpiW(input_path, > rootkey_name, length) && + (input_path[length] == 0 || > input_path[length] == '\\')); +} + +static HKEY > path_get_rootkey(const WCHAR *path) +{ + DWORD i; + + for (i > = 0; i < ARRAY_SIZE(root_rels); i++) { - if (!str[i]) - > { - len = i + 1; - break; - } + > if (path_rootname_cmp(path, root_rels[i].short_name) || + > path_rootname_cmp(path, root_rels[i].long_name)) + > return root_rels[i].key; } > > - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, > len) - CSTR_EQUAL; + return NULL; } > > -static HKEY get_rootkey(LPWSTR key) +static HKEY path_open(const > WCHAR *path, BOOL create) { - static const WCHAR szHKLM[] = > {'H','K','L','M',0}; - static const WCHAR szHKEY_LOCAL_MACHINE[] > = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > - - static const WCHAR szHKCU[] = {'H','K','C','U',0}; > - static const WCHAR szHKEY_CURRENT_USER[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0 }; > > - - static const WCHAR szHKCR[] = {'H','K','C','R',0}; > - static const WCHAR szHKEY_CLASSES_ROOT[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > - - static const WCHAR szHKU[] = {'H','K','U',0}; > - static const WCHAR szHKEY_USERS[] = > {'H','K','E','Y','_','U','S','E','R','S',0}; - static const > WCHAR szHKCC[] = {'H','K','C','C',0}; - static const WCHAR > szHKEY_CURRENT_CONFIG[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > - - > - if (!reg_StrCmpNIW(key, szHKLM, 4) || - > !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) - return > HKEY_LOCAL_MACHINE; - else if (!reg_StrCmpNIW(key, szHKCU, 4) > || - !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) - > return HKEY_CURRENT_USER; - else if (!reg_StrCmpNIW(key, szHKCR, > 4) || - !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) - > return HKEY_CLASSES_ROOT; - else if (!reg_StrCmpNIW(key, szHKU, > 3) || - !reg_StrCmpNIW(key, szHKEY_USERS, 10)) - > return HKEY_USERS; - else if (!reg_StrCmpNIW(key, szHKCC, 4) || > - !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) - > return HKEY_CURRENT_CONFIG; - else return NULL; + LONG err; + > HKEY k; + + k = path_get_rootkey(path); + if (!k) + { + > reg_message(STRING_INVALID_KEY); + return NULL; + } + + > path = strchrW(path, '\\'); + if (path) + path++; + + > if (create) + err = RegCreateKeyW(k, path, &k); + else + > err = RegOpenKeyW(k, path, &k); + + if (err != ERROR_SUCCESS) + > { + reg_message(STRING_CANNOT_FIND); + return NULL; + > } + + return k; } > > static DWORD wchar_get_type(const WCHAR *type_name) @@ -221,34 > +252,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, > BOOL value_empty, { static const WCHAR stubW[] = {'A','D','D',' > ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s',' > ','%','s',' ','%','d','\n',0}; - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; > > reg_printfW(stubW, key_name, value_name, value_empty, type, data, > force); > > if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > TRUE); + if (!subkey) return 1; - } - - > if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } > > if (value_name || data) { @@ -288,8 +301,8 @@ static int > reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL > value_empty, BOOL value_all, BOOL force) { - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; + LONG err; > > static const WCHAR stubW[] = {'D','E','L','E','T','E', ' ','-',' > ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' @@ > -299,20 +312,9 @@ static int reg_delete(WCHAR *key_name, WCHAR > *value_name, BOOL value_empty, if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > FALSE); + if (!subkey) return 1; - } > > if (value_name && value_empty) { @@ -334,7 +336,17 @@ static int > reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* > Delete subtree only if no /v* option is given */ if (!value_name && > !value_empty && !value_all) { - if > (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + static const WCHAR > empty_wstr[] = {0}; + + err = RegDeleteTreeW(subkey, NULL); > + if (err != ERROR_SUCCESS) + { + > reg_message(STRING_CANNOT_FIND); + return 1; + } > + + err = RegDeleteKeyW(subkey, empty_wstr); + if > (err != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return > 1; @@ -343,12 +355,6 @@ static int reg_delete(WCHAR *key_name, > WCHAR *value_name, BOOL value_empty, return 0; } > > - if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_CANNOT_FIND); - return 1; - } - if > (value_all) { LPWSTR szValue; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVu33xAAoJEN0/YqbEcdMw1MEP/RZYiu5ZzcuAxcOvzmu2LrqR siZmDtSFzd+KN40tHl8IgrFB2kX2RePc0i4cNZJ1EUeMReS84HXoXSzUtDil5oy8 g0J9jFaZVv3xtznxKtQZDur2v3t+IYicjquhfbj7szheLpRbnfULwk3cs825QN1k C/Nhpj9aeDST49fe/YSi84XC15n2OyVHcZtTRgd4IZFVgd76L5kQYKYzLmv4ttes Mm5LGn5No72nehefRkW9YaFv2JAddgM/2jgz48+nd/pFhCB1NyXL2K6c5WPxT1OT Ahyx3oatrP5vSgNDc1Q3g0qGgYlk+aJAfulbSYZ4aSxS/YFcVqMbjEqb8mpPGUzX 1viNVuxg4dcfxozINJYPLkyU/ef9DwlSLdG3HlN9HDy/WFK/0lW4L4TEV9DrPwA+ /OPB8I7Vkb3r6qjsBEH4c1yG9PVQ0TiP3vjpEZM20J/gsvlTnJ6g3PSm9hFjwBWH bv5eBKJMUJKYiEJSoamfnermKEcxBcdOKsGbMApvRyVifcuUpY45+zv4bH0iVnKM 6pxb0EhWfizzbsDItSLDYNJZj1/XgMisgoKwnfUyxdmzRuzW9SipFmFqU6v8Sxpd QQOFSVG0IzL1QED51V2rlS5H1kZxCjRp+mKAn0j6a6KGNuZHcSAqCanhkyVW8FY7 OiDRd7mrwc32lMRcxqS+ =Sn4W -----END PGP SIGNATURE-----

2 2

Re: ole32: Add stub implementations of CoGetActivationState and CoGetCallState.
by Dmitry Timoshkov Aug. 3, 2015

Aug. 3, 2015

Hans Leidekker <hans(a)codeweavers.com> wrote: > +/*********************************************************************** > + * CoGetActivationState (ole32.@) > + */ > +HRESULT CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) > +{ > + FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); > + return E_NOTIMPL; > +} > + > +/*********************************************************************** > + * CoGetCallState (ole32.@) > + */ > +HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) > +{ > + FIXME("%d, %p\n", unknown, unknown2); > + return E_NOTIMPL; > +} wct.h from PSDK has typedefs for COGETCALLSTATE and COGETACTIVATIONSTATE without WINAPI, so probably implementations shouldn't have them either. Same applies to .spec file entries. -- Dmitry.

1 0

Re: [PATCH] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2)
by Marvin Aug. 3, 2015

Aug. 3, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15708 Your paranoid android. === w8 (32 bit mesh) === mesh.c:8258: Test failed: Mesh 26: new_num_vertices == 4, expected 6. mesh.c:8272: Test failed: Mesh 26: indices[3] == 1, expected 3 mesh.c:8272: Test failed: Mesh 26: indices[4] == 3, expected 4 mesh.c:8272: Test failed: Mesh 26: indices[5] == 2, expected 5 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[3] == 4, expected 3 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[4] == -1, expected 4 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[5] == -1, expected 5 mesh.c:8328: Test failed: Mesh 26: Got (3.000000, 0.000000, 0.000000) for vertex 3 position, expected (2.000000, 3.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 3 undefined color, expected (0, 0, 0, 0). mesh.c:8328: Test failed: Mesh 26: Got (2.000000, 3.000000, 0.000000) for vertex 4 position, expected (3.000000, 0.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 5 undefined color, expected (1, 1, 1, 1).

2 1

Re: [PATCH] include: Fix packing of digitalv.h
by Dmitry Timoshkov Aug. 2, 2015

Aug. 2, 2015

Bernhard Übelacker <bernhardu(a)vr-web.de> wrote: > diff --git a/include/digitalv.h b/include/digitalv.h > index a4ceb54..00601f4 100644 > --- a/include/digitalv.h > +++ b/include/digitalv.h > @@ -23,6 +23,8 @@ > * Wine Digital Video extensions > */ > > +#include <pshpack1.h> > + > #ifdef __cplusplus > extern "C" { > #endif This needs a matching #include <poppack.h> -- Dmitry.

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by YongHao Hu Aug. 2, 2015

Aug. 2, 2015

Excuse me, Is there anything to do to improve this patch? On 15/7/30 上午2:01, YongHao Hu wrote: > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > >

1 0

Re: [PATCH] user32: Return correct size for SM_CXSMICON on high-DPI screens.
by Ken Thomases Aug. 1, 2015

Aug. 1, 2015

On Aug 1, 2015, at 8:49 AM, Mark Harmstone <hellas(a)burntcomma.com> wrote: > Wine currently hardcodes the value of SM_CXSMICON in GetSystemMetrics as 16, > but Windows scales this on high-DPI screens: see https://msdn.microsoft.com/en-us/library/ms701681.aspx. According to that page, it only scales the results from GetSystemMetrics() for apps which have disabled automatic DPI scaling by calling SetProcessDPIAware(). Which makes sense because if the DPI is 192 and the app thinks the small icon size is 32x32 pixels and draws something that size and then it's scaled again for the DPI, it will appear 4 times the linear pixel size, rather than just the 2 times it should be for the DPI. -Ken

1 0

Re: [PATCH 00/21] MSVC 2015 CRT
by Martin Storsjö Aug. 1, 2015

Aug. 1, 2015

Hi, On Thu, 23 Jul 2015, Martin Storsjo wrote: > The RTM version of MSVC 2015 is out now, and along with that, a new > CRT version (again). As most of you probably know already, the CRT > has now been split into two parts, ucrtbase (which is considered > a system component in Windows 10, and is available as a redistributable > installable component for older Windows versions) and vcruntime140 > (which is the normal, compiler specific runtime). > > Even if Windows 10 isn't out yet, this is based on the redistributable > ucrtbase.dll that is installed by MSVC 2015. > > The ucrtbase.dll isn't very functional after this patchset; e.g. many > stdio functions have been restructured and need to be updated. (I'll > send a patch for that later, once this patchset has been merged.) But > after this set, a minimal plain empty exe built with the dynamic CRT > with MSVC 2015 does start up. Any comments on this patchset, other than the detail about cdecl vs stdcall in the forwarding dlls that Sebastian pointed out? Now that Windows 10 RTM is out, this can also be updated with the version of ucrtbase.dll from there. The only difference is a few added private (functions starting with _o_) stubs in the spec file. If there's no further comments on the set as such, I can resend it with the spec file updated, and the cdecl vs stdcall issues fixed. // Martin

1 0