diff --git a/controls/menu.c b/controls/menu.c index 43f41025bfb..f63e8d5b03c 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -4196,6 +4196,14 @@ BOOL WINAPI DrawMenuBar( HWND hWnd ) return FALSE; } +/*********************************************************************** + * DrawMenuBarTemp (USER32.@) + */ +DWORD WINAPI DrawMenuBarTemp(DWORD p1, DWORD p2) +{ + FIXME("(%08lx %08lx): stub\n", p1, p2); + return 0; +} /*********************************************************************** * EndMenu (USER.187) (USER32.@) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 81adeab78ee..dcca881b3c6 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -958,6 +958,10 @@ debug_channels (comm debugstr dll int resource stress thunk toolhelp win32) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) InitializeCriticalSectionAndSpinCount @ stdcall SetCriticalSectionSpinCount(ptr long) SetCriticalSectionSpinCount @ stdcall ProcessIdToSessionId(long ptr) ProcessIdToSessionId +@ stdcall GetCalendarInfoA(long long long ptr long ptr) GetCalendarInfoA +@ stdcall GetCalendarInfoW(long long long ptr long ptr) GetCalendarInfoW +@ stdcall SetCalendarInfoA(long long long str) SetCalendarInfoA +@ stdcall SetCalendarInfoW(long long long wstr) SetCalendarInfoW ################################################################ # Wine extensions: Win16 functions that are needed by other dlls diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c index 28df8bdc601..d2b3a2b8f55 100644 --- a/dlls/kernel/time.c +++ b/dlls/kernel/time.c @@ -12,6 +12,7 @@ #include "file.h" #include "ntddk.h" #include "winerror.h" +#include "winnls.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(win32); @@ -312,3 +313,50 @@ BOOL WINAPI GetProcessTimes( TIME_ClockTimeToFileTime(tms.tms_stime,lpKernelTime); return TRUE; } + +/********************************************************************* + * GetCalendarInfoA (KERNEL32) + * + */ +int WINAPI GetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, + LPSTR lpCalData, int cchData, LPDWORD lpValue) +{ + FIXME("(%08lx,%08lx,%08lx,%p,%d,%p): stub\n", + Locale, Calendar, CalType, lpCalData, cchData, lpValue); + return 0; +} + +/********************************************************************* + * GetCalendarInfoW (KERNEL32) + * + */ +int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, + LPWSTR lpCalData, int cchData, LPDWORD lpValue) +{ + FIXME("(%08lx,%08lx,%08lx,%p,%d,%p): stub\n", + Locale, Calendar, CalType, lpCalData, cchData, lpValue); + return 0; +} + +/********************************************************************* + * SetCalendarInfoA (KERNEL32) + * + */ +int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) +{ + FIXME("(%08lx,%08lx,%08lx,%s): stub\n", + Locale, Calendar, CalType, debugstr_a(lpCalData)); + return 0; +} + +/********************************************************************* + * SetCalendarInfoW (KERNEL32) + * + */ +int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWSTR lpCalData) +{ + FIXME("(%08lx,%08lx,%08lx,%s): stub\n", + Locale, Calendar, CalType, debugstr_w(lpCalData)); + return 0; +} + diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index 4ffd8ea1f6c..f96013ecde2 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -518,7 +518,7 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver @ stdcall SetScrollRange(long long long long long) SetScrollRange @ stdcall SetShellWindow(long) SetShellWindow @ stdcall SetSysColors(long ptr ptr) SetSysColors -@ stub SetSysColorsTemp +@ stdcall SetSysColorsTemp(long ptr ptr) SetSysColorsTemp @ stdcall SetSystemCursor(long long) SetSystemCursor @ stdcall SetSystemMenu(long long) SetSystemMenu @ stdcall SetSystemTimer(long long long ptr) SetSystemTimer @@ -652,6 +652,9 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver @ stdcall GetClipboardSequenceNumber () GetClipboardSequenceNumber @ stdcall AllowSetForegroundWindow (long) AllowSetForegroundWindow @ stdcall LockSetForegroundWindow (long) LockSetForegroundWindow +@ stdcall DrawMenuBarTemp(long long) DrawMenuBarTemp +@ stdcall EnumDisplaySettingsExA(str long ptr long) EnumDisplaySettingsExA +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) EnumDisplaySettingsExW ################################################################ # Wine extensions: Win16 functions that are needed by other dlls diff --git a/windows/syscolor.c b/windows/syscolor.c index 9d20af11505..9c16466a72b 100644 --- a/windows/syscolor.c +++ b/windows/syscolor.c @@ -276,6 +276,14 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, return TRUE; } +/************************************************************************* + * SetSysColors (USER32.@) + */ +BOOL WINAPI SetSysColorsTemp( int n, const int* p, const COLORREF* ptr) +{ + FIXME("(%d,%p,%p): stub!\n", n, p, ptr); + return 0; +} /*********************************************************************** * GetSysColorBrush (USER.281) @@ -312,3 +320,5 @@ HPEN WINAPI GetSysColorPen( INT index ) return SysColorPens[index]; } + + diff --git a/windows/user.c b/windows/user.c index db049b8c5ea..beeb644ed19 100644 --- a/windows/user.c +++ b/windows/user.c @@ -415,7 +415,9 @@ BOOL WINAPI EnumDisplaySettingsA( int depths[4] = {8,16,24,32}; TRACE_(system)("(%s,%ld,%p)\n",name,n,devmode); - if (n==0) { + devmode->dmDisplayFlags = 0; + devmode->dmDisplayFrequency = 85; + if (n==0 || n == (DWORD)-1 || n == (DWORD)-2) { devmode->dmBitsPerPel = GetSystemMetrics(SM_WINE_BPP); devmode->dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); devmode->dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); @@ -439,9 +441,11 @@ BOOL WINAPI EnumDisplaySettingsW(LPCWSTR name,DWORD n,LPDEVMODEW devmode) { BOOL ret = EnumDisplaySettingsA(nameA,n,&devmodeA); if (ret) { - devmode->dmBitsPerPel = devmodeA.dmBitsPerPel; - devmode->dmPelsHeight = devmodeA.dmPelsHeight; - devmode->dmPelsWidth = devmodeA.dmPelsWidth; + devmode->dmBitsPerPel = devmodeA.dmBitsPerPel; + devmode->dmPelsHeight = devmodeA.dmPelsHeight; + devmode->dmPelsWidth = devmodeA.dmPelsWidth; + devmode->dmDisplayFlags = devmodeA.dmDisplayFlags; + devmode->dmDisplayFrequency = devmodeA.dmDisplayFrequency; /* FIXME: convert rest too, if they are ever returned */ } HeapFree(GetProcessHeap(),0,nameA); @@ -460,6 +464,30 @@ BOOL16 WINAPI EnumDisplaySettings16( return (BOOL16)EnumDisplaySettingsA(name, n, devmode); } +/*********************************************************************** + * EnumDisplaySettingsExA (USER32.@) + */ +BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, + LPDEVMODEA lpDevMode, DWORD dwFlags) +{ + TRACE_(system)("(%s,%lu,%p,%08lx): stub\n", + debugstr_a(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + + return EnumDisplaySettingsA(lpszDeviceName, iModeNum, lpDevMode); +} + +/*********************************************************************** + * EnumDisplaySettingsExW (USER32.@) + */ +BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, + LPDEVMODEW lpDevMode, DWORD dwFlags) +{ + TRACE_(system)("(%s,%lu,%p,%08lx): stub\n", + debugstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + + return EnumDisplaySettingsW(lpszDeviceName, iModeNum, lpDevMode); +} + /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */