March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : hhctrl.ocx: Make html_encoded_symbols[] static.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 3d1c2dc63ec9487a88084f604b575867c0e8cebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1c2dc63ec9487a88084f604… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:39:07 2015 +0100 hhctrl.ocx: Make html_encoded_symbols[] static. --- dlls/hhctrl.ocx/help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4f3ea1a..68989ae 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -61,7 +61,7 @@ struct html_encoded_symbol { * Table mapping the conversion between HTML encoded symbols and their ANSI code page equivalent. * Note: Add additional entries in proper alphabetical order (a binary search is used on this table). */ -struct html_encoded_symbol html_encoded_symbols[] = +static struct html_encoded_symbol html_encoded_symbols[] = { {"AElig", 0xC6}, {"Aacute", 0xC1},

1 0

Bruno Jesus : kernel32: Only zero the buffer up to 32767 bytes in GetTempPathW.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 24fc876e616db6f2249811c21c2c399c57c7df2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fc876e616db6f2249811c21… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 14 01:27:27 2015 -0300 kernel32: Only zero the buffer up to 32767 bytes in GetTempPathW. --- dlls/kernel32/path.c | 5 +++-- dlls/kernel32/tests/path.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7fe229f..c2833b1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -622,8 +622,9 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) if (count >= ret) { lstrcpynW(path, tmp_path, count); - /* the remaining buffer must be zeroed */ - memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); + /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 + * bytes after it, we will assume the > XP behavior for now */ + memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR)); ret--; /* return length without 0 */ } else if (count) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e97c50c..cdb565a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -975,7 +975,7 @@ static void test_GetTempPathA(char* tmp_dir) static void test_GetTempPathW(char* tmp_dir) { DWORD len, slen, len_with_null; - WCHAR buf[MAX_PATH]; + WCHAR buf[MAX_PATH], *long_buf; WCHAR tmp_dirW[MAX_PATH]; static const WCHAR fooW[] = {'f','o','o',0}; @@ -1048,6 +1048,34 @@ static void test_GetTempPathW(char* tmp_dir) ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); for(; len < sizeof(buf) / sizeof(buf[0]); len++) ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); + + /* bogus application from bug 38220 passes the count value in sizeof(buffer) + * instead the correct count of WCHAR, this test catches this case. */ + slen = 65534; + long_buf = HeapAlloc(GetProcessHeap(), 0, slen * sizeof(WCHAR)); + if (!long_buf) + { + skip("Could not allocate memory for the test\n"); + return; + } + for(len = 0; len < slen; len++) + long_buf[len] = 0xCC; + len = GetTempPathW(slen, long_buf); + ok(lstrcmpiW(long_buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); + ok(len == lstrlenW(long_buf), "returned length should be equal to the length of string\n"); + /* the remaining buffer must be zeroed up to different values in different OS versions. + * <= XP - 32766 + * > XP - 32767 + * to simplify testing we will test only until XP. + */ + for(; len < 32767; len++) + ok(long_buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, long_buf[len]); + /* we will know skip the test that is in the middle of the OS difference by + * incrementing len and then resume the test for the untouched part. */ + for(len++; len < slen; len++) + ok(long_buf[len] == 0xcc, "expected 0xcc at [%d], got 0x%x\n", len, long_buf[len]); + + HeapFree(GetProcessHeap(), 0, long_buf); } static void test_GetTempPath(void)

1 0

Ken Thomases : winejoystick: Add WinMM joystick support for OS X.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 65711634ce97e3e01e7ac70d95388da5e208f90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65711634ce97e3e01e7ac70d9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 16 18:44:08 2015 -0500 winejoystick: Add WinMM joystick support for OS X. --- configure | 2 +- configure.ac | 2 +- dlls/winejoystick.drv/Makefile.in | 4 +- dlls/winejoystick.drv/joystick_osx.c | 754 +++++++++++++++++++++++++++++++++++ 4 files changed, 759 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65711634ce97e3e01e7ac…

1 0

Matteo Bruni : wined3d: Depend on the vertex shader state instead of the vertex declaration state where appropriate.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 38e4cb29e77edae34fba3bce3d25f2cd2f87ead3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e4cb29e77edae34fba3bce3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 17 15:52:14 2015 +0100 wined3d: Depend on the vertex shader state instead of the vertex declaration state where appropriate. --- dlls/wined3d/glsl_shader.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38e4cb29e77edae34fba3…

1 0

Stefan Dösinger : ddraw: Handle DDBLT_ROP in ddraw.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: df829de88d2f703e40885fe66b46feb50e04531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df829de88d2f703e40885fe66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 17 23:54:14 2015 +0100 ddraw: Handle DDBLT_ROP in ddraw. --- dlls/ddraw/surface.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 21 --------------------- 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index dd9a018..b8c9872 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1518,6 +1518,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR struct ddraw_surface *dst_surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_surface = unsafe_impl_from_IDirectDrawSurface7(SrcSurface); HRESULT hr = DD_OK; + DDBLTFX rop_fx; TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(DestRect), SrcSurface, wine_dbgstr_rect(SrcRect), Flags, DDBltFx); @@ -1583,6 +1584,35 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR WARN("DDBLT_ROP used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } + + Flags &= ~DDBLT_ROP; + switch (DDBltFx->dwROP) + { + case SRCCOPY: + break; + + case WHITENESS: + case BLACKNESS: + rop_fx = *DDBltFx; + + if (DDBltFx->dwROP == WHITENESS) + rop_fx.u5.dwFillColor = 0xffffffff; + else + rop_fx.u5.dwFillColor = 0; + + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + Flags |= DDBLT_DEPTHFILL; + else + Flags |= DDBLT_COLORFILL; + + DDBltFx = &rop_fx; + break; + + default: + wined3d_mutex_unlock(); + WARN("Unsupported ROP %#x used, returning DDERR_NORASTEROPHW.\n", DDBltFx->dwROP); + return DDERR_NORASTEROPHW; + } } if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT))) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6b9216b..66f8cff 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8672,6 +8672,31 @@ static void test_color_fill(void) } }, }; + static const struct + { + DWORD rop; + const char *name; + HRESULT hr; + } + rops[] = + { + {SRCCOPY, "SRCCOPY", DD_OK}, + {SRCPAINT, "SRCPAINT", DDERR_NORASTEROPHW}, + {SRCAND, "SRCAND", DDERR_NORASTEROPHW}, + {SRCINVERT, "SRCINVERT", DDERR_NORASTEROPHW}, + {SRCERASE, "SRCERASE", DDERR_NORASTEROPHW}, + {NOTSRCCOPY, "NOTSRCCOPY", DDERR_NORASTEROPHW}, + {NOTSRCERASE, "NOTSRCERASE", DDERR_NORASTEROPHW}, + {MERGECOPY, "MERGECOPY", DDERR_NORASTEROPHW}, + {MERGEPAINT, "MERGEPAINT", DDERR_NORASTEROPHW}, + {PATCOPY, "PATCOPY", DDERR_NORASTEROPHW}, + {PATPAINT, "PATPAINT", DDERR_NORASTEROPHW}, + {PATINVERT, "PATINVERT", DDERR_NORASTEROPHW}, + {DSTINVERT, "DSTINVERT", DDERR_NORASTEROPHW}, + {BLACKNESS, "BLACKNESS", DD_OK}, + {WHITENESS, "WHITENESS", DD_OK}, + {0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */ + }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -8926,6 +8951,13 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_ROP | DDBLT_WAIT, &fx); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < sizeof(rops) / sizeof(*rops); i++) + { + fx.dwROP = rops[i].rop; + hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDBLT_ROP | DDBLT_WAIT, &fx); + ok(hr == rops[i].hr, "Got unexpected hr %#x for rop %s.\n", hr, rops[i].name); + } + IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c045591..78e7030 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4733,27 +4733,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { FIXME("DDBLT_DEPTHFILL needs to be implemented!\n"); } - if (flags & WINEDDBLT_ROP) - { - /* Catch some degenerate cases here. */ - switch (fx->dwROP) - { - case BLACKNESS: - hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0); - break; - case 0xaa0029: /* No-op */ - break; - case WHITENESS: - hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U); - break; - case SRCCOPY: /* Well, we do that below? */ - break; - default: - FIXME("Unsupported raster op: %08x Pattern: %p\n", fx->dwROP, fx->u5.lpDDSPattern); - goto error; - } - flags &= ~WINEDDBLT_ROP; - } if (flags & WINEDDBLT_DDROPS) { FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", fx->dwDDROP, fx->u5.lpDDSPattern);

1 0

Aaryaman Vasishta : d3drm/tests: Remove dynamic loading in d3drm.c.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 57281caa23463fe9c2e3a292762dda463b7de92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57281caa23463fe9c2e3a2927… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:40 2015 +0530 d3drm/tests: Remove dynamic loading in d3drm.c. --- dlls/d3drm/tests/d3drm.c | 60 +++++++++++------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1c269ef..515aace 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -26,10 +26,6 @@ #include "wine/test.h" -static HMODULE d3drm_handle = 0; - -static HRESULT (WINAPI * pDirect3DRMCreate)(IDirect3DRM **d3drm); - #define CHECK_REFCOUNT(obj,rc) \ { \ int rc_new = rc; \ @@ -37,29 +33,6 @@ static HRESULT (WINAPI * pDirect3DRMCreate)(IDirect3DRM **d3drm); ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } -#define D3DRM_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(d3drm_handle); \ - return FALSE; \ - } - -static BOOL InitFunctionPtrs(void) -{ - d3drm_handle = LoadLibraryA("d3drm.dll"); - - if(!d3drm_handle) - { - skip("Could not load d3drm.dll\n"); - return FALSE; - } - - D3DRM_GET_PROC(Direct3DRMCreate) - - return TRUE; -} - static int get_refcount(IUnknown *object) { IUnknown_AddRef( object ); @@ -242,7 +215,7 @@ static void test_MeshBuilder(void) D3DCOLOR color; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); @@ -538,7 +511,7 @@ static void test_MeshBuilder3(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) @@ -644,7 +617,7 @@ static void test_Mesh(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateMesh(d3drm, &mesh); @@ -685,7 +658,7 @@ static void test_Face(void) CHAR cname[64] = {0}; int icount; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFace(d3drm, &face1); @@ -925,7 +898,7 @@ static void test_Frame(void) DWORD count; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC); @@ -1257,7 +1230,7 @@ static void test_Viewport(void) window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); GetClientRect(window, &rc); - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = DirectDrawCreateClipper(0, &pClipper, NULL); @@ -1308,7 +1281,7 @@ static void test_Light(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light); @@ -1363,7 +1336,7 @@ static void test_Material2(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) @@ -1447,7 +1420,7 @@ static void test_Texture(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); initimg.buffer1 = &pixel; @@ -1488,7 +1461,7 @@ static void test_Device(void) window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); GetClientRect(window, &rc); - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = DirectDrawCreateClipper(0, &pClipper, NULL); @@ -1551,7 +1524,7 @@ static void test_frame_transform(void) IDirect3DRMFrame *frame; D3DRMMATRIX4D matrix; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); @@ -1589,7 +1562,7 @@ static void test_d3drm_load(void) D3DRMLOADMEMORY info; const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial }; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; @@ -1665,7 +1638,7 @@ static void test_frame_mesh_materials(void) IDirect3DRMTexture *texture; int i; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr); info.lpMemory = data_frame_mesh_materials; @@ -1860,7 +1833,7 @@ static void test_d3drm_qi(void) HRESULT hr; IDirect3DRM *d3drm; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); @@ -1870,9 +1843,6 @@ static void test_d3drm_qi(void) START_TEST(d3drm) { - if (!InitFunctionPtrs()) - return; - test_MeshBuilder(); test_MeshBuilder3(); test_Mesh(); @@ -1887,6 +1857,4 @@ START_TEST(d3drm) test_d3drm_load(); test_frame_mesh_materials(); test_d3drm_qi(); - - FreeLibrary(d3drm_handle); }

1 0

Aaryaman Vasishta : d3drm/tests: Remove dynamic loading in vector.c.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: b436b4b2b900733b4b933a149260cd28973b0482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b436b4b2b900733b4b933a149… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:41 2015 +0530 d3drm/tests: Remove dynamic loading in vector.c. --- dlls/d3drm/tests/vector.c | 126 +++++++++++----------------------------------- 1 file changed, 29 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b436b4b2b900733b4b933…

1 0

Ken Thomases : winemenubuilder: Fix compiling on OS X.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 0815dc223e3ee22f58e59527c80761b2359f2b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0815dc223e3ee22f58e59527c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 18 09:50:41 2015 -0500 winemenubuilder: Fix compiling on OS X. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4a5639b..bc1540b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1168,7 +1168,7 @@ static inline int size_to_slot(int size) #define CLASSIC_SLOT 3 -static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *pIconDirEntry, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) {

1 0

Matteo Bruni : wined3d: Force stream info update on vertex shader change.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: d8c5e417c214be468c0b4bfc74cd56d370985939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c5e417c214be468c0b4bfc7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 17 15:52:13 2015 +0100 wined3d: Force stream info update on vertex shader change. --- dlls/wined3d/context.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index af29e69..9cc68ab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3048,7 +3048,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); - if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) + /* TODO: Right now the dependency on the vertex shader is necessary + * since context_stream_info_from_declaration depends on the reg_maps of + * the current VS but maybe it's possible to relax the coupling in some + * situations at least. */ + if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC) + || isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) { context_update_stream_info(context, state); }

1 0

Francois Gouget : pdh: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 362a260409ff2bf156b0404695f723715c4f6cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362a260409ff2bf156b040469… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:17 2015 +0100 pdh: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/pdh/pdh_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f197095..2631fe1 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -23,7 +23,7 @@ #include <math.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h"

1 0