October 2015 - Wine-Commits

Sebastian Lackner : ws2_32/tests: Add tests for InetPtonW.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: efb1b16dc8db847718793a3dc576f6f7b104b81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1b16dc8db847718793a3dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 04:58:04 2015 +0200 ws2_32/tests: Add tests for InetPtonW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8a0e375..7574631 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,7 +67,8 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); -static int (WINAPI *pInetPton)(INT,LPSTR,LPVOID); +static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); +static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); @@ -1159,7 +1160,8 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); - pInetPton = (void *)GetProcAddress(hws2_32, "inet_pton"); + pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); + pInetPtonW = (void *)GetProcAddress(hws2_32, "InetPtonW"); pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); @@ -4698,10 +4700,11 @@ static void test_inet_pton(void) int i, ret; DWORD err; char buffer[64],str[64]; + WCHAR printableW[64]; const char *ptr; /* InetNtop and InetPton became available in Vista and Win2008 */ - if (!pInetNtop || !pInetPton) + if (!pInetNtop || !pInetPtonA || !pInetPtonW) { win_skip("InetNtop and/or InetPton not present, not executing tests\n"); return; @@ -4710,7 +4713,7 @@ static void test_inet_pton(void) for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { WSASetLastError(0xdeadbeef); - ret = pInetPton(tests[i].family, (char *)tests[i].printable, buffer); + ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); if (tests[i].ret == -1) { @@ -4731,6 +4734,25 @@ static void test_inet_pton(void) ok (strcmp(ptr, tests[i].collapsed) == 0, "Test [%d]: Expected '%s', got '%s'\n", i, tests[i].collapsed, ptr); } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + if (tests[i].printable) + MultiByteToWideChar(CP_ACP, 0, tests[i].printable, -1, printableW, + sizeof(printableW) / sizeof(printableW[0])); + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); + ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + if (tests[i].ret == -1) + { + err = WSAGetLastError(); + ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); + } + if (tests[i].ret != 1) continue; + ok(memcmp(buffer, tests[i].raw_data, + tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, + "Test [%d]: Expected binary data differs\n", i); + } } static void test_ioctlsocket(void)

1 0

Alasdair Sinclair : ntdsapi: Fix null termination of buffer.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: ac7069e09b2555c08ebb4f323e9b8558a866ab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7069e09b2555c08ebb4f323… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Mon Oct 5 00:31:31 2015 +0000 ntdsapi: Fix null termination of buffer. Signed-off-by: Alasdair Sinclair <alasdairsinc(a)gmail.com> --- dlls/ntdsapi/ntdsapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 2a313ec..ee0c837 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -225,7 +225,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD p = buf + strlenW(class); *p++ = '/'; memcpy(p, name, strlenW(name) * sizeof(WCHAR)); - buf[len] = 0; + buf[len - 1] = 0; return ERROR_SUCCESS; }

1 0

Nikolay Sivov : riched20: Handle invalid HFONT values passed to WM_SETFONT.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 20f4a9ff7b1cf4f4e2ddfc11f4fce44293268e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f4a9ff7b1cf4f4e2ddfc11f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 00:40:16 2015 +0300 riched20: Handle invalid HFONT values passed to WM_SETFONT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/riched20/editor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a55a109..ae4a3ab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3767,7 +3767,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!wParam) wParam = (WPARAM)GetStockObject(SYSTEM_FONT); - GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); + + if (!GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf)) + return 0; + hDC = ITextHost_TxGetDC(editor->texthost); ME_CharFormatFromLogFont(hDC, &lf, &fmt); ITextHost_TxReleaseDC(editor->texthost, hDC);

1 0

André Hentschel : wineboot: Move a function call after a possible return.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 30c5f3bd6322fd86fb20416861ceab1227a04607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c5f3bd6322fd86fb2041686… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 4 21:18:32 2015 +0200 wineboot: Move a function call after a possible return. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4d70ea9..cf0c741 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -321,10 +321,10 @@ static void create_environment_registry_keys( void ) WCHAR buffer[60]; const WCHAR *arch; - NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); - if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; + NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); + sprintfW( buffer, PercentDW, NtCurrentTeb()->Peb->NumberOfProcessors ); set_reg_value( env_key, NumProcW, buffer );

1 0

Nikolay Sivov : gdi32: Implement GetFontFileInfo().
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 6f7dfe2cea4fdb9b61775023659193421c920278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7dfe2cea4fdb9b617750236… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 4 12:48:48 2015 +0300 gdi32: Implement GetFontFileInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/freetype.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/font.c | 19 ++++++++++--- 3 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de40d9f..33e196c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -364,6 +364,12 @@ typedef struct { GdiFont *font; } CHILD_FONT; +struct font_fileinfo { + FILETIME writetime; + LARGE_INTEGER size; + WCHAR path[1]; +}; + struct tagGdiFont { struct list entry; struct list unused_entry; @@ -400,6 +406,7 @@ struct tagGdiFont { const VOID *vert_feature; DWORD cache_num; DWORD instance_id; + struct font_fileinfo *fileinfo; }; typedef struct { @@ -4505,6 +4512,7 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, child); } + HeapFree(GetProcessHeap(), 0, font->fileinfo); free_font_handle(font->instance_id); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); @@ -5161,6 +5169,29 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) return feature; } +static void fill_fileinfo_from_face( GdiFont *font, Face *face ) +{ + WIN32_FILE_ATTRIBUTE_DATA info; + int len; + + if (!face->file) + { + font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); + return; + } + + len = strlenW(face->file); + font->fileinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); + if (GetFileAttributesExW(face->file, GetFileExInfoStandard, &info)) + { + font->fileinfo->writetime = info.ftLastWriteTime; + font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; + strcpyW(font->fileinfo->path, face->file); + } + else + memset(&font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); +} + /************************************************************* * freetype_SelectFont */ @@ -5555,6 +5586,7 @@ found_face: goto done; } + fill_fileinfo_from_face( ret, face ); ret->ntmFlags = face->ntmFlags; pick_charmap( ret->ft_face, ret->charset ); @@ -8238,7 +8270,7 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) return dev->funcs->pGetFontRealizationInfo( dev, ptr ); } - FIXME("(%p, %p): stub!\n", physdev->font, info); + TRACE("(%p, %p)\n", physdev->font, info); info->flags = 1; if(FT_IS_SCALABLE(physdev->font->ft_face)) @@ -8256,6 +8288,33 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) } /************************************************************************* + * GetFontFileInfo (GDI32.@) + */ +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed ) +{ + struct font_handle_entry *entry = handle_entry( instance_id ); + const GdiFont *font; + + if (!entry) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + font = entry->obj; + *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR); + if (*needed > size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + /* path is included too */ + memcpy(info, font->fileinfo, *needed); + return TRUE; +} + +/************************************************************************* * Kerning support for TrueType fonts */ #define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') @@ -8644,6 +8703,8 @@ static const struct gdi_dc_funcs freetype_funcs = #else /* HAVE_FREETYPE */ +struct font_fileinfo; + /*************************************************************************/ BOOL WineEngInit(void) @@ -8687,4 +8748,13 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } +/************************************************************************* + * GetFontFileInfo (GDI32.@) + */ +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +{ + *needed = 0; + return FALSE; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8bba686..7d837f6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -279,6 +279,7 @@ @ stdcall GetEnhMetaFileW(wstr) # @ stub GetFontAssocStatus @ stdcall GetFontData(long long long ptr long) +@ stdcall GetFontFileInfo(long long ptr long ptr) @ stdcall GetFontLanguageInfo(long) @ stdcall GetFontRealizationInfo(long ptr) @ stub GetFontResourceInfo diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dff0eb6..c7dd6e1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4177,14 +4177,14 @@ static void test_RealizationInfo(void) ok((info[0] & 0xf) == 1, "info[0] = %x for the system font\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); - if (!is_truetype_font_installed("Arial")) + if (!is_truetype_font_installed("Tahoma")) { skip("skipping GdiRealizationInfo with truetype font\n"); goto end; } memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Arial"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; lf.lfWeight = FW_NORMAL; hfont = CreateFontIndirectA(&lf); @@ -4238,12 +4238,19 @@ static void test_RealizationInfo(void) ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); /* Test GetFontFileInfo() */ - if (pGetFontFileInfo) { + /* invalid font id */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(0xabababab, 0, &file_info, sizeof(file_info), &needed); + ok(r == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "ret %d gle %d\n", r, GetLastError()); + + needed = 0; r = pGetFontFileInfo(fri->instance_id, 0, &file_info, sizeof(file_info), &needed); ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); if (r) { + ok(needed > 0 && needed < sizeof(file_info), "got needed size %u\n", needed); + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); @@ -4256,8 +4263,14 @@ static void test_RealizationInfo(void) ReadFile(h, file, sizeof(file), &read, NULL); CloseHandle(h); have_file = TRUE; + + /* shorter buffer */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(fri->instance_id, 0, &file_info, needed - 1, &needed); + ok(r == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "ret %d gle %d\n", r, GetLastError()); } + if (pGetFontFileData) { /* Get bytes 2 - 16 using GetFontFileData */ r = pGetFontFileData(fri->instance_id, 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError());

1 0

André Hentschel : psapi/tests: Also accept strlen as return value.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 4d98658621346f6e18e7d31ebc2efd1fbe637640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d98658621346f6e18e7d31eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 3 18:58:39 2015 +0200 psapi/tests: Also accept strlen as return value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 95f7c9f..799f0d8 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -624,7 +624,7 @@ static void test_GetModuleFileNameEx(void) SetLastError(0xdeadbeef); memset( szModExPath, 0xcc, sizeof(szModExPath) ); ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); - ok( ret == 4, "wrong length %u\n", ret ); + ok( ret == 4 || ret == strlen(szModExPath), "wrong length %u\n", ret ); ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3, "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); @@ -640,7 +640,7 @@ static void test_GetModuleFileNameEx(void) SetLastError(0xdeadbeef); memset( buffer, 0xcc, sizeof(buffer) ); ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 ); - ok( ret == 4, "wrong length %u\n", ret ); + ok( ret == 4 || ret == lstrlenW(buffer), "wrong length %u\n", ret ); ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3, "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());

1 0

Józef Kucia : d3d11: Rename d3d10_depthstencil_state to d3d_depthstencil_state.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: ce0c09421860b982f998d8c77f67813265a46cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0c09421860b982f998d8c77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 01:31:51 2015 +0200 d3d11: Rename d3d10_depthstencil_state to d3d_depthstencil_state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 8 ++++---- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4abf6f5..dca9fda 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -292,7 +292,7 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_devic struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ -struct d3d10_depthstencil_state +struct d3d_depthstencil_state { ID3D10DepthStencilState ID3D10DepthStencilState_iface; LONG refcount; @@ -303,9 +303,9 @@ struct d3d10_depthstencil_state ID3D10Device1 *device; }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d_device *device, +HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D10_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( +struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; /* ID3D11RasterizerState, ID3D10RasterizerState */ @@ -379,7 +379,7 @@ struct d3d_device struct d3d10_blend_state *blend_state; float blend_factor[4]; - struct d3d10_depthstencil_state *depth_stencil_state; + struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; struct d3d_rasterizer_state *rasterizer_state; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9f7d8c3..70496a3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2414,7 +2414,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi const D3D10_DEPTH_STENCIL_DESC *desc, ID3D10DepthStencilState **depth_stencil_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_depthstencil_state *object; + struct d3d_depthstencil_state *object; D3D10_DEPTH_STENCIL_DESC tmp_desc; struct wine_rb_entry *entry; HRESULT hr; @@ -2439,7 +2439,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry); + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_depthstencil_state, entry); TRACE("Returning existing depthstencil state %p.\n", object); *depth_stencil_state = &object->ID3D10DepthStencilState_iface; @@ -2454,7 +2454,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_depthstencil_state_init(object, device, &tmp_desc))) + if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3092,21 +3092,21 @@ static const struct wine_rb_functions d3d10_blend_state_rb_ops = d3d10_blend_state_compare, }; -static int d3d10_depthstencil_state_compare(const void *key, const struct wine_rb_entry *entry) +static int d3d_depthstencil_state_compare(const void *key, const struct wine_rb_entry *entry) { const D3D10_DEPTH_STENCIL_DESC *ka = key; const D3D10_DEPTH_STENCIL_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, - const struct d3d10_depthstencil_state, entry)->desc; + const struct d3d_depthstencil_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } -static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = +static const struct wine_rb_functions d3d_depthstencil_state_rb_ops = { d3d_rb_alloc, d3d_rb_realloc, d3d_rb_free, - d3d10_depthstencil_state_compare, + d3d_depthstencil_state_compare, }; static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) @@ -3147,7 +3147,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; - if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) + if (wine_rb_init(&device->depthstencil_states, &d3d_depthstencil_state_rb_ops) == -1) { WARN("Failed to initialize depthstencil state rbtree.\n"); wine_rb_destroy(&device->blend_states, NULL, NULL); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1adcdbd..ae356a0 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -192,9 +192,9 @@ struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *if return impl_from_ID3D10BlendState(iface); } -static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) +static inline struct d3d_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { - return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface); + return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D10DepthStencilState_iface); } /* IUnknown methods */ @@ -221,7 +221,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10D static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStencilState *iface) { - struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -231,7 +231,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStenci static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -254,7 +254,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStenc static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthStencilState *iface, ID3D10Device **device) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -265,7 +265,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthSten static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -276,7 +276,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10D static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateData(ID3D10DepthStencilState *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -287,7 +287,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateData(ID3D10D static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterface(ID3D10DepthStencilState *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -299,7 +299,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterfac static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDesc(ID3D10DepthStencilState *iface, D3D10_DEPTH_STENCIL_DESC *desc) { - struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -321,7 +321,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d_device *device, +HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D10_DEPTH_STENCIL_DESC *desc) { state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; @@ -345,7 +345,7 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, st return S_OK; } -struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) +struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Implement {d3d10, d3d11}_geometry_shader_GetDevice().
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: e348fefa2e97dfa84ebf4292f44f18a08e027544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e348fefa2e97dfa84ebf4292f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 01:31:50 2015 +0200 d3d11: Implement {d3d10, d3d11}_geometry_shader_GetDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/shader.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8ff4847..4abf6f5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -249,6 +249,7 @@ struct d3d_geometry_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; + ID3D11Device *device; }; HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index aa3ac5e..27083de 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -495,9 +495,15 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade if (!refcount) { + ID3D11Device *device = shader->device; + wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); wined3d_mutex_unlock(); + + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); } return refcount; @@ -506,7 +512,12 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade static void STDMETHODCALLTYPE d3d11_geometry_shader_GetDevice(ID3D11GeometryShader *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_geometry_shader_GetPrivateData(ID3D11GeometryShader *iface, @@ -593,7 +604,11 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShader *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface, @@ -697,6 +712,9 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru } wined3d_mutex_unlock(); + shader->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(shader->device); + return S_OK; }

1 0

André Hentschel : psapi/tests: Disable tests which crash on win10.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: d33984e6ba362afc03821e97e884bf289be07531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33984e6ba362afc03821e97e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 3 18:57:47 2015 +0200 psapi/tests: Disable tests which crash on win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/psapi/tests/psapi_main.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index d7d3a1e..bee0b9b 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -646,10 +646,13 @@ static void test_GetModuleFileNameEx(void) "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); - ok( ret == 0, "wrong length %u\n", ret ); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + if (0) /* crashes on Windows 10 */ + { + SetLastError(0xdeadbeef); + ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + } SetLastError(0xdeadbeef); memset( buffer, 0xcc, sizeof(buffer) ); @@ -659,12 +662,15 @@ static void test_GetModuleFileNameEx(void) "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); - SetLastError(0xdeadbeef); - buffer[0] = 0xcc; - ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); - ok( ret == 0, "wrong length %u\n", ret ); - ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); - ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); + if (0) /* crashes on Windows 10 */ + { + SetLastError(0xdeadbeef); + buffer[0] = 0xcc; + ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); + } } static void test_GetModuleBaseName(void)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: fb53e0129098aa9729ce1f5822026a8b18b9cdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb53e0129098aa9729ce1f582… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 3 11:46:01 2015 +0200 po: Update French translation. --- po/fr.po | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0918427..f1a9401 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-18 09:12+0100\n" +"PO-Revision-Date: 2015-10-03 11:45+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -7496,16 +7496,12 @@ msgid "&Convert..." msgstr "&Convertir..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objet" +msgstr "&Objet %1 %2" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objet" +msgstr "&Objet %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9310,11 +9306,11 @@ msgstr "Volume" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Volume principal" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Muet" #: winspool.rc:37 msgid "Print to File" @@ -13010,18 +13006,18 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller : l'application de GUID « %1 » est introuvable\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller : l'option « --remove » doit être suivie d'un GUID " +"d'application\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Erreur : option « %c » invalide.\n" +msgstr "uninstaller : option [%1] invalide\n" #: uninstaller.rc:35 msgid "" @@ -13030,6 +13026,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Programme de désinstallation des applications Wine\n" +"\n" +"Désinstalle des applications du préfixe Wine courant.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -13044,6 +13044,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Usage :\n" +" uninstaller [options]\n" +"\n" +"Options :\n" +" --help\t Afficher ces informations.\n" +" --list\t Lister toutes les applications installées dans ce préfix " +"Wine.\n" +" --remove {GUID} Désinstaller l'application spécifiée.\n" +"\t\t Utilisez « --list » pour déterminer le GUID de l'application.\n" +" [aucune option] Lancer la version graphique de ce programme.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0