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

Alexandre Julliard : kernel32/tests: Fix a dll reference leak.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 24e9dcb1b420695c3197ddb99cef89c50177c5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e9dcb1b420695c3197ddb99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 11:30:48 2017 +0200 kernel32/tests: Fix a dll reference leak. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1c44257..91a6ff0 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1486,6 +1486,7 @@ static void test_import_resolution(void) ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); + FreeLibrary( mod2 ); FreeLibrary( mod ); break; case 2: /* load without IMAGE_FILE_DLL doesn't resolve imports */

1 0

Alexandre Julliard : kernel32: Implement safe search mode for SearchPath.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: a8d291c0c01ec9696e14417ade7c30d8f2056366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d291c0c01ec9696e14417ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 15:46:50 2017 +0200 kernel32: Implement safe search mode for SearchPath. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 2 +- dlls/kernel32/module.c | 7 ++-- dlls/kernel32/path.c | 77 +++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/process.c | 2 +- include/winbase.h | 7 ++++ 5 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 76611d7..7382956 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -89,7 +89,7 @@ struct binary_info }; /* module.c */ -extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) DECLSPEC_HIDDEN; +extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module, int safe_mode ) DECLSPEC_HIDDEN; extern void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) DECLSPEC_HIDDEN; extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 9bd11c77..02c94c5 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -921,7 +921,7 @@ static inline WCHAR *append_path( WCHAR *p, const WCHAR *str ) * Compute the load path to use for a given dll. * Returned pointer must be freed by caller. */ -WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) +WCHAR *MODULE_get_dll_load_path( LPCWSTR module, int safe_mode ) { static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR dotW[] = {'.',0}; @@ -929,7 +929,6 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; UNICODE_STRING name, value; - BOOL safe_mode; WCHAR *p, *ret; int len = 0, path_len = 0; @@ -958,7 +957,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) path_len = value.Length; RtlEnterCriticalSection( &dlldir_section ); - safe_mode = get_dll_safe_mode(); + if (safe_mode == -1) safe_mode = get_dll_safe_mode(); if (dll_directory) len += strlenW(dll_directory) + 1; else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) @@ -1137,7 +1136,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & load_library_search_flags) load_path = get_dll_load_path_search_flags( libname->Buffer, flags ); else - load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL, -1 ); if (!load_path) return 0; if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ec7c53b..a389743 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 +static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) @@ -753,6 +754,51 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR /*********************************************************************** + * get_path_safe_mode + */ +static BOOL get_path_safe_mode(void) +{ + static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR valueW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; + + if (path_safe_mode == -1) + { + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + DWORD size = sizeof(buffer); + BOOL mode = FALSE; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + RtlInitUnicodeString( &nameW, keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + RtlInitUnicodeString( &nameW, valueW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && + info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) + mode = !!*(DWORD *)info->Data; + NtClose( hkey ); + } + InterlockedCompareExchange( &path_safe_mode, mode, -1 ); + } + return path_safe_mode != 0; +} + + +/*********************************************************************** * contains_pathW * * Check if the file name contains a path; helper for SearchPathW. @@ -991,7 +1037,7 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, } else { - if ((dll_path = MODULE_get_dll_load_path( NULL ))) + if ((dll_path = MODULE_get_dll_load_path( NULL, get_path_safe_mode() ))) { ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), buffer, lastpart ) / sizeof(WCHAR); @@ -2075,9 +2121,32 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn /************************************************************************* * SetSearchPathMode (KERNEL32.@) */ -BOOL WINAPI SetSearchPathMode(DWORD flags) +BOOL WINAPI SetSearchPathMode( DWORD flags ) { - FIXME("(%x): stub\n", flags); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + int val; + + switch (flags) + { + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE: + val = 1; + break; + case BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE: + val = 0; + break; + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: + InterlockedExchange( &path_safe_mode, 2 ); + return TRUE; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + for (;;) + { + int prev = path_safe_mode; + if (prev == 2) break; /* permanently set */ + if (InterlockedCompareExchange( &path_safe_mode, val, prev ) == prev) return TRUE; + } + SetLastError( ERROR_ACCESS_DENIED ); return FALSE; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9097542..292317c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1258,7 +1258,7 @@ void CDECL __wine_kernel_init(void) debugstr_w(main_exe_name), debugstr_w(__wine_main_wargv[0]) ); RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, - MODULE_get_dll_load_path(main_exe_name) ); + MODULE_get_dll_load_path( main_exe_name, -1 )); if (boot_events[0]) { diff --git a/include/winbase.h b/include/winbase.h index f6a28c3..a4d545e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1005,6 +1005,12 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 +/* flags for SetSearchPathMode */ +#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE 0x00001 +#define BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE 0x10000 +#define BASE_SEARCH_PATH_PERMANENT 0x08000 +#define BASE_SEARCH_PATH_INVALID_FLAGS (~0x18001) + typedef PLDT_ENTRY LPLDT_ENTRY; typedef enum _GET_FILEEX_INFO_LEVELS { @@ -2551,6 +2557,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); WINADVAPI BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID,BOOL);

1 0

Alexandre Julliard : gdi32: Do not dither non-extended wide pens.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 66507e86c0ab2aa811cbe3527aa64993bac42248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66507e86c0ab2aa811cbe3527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 09:13:25 2017 +0200 gdi32: Do not dither non-extended wide pens. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 12 +++++++----- dlls/gdi32/tests/dib.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 736e526..f95475a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2073,7 +2073,7 @@ static BOOL brush_needs_dithering( dibdrv_physdev *pdev, COLORREF color ) } static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, - const LOGBRUSH *logbrush, const struct brush_pattern *pattern ) + const LOGBRUSH *logbrush, const struct brush_pattern *pattern, BOOL dither ) { free_pattern_brush( brush ); @@ -2094,7 +2094,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, case BS_NULL: brush->rects = null_brush; break; case BS_HATCHED: brush->rects = pattern_brush; break; case BS_SOLID: - brush->rects = brush_needs_dithering( pdev, brush->colorref ) ? pattern_brush : solid_brush; + brush->rects = dither && brush_needs_dithering( pdev, brush->colorref ) ? pattern_brush : solid_brush; break; } } @@ -2116,7 +2116,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter if (hbrush == GetStockObject( DC_BRUSH )) logbrush.lbColor = dc->dcBrushColor; - select_brush( pdev, &pdev->brush, &logbrush, pattern ); + select_brush( pdev, &pdev->brush, &logbrush, pattern, TRUE ); return hbrush; } @@ -2130,6 +2130,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte LOGPEN logpen; LOGBRUSH logbrush; EXTLOGPEN *elp = NULL; + BOOL dither = TRUE; TRACE("(%p, %p)\n", dev, hpen); @@ -2157,6 +2158,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte logbrush.lbStyle = BS_SOLID; logbrush.lbColor = logpen.lopnColor; logbrush.lbHatch = 0; + dither = FALSE; } pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; @@ -2167,7 +2169,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte logbrush.lbColor = dc->dcPenColor; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); - select_brush( pdev, &pdev->pen_brush, &logbrush, pattern ); + select_brush( pdev, &pdev->pen_brush, &logbrush, pattern, dither ); pdev->pen_style = logpen.lopnStyle & PS_STYLE_MASK; @@ -2234,7 +2236,7 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) if (dc->hBrush == GetStockObject( DC_BRUSH )) { LOGBRUSH logbrush = { BS_SOLID, color, 0 }; - select_brush( pdev, &pdev->brush, &logbrush, NULL ); + select_brush( pdev, &pdev->brush, &logbrush, NULL, TRUE ); } return color; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 51885d3..e3f1887 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2781,7 +2781,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom ); } - compare_hash_broken_todo( hdc, bmi, bits, "wide pen", 0, is_ddb ); + compare_hash( hdc, bmi, bits, "wide pen" ); SelectObject( hdc, orig_pen ); DeleteObject( wide_pen );

1 0

Nikolay Sivov : comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind).
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 9231452a9c064fa085733befd283025d2133f13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9231452a9c064fa085733befd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:50 2017 +0300 comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6a10860..e913e71 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1907,6 +1907,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { htinfo.iOffset = calIdx; + htinfo.st.wDay = ht_month->wDay; htinfo.st.wYear = ht_month->wYear; htinfo.st.wMonth = ht_month->wMonth; /* previous month only valid for first calendar */

1 0

Nikolay Sivov : comctl32/monthcal: Make sure set today date is valid before using it (Valgrind).
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: a56f49cdd5a3ec14d9c0c5e755f7e3edc4f0835b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56f49cdd5a3ec14d9c0c5e75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:51 2017 +0300 comctl32/monthcal: Make sure set today date is valid before using it (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e913e71..97e0c8c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -257,10 +257,12 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM /* make sure that date fields are valid */ static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { - if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; - if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; + if (time->wMonth < 1 || time->wMonth > 12 ) + return FALSE; + if (time->wDay == 0 || time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) + return FALSE; - return TRUE; + return TRUE; } /* Copies timestamp part only. @@ -1738,21 +1740,28 @@ MONTHCAL_GetToday(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *today) static BOOL MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) { - RECT new_r, old_r; + RECT rect; + + if (MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) + return FALSE; - if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return FALSE; + /* Invalidate old and new today day rectangle, and today label. */ + if (MONTHCAL_ValidateDate(&infoPtr->todaysDate)) + { + MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1); + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + } - MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &old_r, -1); - MONTHCAL_GetDayRect(infoPtr, today, &new_r, -1); + if (MONTHCAL_ValidateDate(today)) + { + MONTHCAL_GetDayRect(infoPtr, today, &rect, -1); + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + } - infoPtr->todaysDate = *today; + infoPtr->todaysDate = *today; - /* only two days need redrawing */ - InvalidateRect(infoPtr->hwndSelf, &old_r, FALSE); - InvalidateRect(infoPtr->hwndSelf, &new_r, FALSE); - /* and today label */ - InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); - return TRUE; + InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); + return TRUE; } /* MCM_SETTODAT handler */

1 0

Nikolay Sivov : comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind).
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: d505c2dce7ac01368ceed6b42f8ee6adb6fa5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d505c2dce7ac01368ceed6b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:52 2017 +0300 comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 97e0c8c..b94345c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -641,11 +641,16 @@ static inline void MONTHCAL_GetDayRectI(const MONTHCAL_INFO *infoPtr, RECT *r, * * NOTE: when calendar index is unknown pass -1 */ -static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, - RECT *r, INT calIdx) +static BOOL MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, RECT *r, INT calIdx) { INT col, row; + if (!MONTHCAL_ValidateDate(date)) + { + SetRectEmpty(r); + return FALSE; + } + if (calIdx == -1) { INT cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[0].month); @@ -668,6 +673,8 @@ static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTE MONTHCAL_GetDayPos(infoPtr, date, &col, &row, calIdx); MONTHCAL_GetDayRectI(infoPtr, r, col, row, calIdx); + + return TRUE; } static LRESULT @@ -739,20 +746,19 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return FALSE; /* invalidate old focused day */ - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); - InvalidateRect(infoPtr->hwndSelf, &r, FALSE); + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); infoPtr->focusedSel = *st; } - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); + /* On set invalidates new day, on reset clears previous focused day. */ + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); if(!st && MONTHCAL_ValidateDate(&infoPtr->focusedSel)) infoPtr->focusedSel = st_null; - /* on set invalidates new day, on reset clears previous focused day */ - InvalidateRect(infoPtr->hwndSelf, &r, FALSE); - return TRUE; } @@ -1746,17 +1752,11 @@ MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) return FALSE; /* Invalidate old and new today day rectangle, and today label. */ - if (MONTHCAL_ValidateDate(&infoPtr->todaysDate)) - { - MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1); + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1)) InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); - } - if (MONTHCAL_ValidateDate(today)) - { - MONTHCAL_GetDayRect(infoPtr, today, &rect, -1); + if (MONTHCAL_GetDayRect(infoPtr, today, &rect, -1)) InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); - } infoPtr->todaysDate = *today;

1 0

Fabian Maurer : user32/combo: Set listbox popup height correctly and add tests.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: f7f7b89e2e9117811c91269643868c6d063db5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f7b89e2e9117811c9126964… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 17 18:24:57 2017 +0200 user32/combo: Set listbox popup height correctly and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 8 ---- dlls/user32/tests/combo.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 8 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index a2e8b3c..f35e0d9 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1033,14 +1033,6 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - - if (nDroppedHeight < nHeight) - { - if (nItems < 5) - nDroppedHeight = (nItems+1)*nIHeight; - else if (nDroppedHeight < 6*nIHeight) - nDroppedHeight = 6*nIHeight; - } } r.left = rect.left; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index f52efae..03fc412 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -29,6 +29,8 @@ #define COMBO_ID 1995 +#define COMBO_YBORDERSIZE() 2 + static HWND hMainWnd; #define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } @@ -700,6 +702,110 @@ static void test_listbox_styles(DWORD cb_style) DestroyWindow(combo); } +static void test_listbox_size(DWORD style) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + UINT x, y; + BOOL ret; + int i, test; + const char wine_test[] = "Wine Test"; + + static const struct list_size_info + { + int num_items; + int height_combo; + BOOL todo; + } info_height[] = { + {2, 24}, + {2, 41, TRUE}, + {2, 42}, + {2, 50}, + {2, 60}, + {2, 80}, + {2, 89}, + {2, 90}, + {2, 100}, + + {10, 24}, + {10, 41, TRUE}, + {10, 42}, + {10, 50}, + {10, 60}, + {10, 80}, + {10, 89, TRUE}, + {10, 90}, + {10, 100}, + }; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_count_list; + int expected_height_list; + int list_height_nonclient; + int list_height_calculated; + RECT rect_list_client, rect_list_complete; + + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + ret = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(ret, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + GetClientRect(hList, &rect_list_client); + GetWindowRect(hList, &rect_list_complete); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo + - (cbInfo.rcItem.bottom + COMBO_YBORDERSIZE()) + - list_height_nonclient + - 1; + + expected_count_list = list_height_calculated / height_item; + if(expected_count_list < 0) + expected_count_list = 0; + expected_count_list = min(expected_count_list, info_test->num_items); + expected_height_list = expected_count_list * height_item; + + todo_wine_if(info_test->todo) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -719,6 +825,7 @@ START_TEST(combo) test_listbox_styles(CBS_SIMPLE); test_listbox_styles(CBS_DROPDOWN); test_listbox_styles(CBS_DROPDOWNLIST); + test_listbox_size(CBS_DROPDOWN); DestroyWindow(hMainWnd); }

1 0

Alexandre Julliard : kernel32: Implement safe dll search mode.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 66e302f80b2ecaac087756f1df3ae55f77f33838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e302f80b2ecaac087756f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 12:47:34 2017 +0200 kernel32: Implement safe dll search mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index badfe1d..97d815c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -728,13 +728,11 @@ static const WCHAR *get_dll_system_path(void) if (!cached_path) { WCHAR *p, *path; - int len = 3; + int len = 1; len += 2 * GetSystemDirectoryW( NULL, 0 ); len += GetWindowsDirectoryW( NULL, 0 ); p = path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - *p++ = '.'; - *p++ = ';'; GetSystemDirectoryW( p, path + len - p); p += strlenW(p); /* if system directory ends in "32" add 16-bit version too */ @@ -751,6 +749,52 @@ static const WCHAR *get_dll_system_path(void) return cached_path; } +/*********************************************************************** + * get_dll_safe_mode + */ +static BOOL get_dll_safe_mode(void) +{ + static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR valueW[] = {'S','a','f','e','D','l','l','S','e','a','r','c','h','M','o','d','e',0}; + + static int safe_mode = -1; + + if (safe_mode == -1) + { + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + DWORD size = sizeof(buffer); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + safe_mode = 1; + RtlInitUnicodeString( &nameW, keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + RtlInitUnicodeString( &nameW, valueW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && + info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) + safe_mode = !!*(DWORD *)info->Data; + NtClose( hkey ); + } + if (!safe_mode) TRACE( "SafeDllSearchMode disabled through the registry\n" ); + } + return safe_mode; +} + /****************************************************************** * get_module_path_end * @@ -783,6 +827,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; UNICODE_STRING name, value; + BOOL safe_mode; WCHAR *p, *ret; int len = 0, path_len = 0; @@ -811,7 +856,9 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) path_len = value.Length; RtlEnterCriticalSection( &dlldir_section ); + safe_mode = get_dll_safe_mode(); if (dll_directory) len += strlenW(dll_directory) + 1; + else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) { if (module) @@ -826,13 +873,23 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) p += strlenW(p); *p++ = ';'; } + else if (!safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } + strcpyW( p, system_path ); + p += strlenW(p); + *p++ = ';'; + if (!dll_directory && safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } } RtlLeaveCriticalSection( &dlldir_section ); if (!ret) return NULL; - strcpyW( p, system_path ); - p += strlenW(p); - *p++ = ';'; value.Buffer = p; value.MaximumLength = path_len;

1 0

Alexandre Julliard : kernel32: Implement SetDefaultDllDirectories.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: e99811aee2dff88c41d6e2875401810a85325839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99811aee2dff88c41d6e2875… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:29:09 2017 +0200 kernel32: Implement SetDefaultDllDirectories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 30 ++++++++++++++++---- dlls/kernel32/path.c | 10 ------- dlls/kernel32/tests/module.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 97d815c..8abf195 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); #define NE_FFLAGS_LIBMODULE 0x8000 static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ +static DWORD default_search_flags; /* default flags set by SetDefaultDllDirectories */ static CRITICAL_SECTION dlldir_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -58,6 +59,10 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION dlldir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); /**************************************************************************** * GetDllDirectoryA (KERNEL32.@) @@ -148,6 +153,21 @@ BOOL WINAPI SetDllDirectoryW( LPCWSTR dir ) } +/************************************************************************* + * SetDefaultDllDirectories (KERNEL32.@) + */ +BOOL WINAPI SetDefaultDllDirectories( DWORD flags ) +{ + if (!flags || (flags & ~load_library_search_flags)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + default_search_flags = flags; + return TRUE; +} + + /**************************************************************************** * DisableThreadLibraryCalls (KERNEL32.@) * @@ -964,16 +984,14 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; - static const DWORD unsupported_flags = + static const DWORD unsupported_flags = load_library_search_flags | LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | - LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_USER_DIRS | - LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_DEFAULT_DIRS; + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + + if (!(flags & load_library_search_flags)) flags |= default_search_flags; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c746693..ec7c53b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2081,13 +2081,3 @@ BOOL WINAPI SetSearchPathMode(DWORD flags) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } - -/************************************************************************* - * SetDefaultDllDirectories (KERNEL32.@) - */ -BOOL WINAPI SetDefaultDllDirectories(DWORD flags) -{ - FIXME("(%x): stub\n", flags); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bb22c24..6b178c8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -25,6 +25,7 @@ static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, @@ -515,6 +516,7 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(SetDefaultDllDirectories); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); MAKEFUNC(K32GetModuleInformation); @@ -739,6 +741,70 @@ static void testK32GetModuleInformation(void) ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); } +static void test_SetDefaultDllDirectories(void) +{ + HMODULE mod; + BOOL ret; + + if (!pSetDefaultDllDirectories) + { + win_skip( "SetDefaultDllDirectories not available\n" ); + return; + } + + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 0 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 3 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR | 0x8000 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + /* restore some sane defaults */ + pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -768,4 +834,5 @@ START_TEST(module) testLoadLibraryEx(); testGetModuleHandleEx(); testK32GetModuleInformation(); + test_SetDefaultDllDirectories(); }

1 0

Alexandre Julliard : kernel32: Add support for LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 8d82ab4ae7e3375e3e100f2bfaa0b6bf1466877d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d82ab4ae7e3375e3e100f2bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 14:19:47 2017 +0200 kernel32: Add support for LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 13 +++++++------ dlls/kernel32/tests/loader.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 8abf195..16356f1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -936,7 +936,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) /****************************************************************** * load_library_as_datafile */ -static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod) +static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) { static const WCHAR dotDLL[] = {'.','d','l','l',0}; @@ -944,14 +944,16 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod) HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE mapping; HMODULE module; + DWORD sharing = FILE_SHARE_READ; *hmod = 0; + if (!(flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) sharing |= FILE_SHARE_WRITE; + if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), filenameW, NULL )) { - hFile = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, 0 ); + hFile = CreateFileW( filenameW, GENERIC_READ, sharing, NULL, OPEN_EXISTING, 0, 0 ); } if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -987,7 +989,6 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) static const DWORD unsupported_flags = load_library_search_flags | LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | - LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; @@ -998,7 +999,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); - if (flags & LOAD_LIBRARY_AS_DATAFILE) + if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) { ULONG_PTR magic; @@ -1014,7 +1015,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) /* The method in load_library_as_datafile allows searching for the * 'native' libraries only */ - if (load_library_as_datafile( libname->Buffer, &hModule )) goto done; + if (load_library_as_datafile( libname->Buffer, &hModule, flags )) goto done; flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ /* Fallback to normal behaviour */ } diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 09c21d8..1c44257 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -523,6 +523,7 @@ static void test_Loader(void) }; int i; DWORD file_size; + HANDLE h; HMODULE hlib, hlib_as_data_file; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; @@ -706,9 +707,37 @@ static void test_Loader(void) ok(!hlib, "GetModuleHandle should fail\n"); SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( h != INVALID_HANDLE_VALUE, "open failed err %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib_as_data_file); ok(ret, "FreeLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE); + if (!((ULONG_PTR)hlib_as_data_file & 1) || /* winxp */ + (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ + { + win_skip( "LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n" ); + FreeLibrary(hlib_as_data_file); + } + else + { + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + todo_wine ok( h == INVALID_HANDLE_VALUE, "open succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib_as_data_file); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + query_image_section( i, dll_name, &nt_header ); } else

1 0