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

Nikolay Sivov : t2embed: Add some traces for fsType and exclusion list test results.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 9df16935c81fc76207ddb60a36f4ccbad2915c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df16935c81fc76207ddb60a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:20 2016 +0300 t2embed: Add some traces for fsType and exclusion list test results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index de78b25..766926f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -75,6 +75,7 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { OUTLINETEXTMETRICW otm; + WORD fsType; TRACE("(%p %p)\n", hDC, status); @@ -88,7 +89,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; - otm.otmfsType &= 0xf; + otm.otmfsType = (fsType = otm.otmfsType) & 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; else if (otm.otmfsType & LICENSE_EDITABLE) @@ -103,6 +104,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) *status = EMBED_INSTALLABLE; } + TRACE("fsType 0x%04x, status %u\n", fsType, *status); return E_NONE; } @@ -124,7 +126,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) *enabled = TRUE; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) - return E_NONE; + goto out; *enabled = TRUE; ret = ERROR_SUCCESS; @@ -148,6 +150,8 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) } RegCloseKey(hkey); +out: + TRACE("embedding %s for %s\n", *enabled ? "enabled" : "disabled", debugstr_a(facename)); return E_NONE; }

1 0

Nikolay Sivov : shlwapi/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: e078c97d53eba1918902eb9cdc776b5b726f6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078c97d53eba1918902eb9cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 03:31:20 2016 +0300 shlwapi/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 74cad7d..ad3048b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -3224,8 +3224,8 @@ static void test_IUnknown_GetClassID(void) CLSID clsid, clsid2, clsid3; HRESULT hr; -if (0) /* crashes on native systems */ - hr = pIUnknown_GetClassID(NULL, NULL); + if (0) /* crashes on native systems */ + hr = pIUnknown_GetClassID(NULL, NULL); memset(&clsid, 0xcc, sizeof(clsid)); memset(&clsid3, 0xcc, sizeof(clsid3));

1 0

Nikolay Sivov : shell32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 79e95afbc3ccc22049af08ddcdd660502441c14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e95afbc3ccc22049af08ddc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 03:31:21 2016 +0300 shell32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index e8cf744..04c9632 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -871,8 +871,8 @@ static void test_SHCreateSessionKey(void) return; } -if (0) /* crashes on native */ - hr = pSHCreateSessionKey(KEY_READ, NULL); + if (0) /* crashes on native */ + hr = pSHCreateSessionKey(KEY_READ, NULL); hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey);

1 0

Alexandre Julliard : reg/tests: Avoid non-portable Unicode chars.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: ce7c4b58b20fed6bcadd37363402fd0523071a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7c4b58b20fed6bcadd37363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 12 12:45:16 2016 +0900 reg/tests: Avoid non-portable Unicode chars. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bd5695f..fb5edbc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -872,36 +872,36 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFFWindows Registry Editor Version 5\n", &r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFFWINDOWS Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbfWINDOWS Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr(" \uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr(" \xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\t\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\t\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\n\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\n\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFF Windows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFF\tWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFF\nWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); }

1 0

Nikolay Sivov : gdi32: Keep font tables tags defined in one place.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: cd688217808ca347b68f6929b47b7cee03b5782c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd688217808ca347b68f6929b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:49 2016 +0300 gdi32: Keep font tables tags defined in one place. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5ddfc6a..7b0ff94 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -214,6 +214,21 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif +#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ + ( ( (FT_ULong)_x4 << 24 ) | \ + ( (FT_ULong)_x3 << 16 ) | \ + ( (FT_ULong)_x2 << 8 ) | \ + (FT_ULong)_x1 ) + +#define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') +#define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') + +/* 'gasp' flags */ +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + #ifndef WINE_FONT_DIR #define WINE_FONT_DIR "fonts" #endif @@ -637,7 +652,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' /* These are all structures needed for the GSUB table */ -#define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') typedef struct { DWORD version; @@ -4679,13 +4693,7 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf * load the vdmx entry for the specified height */ -#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ - ( ( (FT_ULong)_x4 << 24 ) | \ - ( (FT_ULong)_x3 << 16 ) | \ - ( (FT_ULong)_x2 << 8 ) | \ - (FT_ULong)_x1 ) -#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { WORD version; @@ -5103,10 +5111,6 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 -#define GASP_TAG MS_MAKE_TAG('g','a','s','p') - static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) { DWORD size; @@ -5116,7 +5120,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) BOOL ret = FALSE; *flags = 0; - size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; if (size > sizeof(buf)) @@ -5125,7 +5129,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) if (!ptr) return FALSE; } - get_font_data( font, GASP_TAG, 0, ptr, size ); + get_font_data( font, MS_GASP_TAG, 0, ptr, size ); version = GET_BE_WORD( *ptr++ ); num_recs = GET_BE_WORD( *ptr++ ); @@ -5710,11 +5714,11 @@ found_face: if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { - int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, MS_GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, MS_GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); ret->vert_feature = get_GSUB_vert_feature(ret); if (!ret->vert_feature) @@ -8476,7 +8480,6 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei /************************************************************************* * Kerning support for TrueType fonts */ -#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') struct TT_kern_table {

1 0

Nikolay Sivov : gdi32: Support special 'ttcf' tag in GetFontData().
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 7e50116b52f37a3a191cb207c1543ffdd3941c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50116b52f37a3a191cb207c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:50 2016 +0300 gdi32: Support special 'ttcf' tag in GetFontData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7b0ff94..2e3b29a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -210,8 +210,10 @@ MAKE_FUNCPTR(FcPatternGetString); #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ @@ -223,6 +225,7 @@ MAKE_FUNCPTR(FcPatternGetString); #define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') #define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') #define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') /* 'gasp' flags */ @@ -424,6 +427,7 @@ struct tagGdiFont { GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; + ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ DWORD cache_num; DWORD instance_id; struct font_fileinfo *fileinfo; @@ -4549,6 +4553,9 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) font->ft_face = ft_face; if(FT_IS_SCALABLE(ft_face)) { + FT_ULong len; + DWORD header; + /* load the VDMX table if we have one */ font->ppem = load_VDMX(font, height); if(font->ppem == 0) @@ -4557,6 +4564,20 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); + + /* see if it's a TTC */ + len = sizeof(header); + if (!pFT_Load_Sfnt_Table(ft_face, 0, 0, (void*)&header, &len)) { + if (header == MS_TTCF_TAG) + { + len = sizeof(font->ttc_item_offset); + if (pFT_Load_Sfnt_Table(ft_face, 0, (3 + face->face_index) * sizeof(DWORD), + (void*)&font->ttc_item_offset, &len)) + font->ttc_item_offset = 0; + else + font->ttc_item_offset = GET_BE_DWORD(font->ttc_item_offset); + } + } } else { font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) @@ -4666,6 +4687,16 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf else len = cbData; + /* if font is a member of TTC, 'ttcf' tag allows reading from beginning of TTC file, + 0 tag means to read from start of collection member data. */ + if (font->ttc_item_offset) + { + if (table == MS_TTCF_TAG) + table = 0; + else if (table == 0) + offset += font->ttc_item_offset; + } + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ /* make sure value of len is the value freetype says it needs */

1 0

Pierre Schweitzer : mpr: Implement WNetCancelConnection2W().
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 0b34924bd8cb82ba2a96e7704c1c685a07c43e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b34924bd8cb82ba2a96e7704… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:21:22 2016 +0200 mpr: Implement WNetCancelConnection2W(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index c44fec2..6e865f0 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -58,6 +58,7 @@ typedef struct _WNetProvider PF_NPGetResourceInformation getResourceInformation; PF_NPAddConnection addConnection; PF_NPAddConnection3 addConnection3; + PF_NPCancelConnection cancelConnection; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -206,8 +207,10 @@ static void _tryLoadProvider(PCWSTR provider) } provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + provider->cancelConnection = MPR_GETPROC(NPCancelConnection); TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); + TRACE("NPCancelConnection %p\n", provider->cancelConnection); providerTable->numProviders++; } else @@ -1865,9 +1868,26 @@ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) */ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); + DWORD ret = WN_NO_NETWORK; + DWORD index; - return WN_SUCCESS; + if (providerTable != NULL) + { + for (index = 0; index < providerTable->numProviders; index++) + { + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & + WNNC_CON_CANCELCONNECTION) + { + if (providerTable->table[index].cancelConnection) + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); + else + ret = WN_NO_NETWORK; + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) + break; + } + } + } + return ret; } /*****************************************************************

1 0

Pierre Schweitzer : mpr: Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A().
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: d2e68234b2d2097c2306b642329ae541f6e76d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e68234b2d2097c2306b6423… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:22:07 2016 +0200 mpr: Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 6e865f0..5a67e5f 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1838,9 +1838,7 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource, */ DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_a(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2A(lpName, 0, fForce); } /********************************************************************* @@ -1848,9 +1846,7 @@ DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce ) */ DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_w(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2W(lpName, 0, fForce); } /********************************************************************* @@ -1858,9 +1854,15 @@ DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) */ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_a(lpName), dwFlags, fForce ); + DWORD ret; + WCHAR * name = strdupAtoW(lpName); + if (!name) + return ERROR_NOT_CONNECTED; - return WN_SUCCESS; + ret = WNetCancelConnection2W(name, dwFlags, fForce); + HeapFree(GetProcessHeap(), 0, name); + + return ret; } /*********************************************************************

1 0

Pierre Schweitzer : mpr: Set the CONNECT_LOCALDRIVE flag in case a local redirection is made on connection.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: d6d0d96402b9c187877f11da173f8fbbf62ba072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d0d96402b9c187877f11da1… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:24:22 2016 +0200 mpr: Set the CONNECT_LOCALDRIVE flag in case a local redirection is made on connection. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 5a67e5f..85dfca1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1615,7 +1615,11 @@ static void use_connection_set_accessnameW(struct use_connection_context *ctxt, { WCHAR *accessname = ctxt->accessname; if (local_name) + { strcpyW(accessname, local_name); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1759,7 +1763,11 @@ static void use_connection_set_accessnameA(struct use_connection_context *ctxt, { char *accessname = ctxt->accessname; if (local_name) + { WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

1 0

Aaryaman Vasishta : d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 3987417688a5e5e9c2d38b79683e55bfeb726679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987417688a5e5e9c2d38b796… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Aug 10 21:25:02 2016 +0530 d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index a8d646b..57fd7c0 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -213,7 +213,7 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID { IDirectDraw *ddraw; IDirectDrawSurface *surface; - IDirect3DDevice2 *d3d_device2; + IDirect3DDevice2 *d3d_device2 = NULL; DDSURFACEDESC desc; HRESULT hr; @@ -223,9 +223,6 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID IDirect3DRM_AddRef(device->d3drm); IDirect3DDevice_AddRef(d3d_device); - if (device->ddraw) - return D3DRMERR_BADOBJECT; - /* Fetch render target and get width/height from there */ if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) { @@ -237,16 +234,26 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID return hr; } + if (device->ddraw) + { + if (d3d_device2) + IDirectDrawSurface_Release(surface); + return D3DRMERR_BADOBJECT; + } + desc.dwSize = sizeof(desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - IDirectDrawSurface_Release(surface); if (FAILED(hr)) + { + IDirectDrawSurface_Release(surface); return hr; + } device->ddraw = ddraw; device->width = desc.dwWidth; device->height = desc.dwHeight; device->device = d3d_device; + device->render_target = surface; return hr; }

1 0