September 2019 - Wine-commits

Dmitry Timoshkov : localspl: Use the monitor handle returned by InitializePrintMonitor2.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: e620a3f35900f318e4e303631cef81b4c63d6b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e620a3f35900f318e4e30363… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:41 2019 +0800 localspl: Use the monitor handle returned by InitializePrintMonitor2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index def3215..4627284 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -67,6 +67,7 @@ typedef struct { PMONITORUI monitorUI; MONITOR2 monitor; BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); + HANDLE hmon; HMODULE hdll; DWORD refcount; } monitor_t; @@ -329,7 +330,7 @@ static void monitor_unload(monitor_t * pm) list_remove(&pm->entry); if (pm->monitor.pfnShutdown) - pm->monitor.pfnShutdown(0); + pm->monitor.pfnShutdown(pm->hmon); FreeLibrary(pm->hdll); heap_free(pm->name); @@ -489,7 +490,10 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", monitor2, debugstr_w(driver), debugstr_w(regroot)); if (monitor2) + { memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + pm->hmon = hmon; + } } else if (pInitializePrintMonitor && regroot) { MONITOREX *pmonitorEx; @@ -596,7 +600,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) /* query the userinterface-dllname from the Portmonitor */ /* building (",XcvMonitor %s",pm->name) not needed yet */ if (pm->monitor.pfnXcvOpenPort) - res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pm->monitor.pfnXcvOpenPort(pm->hmon, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); else if (pm->old_XcvOpenPort) res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); TRACE("got %u with %p\n", res, hXcv); @@ -1245,7 +1249,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) if (printer->pm) { if (printer->pm->monitor.pfnXcvOpenPort) - printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + printer->pm->monitor.pfnXcvOpenPort(printer->pm->hmon, &printername[len], pDefault ? pDefault->DesiredAccess : 0, &printer->hXcv); else if (printer->pm->old_XcvOpenPort)

1 0

Dmitry Timoshkov : localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 24a16c0037fd7c0f0d15c6980e4cc77ea642e89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a16c0037fd7c0f0d15c698… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:45 2019 +0800 localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/localmon.c | 2 +- dlls/localspl/provider.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 6937e05..e634a33 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -777,7 +777,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) { static MONITOREX mymonitorex = { - sizeof(MONITOREX) - sizeof(DWORD), + sizeof(MONITOR), { localmon_EnumPortsW, localmon_OpenPortW, diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4627284..7a12751 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -504,7 +504,9 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pmonitorEx) { /* Layout of MONITOREX and MONITOR2 mostly matches */ - memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor))); + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor))); + /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */ + pm->monitor.cbSize += sizeof(void *); pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; pm->monitor.pfnXcvOpenPort = NULL; }

1 0

Dmitry Timoshkov : localspl: Fix MONITOR2 callback prototypes.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 01d6835835e44cbc5a3d2be3ba8810ade943806d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d6835835e44cbc5a3d2be3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:48 2019 +0800 localspl: Fix MONITOR2 callback prototypes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- include/ddk/winsplp.h | 17 ++++---- 2 files changed, 105 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d6835835e44cbc5a3d…

1 0

Dmitry Timoshkov : winsplp.h: Fix MONITORINIT definition.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: a471c42b8fa73633edf6509790350b9c0e57a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a471c42b8fa73633edf65097… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:52 2019 +0800 winsplp.h: Fix MONITORINIT definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/winsplp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 3776ba6..162f673 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -155,6 +155,7 @@ typedef struct _MONITORINIT { HANDLE hckRegistryRoot; PMONITORREG pMonitorReg; BOOL bLocal; + LPCWSTR pszServerName; } MONITORINIT, *PMONITORINIT; typedef struct _MONITORUI {

1 0

Dmitry Timoshkov : localspl: Add MONITORREG stub callbacks for InitializePrintMonitor2.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 29ecb6f4bc48ed6520584785d0bb828bc503d922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29ecb6f4bc48ed6520584785… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:55 2019 +0800 localspl: Add MONITORREG stub callbacks for InitializePrintMonitor2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 866a074..326313d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -369,6 +369,92 @@ static void monitor_unloadall(void) LeaveCriticalSection(&monitor_handles_cs); } +static LONG WINAPI CreateKey(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, + REGSAM samDesired, PSECURITY_ATTRIBUTES pSecurityAttributes, + PHANDLE phckResult, PDWORD pdwDisposition, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI OpenKey(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, + PHANDLE phkResult, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI CloseKey(HANDLE hcKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteKey(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumKey(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, + PDWORD pcchName, PFILETIME pftLastWriteTime, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryInfoKey(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, + PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, + PDWORD pcbSecurityDescriptor, PFILETIME pftLastWriteTime, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI SetValue(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, + const BYTE* pData, DWORD cbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteValue(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumValue(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, + PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryValue(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, + PBYTE pData, PDWORD pcbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static MONITORREG monreg = +{ + sizeof(MONITORREG), + CreateKey, + OpenKey, + CloseKey, + DeleteKey, + EnumKey, + QueryInfoKey, + SetValue, + DeleteValue, + EnumValue, + QueryValue +}; + /****************************************************************** * monitor_load [internal] * @@ -491,6 +577,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) memset(&init, 0, sizeof(init)); init.cbSize = sizeof(init); init.hckRegistryRoot = hroot; + init.pMonitorReg = &monreg; init.bLocal = TRUE; monitor2 = pInitializePrintMonitor2(&init, &hmon);

1 0

Dmitry Timoshkov : localspl/tests: Add support for monitors providing the MONITOR2 interface.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: ce9835df01adc6996c99c20422cf056416e6ad6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9835df01adc6996c99c204… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:58:05 2019 +0800 localspl/tests: Add support for monitors providing the MONITOR2 interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/tests/localmon.c | 190 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 168 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce9835df01adc6996c99…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 01b19b63a454aa455928c10c694895fdba901aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b19b63a454aa455928c10c… Author: Kim Malmo <berencamlost(a)msn.com> Date: Sun Sep 8 10:00:48 2019 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 72 ++++++------------------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0b6284a..2e345fc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer " +"Wine fant ikke wine-mono pakken, som er nødvendig for at .NET programmer " "skal fungere ordentlig. Wine kan laste ned og installere denne pakken for " "deg.\n" "\n" @@ -7333,10 +7333,8 @@ msgid "Stream descriptor is not selected.\n" msgstr "Enheten er ikke koblet til.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Indeksen mangler.\n" +msgstr "Kilde mangler.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -11161,10 +11159,6 @@ msgid "" msgstr "Tidsformatet til \"song pointer\" og SMPTE kan ikke brukes sammen." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11185,10 +11179,6 @@ msgid "An error occurred with the specified port." msgstr "En feil oppstod med den oppgitte porten." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15339,7 +15329,7 @@ msgstr "Vanlig metafil-framviser" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafiler (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15510,16 +15500,12 @@ msgid "Drive configuration" msgstr "Oppsett av stasjoner" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Klarte ikke koble til monteringsbehandleren; diskstasjonene kan derfor ikke " -"redigeres." +"Klarte ikke koble til monteringsbehandleren; stasjonsoppsettet kan derfor " +"ikke redigeres." #: winecfg.rc:236 msgid "A&dd..." @@ -15804,12 +15790,6 @@ msgid "System drive" msgstr "Systemstasjon" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16888,10 +16868,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdokument (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstdokument (*.txt)" +msgstr "Unicode-tekstdokumenter (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17093,42 +17071,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17192,7 +17134,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" -"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" +"[/K] Kopier filegenskaper; uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Alexandre Julliard : kernel32: Move OS version functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 471c2f565c1c9dae7c2a9a50ec7edb6267a8c80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=471c2f565c1c9dae7c2a9a50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:28:18 2019 +0200 kernel32: Move OS version functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 ++-- dlls/kernel32/version.c | 77 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 6 ++-- dlls/kernelbase/version.c | 66 +++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 83 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9d24a7..8bbb08d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -875,9 +875,9 @@ @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) @ stub GetVDMCurrentDirectories -@ stdcall GetVersion() -@ stdcall GetVersionExA(ptr) -@ stdcall GetVersionExW(ptr) +@ stdcall -import GetVersion() +@ stdcall -import GetVersionExA(ptr) +@ stdcall -import GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 3cca2ae..e68da5b 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -42,83 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); -/*********************************************************************** - * GetVersion (KERNEL32.@) - * - * Win31 0x80000a03 - * Win95 0xc0000004 - * Win98 0xc0000a04 - * WinME 0xc0005a04 - * NT351 0x04213303 - * NT4 0x05650004 - * Win2000 0x08930005 - * WinXP 0x0a280105 - */ -DWORD WINAPI GetVersion(void) -{ - DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, - NtCurrentTeb()->Peb->OSMinorVersion ), - (NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 ); - if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) - result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16; - return result; -} - - -/*********************************************************************** - * GetVersionExA (KERNEL32.@) - */ -BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) -{ - RTL_OSVERSIONINFOEXW infoW; - - if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && - v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) - { - WARN("wrong OSVERSIONINFO size from app (got: %d)\n", - v->dwOSVersionInfoSize ); - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - infoW.dwOSVersionInfoSize = sizeof(infoW); - if (RtlGetVersion( &infoW ) != STATUS_SUCCESS) return FALSE; - - v->dwMajorVersion = infoW.dwMajorVersion; - v->dwMinorVersion = infoW.dwMinorVersion; - v->dwBuildNumber = infoW.dwBuildNumber; - v->dwPlatformId = infoW.dwPlatformId; - WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, - v->szCSDVersion, sizeof(v->szCSDVersion), NULL, NULL ); - - if(v->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) - { - LPOSVERSIONINFOEXA vex = (LPOSVERSIONINFOEXA) v; - vex->wServicePackMajor = infoW.wServicePackMajor; - vex->wServicePackMinor = infoW.wServicePackMinor; - vex->wSuiteMask = infoW.wSuiteMask; - vex->wProductType = infoW.wProductType; - } - return TRUE; -} - - -/*********************************************************************** - * GetVersionExW (KERNEL32.@) - */ -BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) -{ - if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && - info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) - { - WARN("wrong OSVERSIONINFO size from app (got: %d)\n", - info->dwOSVersionInfoSize); - return FALSE; - } - return (RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info ) == STATUS_SUCCESS); -} - - /****************************************************************************** * VerifyVersionInfoA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 6a137dc..dc108f1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -750,9 +750,9 @@ # @ stub GetUserOverrideString # @ stub GetUserOverrideWord @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages -@ stdcall GetVersion() kernel32.GetVersion -@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA -@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetVersion() +@ stdcall GetVersionExA(ptr) +@ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 1608bdb..df96dab 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1337,3 +1337,69 @@ DWORD WINAPI VerFindFileW( DWORD flags, LPCWSTR filename, LPCWSTR win_dir, LPCWS debugstr_w(cur_dir), debugstr_w(dest)); return retval; } + + +/*********************************************************************** + * GetVersion (kernelbase.@) + */ +DWORD WINAPI GetVersion(void) +{ + DWORD result = MAKELONG( MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, + NtCurrentTeb()->Peb->OSMinorVersion ), + (NtCurrentTeb()->Peb->OSPlatformId ^ 2) << 14 ); + if (NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) + result |= LOWORD(NtCurrentTeb()->Peb->OSBuildNumber) << 16; + return result; +} + + +/*********************************************************************** + * GetVersionExA (kernelbase.@) + */ +BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) +{ + RTL_OSVERSIONINFOEXW infoW; + + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && + info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) + { + WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + infoW.dwOSVersionInfoSize = sizeof(infoW); + if (!set_ntstatus( RtlGetVersion( &infoW ))) return FALSE; + + info->dwMajorVersion = infoW.dwMajorVersion; + info->dwMinorVersion = infoW.dwMinorVersion; + info->dwBuildNumber = infoW.dwBuildNumber; + info->dwPlatformId = infoW.dwPlatformId; + WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, + info->szCSDVersion, sizeof(info->szCSDVersion), NULL, NULL ); + + if (info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + { + OSVERSIONINFOEXA *vex = (OSVERSIONINFOEXA *)info; + vex->wServicePackMajor = infoW.wServicePackMajor; + vex->wServicePackMinor = infoW.wServicePackMinor; + vex->wSuiteMask = infoW.wSuiteMask; + vex->wProductType = infoW.wProductType; + } + return TRUE; +} + + +/*********************************************************************** + * GetVersionExW (kernelbase.@) + */ +BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) +{ + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && + info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) + { + WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); + return FALSE; + } + return set_ntstatus( RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info )); +}

1 0

Alexandre Julliard : kernel32: Move debugger functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 3b002685fe18ca3985af744d8f147f29b2c588f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b002685fe18ca3985af744d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:51:50 2019 +0200 kernel32: Move debugger functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 417 ---------------------------------------- dlls/kernel32/kernel32.spec | 16 +- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/debug.c | 358 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 18 +- 5 files changed, 376 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b002685fe18ca3985af…

1 0

Alexandre Julliard : kernel32: Move unhandled exception functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: ddf82f7c0dd421508efa896252c966ab8f61f0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf82f7c0dd421508efa8962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 22:30:38 2019 +0200 kernel32: Move unhandled exception functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/except.c | 511 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/process.c | 10 + dlls/kernelbase/debug.c | 429 ++++++++++++++++++++++++++++++++- dlls/kernelbase/kernelbase.spec | 16 +- 6 files changed, 451 insertions(+), 526 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddf82f7c0dd421508efa…

1 0