March 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : winaspi: Build with msvcrt.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: dac79926083bd84c9bcf060ad5462c6d1eca3097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac79926083bd84c9bcf060a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:52:49 2020 +0100 winaspi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winaspi.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winaspi.dll16/Makefile.in b/dlls/winaspi.dll16/Makefile.in index e248c2abd7..54a93a49bb 100644 --- a/dlls/winaspi.dll16/Makefile.in +++ b/dlls/winaspi.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = winaspi.dll16 IMPORTS = wnaspi32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,wnaspi32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wnaspi32.dll C_SRCS = winaspi.c

1 0

Alexandre Julliard : winaspi: Get rid of header files.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 0abd9e210217cfffaf9ed5528953a4c9e63d6ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abd9e210217cfffaf9ed552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:52:19 2020 +0100 winaspi: Get rid of header files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winaspi.dll16/aspi.h | 84 -------------------------- dlls/winaspi.dll16/winaspi.c | 97 +++++++++++++++++++++++++++++- include/wine/winaspi.h | 139 ------------------------------------------- 3 files changed, 95 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0abd9e210217cfffaf9e…

1 0

Alexandre Julliard : kernelbase: Use wide character string literals in registry.c.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: b8fe91248dc01c0569277f150444f1e69091904d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8fe91248dc01c0569277f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:57:03 2020 +0100 kernelbase: Use wide character string literals in registry.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 84 +++++++++++----------------------------------- 1 file changed, 19 insertions(+), 65 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 137c0efb88..4f2234b1ef 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -50,40 +50,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA -static const WCHAR name_CLASSES_ROOT[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s',0}; -static const WCHAR name_LOCAL_MACHINE[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e',0}; -static const WCHAR name_USERS[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'U','s','e','r',0}; -static const WCHAR name_PERFORMANCE_DATA[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'P','e','r','f','D','a','t','a',0}; -static const WCHAR name_CURRENT_CONFIG[] = - {'\\','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','\\', - 'H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\', - 'C','u','r','r','e','n','t',0}; -static const WCHAR name_DYN_DATA[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'D','y','n','D','a','t','a',0}; - static const WCHAR * const root_key_names[] = { - name_CLASSES_ROOT, + L"\\Registry\\Machine\\Software\\Classes", NULL, /* HKEY_CURRENT_USER is determined dynamically */ - name_LOCAL_MACHINE, - name_USERS, - name_PERFORMANCE_DATA, - name_CURRENT_CONFIG, - name_DYN_DATA + L"\\Registry\\Machine", + L"\\Registry\\User", + L"\\Registry\\PerfData", + L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current", + L"\\Registry\\DynData" }; static HKEY special_root_keys[ARRAY_SIZE(root_key_names)]; @@ -125,16 +100,12 @@ static inline BOOL is_version_nt(void) static BOOL is_wow6432node( const UNICODE_STRING *name ) { - static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; - - return (name->Length == sizeof(wow6432nodeW) && - !wcsnicmp( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); + return (name->Length == 11 * sizeof(WCHAR) && !wcsnicmp( name->Buffer, L"Wow6432Node", 11 )); } /* open the Wow6432Node subkey of the specified key */ static HANDLE open_wow6432node( HANDLE key ) { - static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE ret; @@ -145,7 +116,7 @@ static HANDLE open_wow6432node( HANDLE key ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, wow6432nodeW ); + RtlInitUnicodeString( &nameW, L"Wow6432Node" ); if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) ret = 0; return ret; } @@ -162,15 +133,12 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - static const WCHAR registry_root[] = {'\\','R','e','g','i','s','t','r','y','\\'}; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; /* don't try to create registry root */ - if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && - !wcsnicmp( buffer, registry_root, ARRAY_SIZE( registry_root ))) - i += ARRAY_SIZE( registry_root ); + if (!attr->RootDirectory && len > 10 && !wcsnicmp( buffer, L"\\Registry\\", 10 )) i += 10; while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status; @@ -1221,11 +1189,6 @@ static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name) static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider) { - static const WCHAR object_listW[] = { 'O','b','j','e','c','t',' ','L','i','s','t',0 }; - static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; - static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; - static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; - static const WCHAR exportW[] = { 'E','x','p','o','r','t',0 }; WCHAR buf[MAX_PATH], buf2[MAX_PATH]; DWORD err, type, len; HKEY service, perf; @@ -1235,11 +1198,11 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr return FALSE; provider->linkage[0] = 0; - err = RegOpenKeyExW(service, linkageW, 0, KEY_READ, &perf); + err = RegOpenKeyExW(service, L"Linkage", 0, KEY_READ, &perf); if (err == ERROR_SUCCESS) { len = sizeof(buf) - sizeof(WCHAR); - err = RegQueryValueExW(perf, exportW, NULL, &type, (BYTE *)buf, &len); + err = RegQueryValueExW(perf, L"Export", NULL, &type, (BYTE *)buf, &len); if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) { memcpy(provider->linkage, buf, len); @@ -1249,14 +1212,14 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr RegCloseKey(perf); } - err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); + err = RegOpenKeyExW(service, L"Performance", 0, KEY_READ, &perf); RegCloseKey(service); if (err != ERROR_SUCCESS) return FALSE; provider->objects[0] = 0; len = sizeof(buf) - sizeof(WCHAR); - err = RegQueryValueExW(perf, object_listW, NULL, &type, (BYTE *)buf, &len); + err = RegQueryValueExW(perf, L"Object List", NULL, &type, (BYTE *)buf, &len); if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) { memcpy(provider->objects, buf, len); @@ -1265,7 +1228,7 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr } len = sizeof(buf) - sizeof(WCHAR); - err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len); + err = RegQueryValueExW(perf, L"Library", NULL, &type, (BYTE *)buf, &len); if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ)) goto error; @@ -1305,12 +1268,11 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { - static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; if (!query || !query[0]) - query = globalW; + query = L"Global"; err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) @@ -1335,9 +1297,6 @@ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, vo static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD *ret_size) { - static const WCHAR SZ_SERVICES_KEY[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s',0 }; DWORD err, i, data_size; HKEY root; PERF_DATA_BLOCK *pdb; @@ -1396,7 +1355,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD data_size -= pdb->HeaderLength; data = (char *)data + pdb->HeaderLength; - err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, KEY_READ, &root); + err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services", 0, KEY_READ, &root); if (err != ERROR_SUCCESS) return err; @@ -2859,7 +2818,6 @@ LSTATUS WINAPI RegLoadMUIStringA(HKEY hKey, LPCSTR pszValue, LPSTR pszBuffer, DW */ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) { - static const WCHAR emptyW[] = {0}; DWORD name_size, max_name, max_subkey; WCHAR *name_buf = NULL; LONG ret; @@ -2898,7 +2856,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) /* Delete the key itself */ if (subkey && *subkey) { - ret = RegDeleteKeyExW( hkey, emptyW, 0, 0 ); + ret = RegDeleteKeyExW( hkey, L"", 0, 0 ); goto cleanup; } @@ -3916,10 +3874,6 @@ BOOL WINAPI SHRegGetBoolUSValueA(const char *subkey, const char *value, BOOL ign BOOL WINAPI SHRegGetBoolUSValueW(const WCHAR *subkey, const WCHAR *value, BOOL ignore_hkcu, BOOL default_value) { - static const WCHAR yesW[]= {'Y','E','S',0}; - static const WCHAR trueW[] = {'T','R','U','E',0}; - static const WCHAR noW[] = {'N','O',0}; - static const WCHAR falseW[] = {'F','A','L','S','E',0}; BOOL ret = default_value; DWORD type, datalen; WCHAR data[10]; @@ -3933,9 +3887,9 @@ BOOL WINAPI SHRegGetBoolUSValueW(const WCHAR *subkey, const WCHAR *value, BOOL i { case REG_SZ: data[9] = '\0'; - if (!lstrcmpiW(data, yesW) || !lstrcmpiW(data, trueW)) + if (!lstrcmpiW(data, L"yes") || !lstrcmpiW(data, L"true")) ret = TRUE; - else if (!lstrcmpiW(data, noW) || !lstrcmpiW(data, falseW)) + else if (!lstrcmpiW(data, L"no") || !lstrcmpiW(data, L"false")) ret = FALSE; break; case REG_DWORD:

1 0

Alexandre Julliard : kernelbase: Use wide character string literals in the remaining files.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 762f51cf93b6efca0defb2929f3278abb034dae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=762f51cf93b6efca0defb292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:59:27 2020 +0100 kernelbase: Use wide character string literals in the remaining files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 4 +--- dlls/kernelbase/main.c | 11 +++-------- dlls/kernelbase/memory.c | 10 ++-------- dlls/kernelbase/sync.c | 27 ++++++++++++--------------- dlls/kernelbase/version.c | 13 ++++--------- 5 files changed, 22 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=762f51cf93b6efca0def…

1 0

Alexandre Julliard : gdi.exe: Use 32-bit printer functions for print jobs.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 41ec44bf3f413315c921dfccd9ed437cafd0fc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41ec44bf3f413315c921dfcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:02:53 2020 +0100 gdi.exe: Use 32-bit printer functions for print jobs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 196 +++++----------------------------------------- 1 file changed, 18 insertions(+), 178 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index 3e49af203a..b0e1e31600 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -21,23 +21,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <signal.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> -#include <errno.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <fcntl.h> + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -199,13 +188,10 @@ INT16 WINAPI SizePQ16(HPQ16 hPQ, INT16 sizechange) */ typedef struct PRINTJOB { - char *pszOutput; - char *pszTitle; HDC16 hDC; HANDLE16 hHandle; int nIndex; - int fd; - pid_t pid; + int id; } PRINTJOB, *PPRINTJOB; #define MAX_PRINT_JOBS 1 @@ -219,127 +205,6 @@ static PPRINTJOB FindPrintJobFromHandle(HANDLE16 hHandle) return gPrintJobsTable[0]; } -static int CreateSpoolFile(LPCSTR pszOutput, pid_t *out_pid) -{ - int fd=-1; - char psCmd[1024]; - const char *psCmdP = psCmd; - HKEY hkey; - - /* TTD convert the 'output device' into a spool file name */ - - if (pszOutput == NULL || *pszOutput == '\0' || out_pid == NULL) - return -1; - - *out_pid = -1; - - psCmd[0] = 0; - /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ - if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\Spooler", &hkey)) - { - DWORD type, count = sizeof(psCmd); - RegQueryValueExA(hkey, pszOutput, 0, &type, (LPBYTE)psCmd, &count); - RegCloseKey(hkey); - } - if (!psCmd[0] && !strncmp("LPR:",pszOutput,4)) - sprintf(psCmd,"|lpr -P'%s'",pszOutput+4); - - TRACE("Got printerSpoolCommand '%s' for output device '%s'\n", - psCmd, pszOutput); - if (!*psCmd) - psCmdP = pszOutput; - else - { - while (*psCmdP && isspace(*psCmdP)) - { - psCmdP++; - } - if (!*psCmdP) - return -1; - } - TRACE("command: '%s'\n", psCmdP); -#ifdef HAVE_FORK - if (*psCmdP == '|') - { - int fds[2]; - if (pipe(fds)) { - ERR("pipe() failed!\n"); - return -1; - } - if ((*out_pid = fork()) == 0) - { - psCmdP++; - - TRACE("In child need to exec %s\n",psCmdP); - close(0); - dup2(fds[0],0); - close (fds[1]); - - /* reset signals that we previously set to SIG_IGN */ - signal( SIGPIPE, SIG_DFL ); - - execl("/bin/sh", "/bin/sh", "-c", psCmdP, NULL); - _exit(1); - - } - close (fds[0]); - fd = fds[1]; - TRACE("Need to execute a cmnd and pipe the output to it\n"); - } - else -#endif - { - char *buffer; - WCHAR psCmdPW[MAX_PATH]; - - TRACE("Just assume it's a file\n"); - - /** - * The file name can be dos based, we have to find its - * corresponding Unix file name. - */ - MultiByteToWideChar(CP_ACP, 0, psCmdP, -1, psCmdPW, MAX_PATH); - if ((buffer = wine_get_unix_file_name(psCmdPW))) - { - if ((fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0) - { - ERR("Failed to create spool file '%s' ('%s'). (error %s)\n", - buffer, psCmdP, strerror(errno)); - } - HeapFree(GetProcessHeap(), 0, buffer); - } - } - return fd; -} - -static int FreePrintJob(HANDLE16 hJob) -{ - int nRet = SP_ERROR; - PPRINTJOB pPrintJob; - - pPrintJob = FindPrintJobFromHandle(hJob); - if (pPrintJob != NULL) - { - nRet = SP_OK; - gPrintJobsTable[pPrintJob->nIndex] = NULL; - HeapFree(GetProcessHeap(), 0, pPrintJob->pszOutput); - HeapFree(GetProcessHeap(), 0, pPrintJob->pszTitle); - if (pPrintJob->fd >= 0) close(pPrintJob->fd); - if (pPrintJob->pid > 0) - { - pid_t wret; - int status; - do { - wret = waitpid(pPrintJob->pid, &status, 0); - } while (wret < 0 && errno == EINTR); - if (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) - nRet = SP_ERROR; - } - HeapFree(GetProcessHeap(), 0, pPrintJob); - } - return nRet; -} - /********************************************************************** * OpenJob (GDI.240) * @@ -354,12 +219,11 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) pPrintJob = gPrintJobsTable[0]; if (pPrintJob == NULL) { - int fd; - pid_t pid; + DOCINFOA info = { sizeof(info), lpTitle, lpOutput, NULL, 0 }; + int id; - /* Try and create a spool file */ - fd = CreateSpoolFile(lpOutput, &pid); - if (fd >= 0) + id = StartDocA( HDC_32(hDC), &info ); + if (id > 0) { pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB)); if(pPrintJob == NULL) { @@ -369,16 +233,8 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) hHandle = 1; - pPrintJob->pszOutput = HeapAlloc(GetProcessHeap(), 0, strlen(lpOutput)+1); - strcpy( pPrintJob->pszOutput, lpOutput ); - if(lpTitle) - { - pPrintJob->pszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(lpTitle)+1); - strcpy( pPrintJob->pszTitle, lpTitle ); - } pPrintJob->hDC = hDC; - pPrintJob->fd = fd; - pPrintJob->pid = pid; + pPrintJob->id = id; pPrintJob->nIndex = 0; pPrintJob->hHandle = hHandle; gPrintJobsTable[pPrintJob->nIndex] = pPrintJob; @@ -400,11 +256,7 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob) TRACE("%04x\n", hJob); pPrintJob = FindPrintJobFromHandle(hJob); - if (pPrintJob != NULL) - { - FreePrintJob(hJob); - nRet = 1; - } + if (pPrintJob != NULL) nRet = EndDoc( HDC_32(pPrintJob->hDC) ); return nRet; } @@ -420,25 +272,16 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch) TRACE("%04x %p %04x\n", hJob, lpData, cch); pPrintJob = FindPrintJobFromHandle(hJob); - if (pPrintJob != NULL && pPrintJob->fd >= 0 && cch) + if (pPrintJob != NULL && cch) { - if (write(pPrintJob->fd, lpData, cch) != cch) - nRet = SP_OUTOFDISK; - else - nRet = cch; -#if 0 - /* FIXME: We just cannot call 16 bit functions from here, since we - * have acquired several locks (DC). And we do not really need to. - */ - if (pPrintJob->hDC == 0) { - TRACE("hDC == 0 so no QueryAbort\n"); - } - else if (!(QueryAbort16(pPrintJob->hDC, (nRet == SP_OUTOFDISK) ? nRet : 0 ))) - { - CloseJob16(hJob); /* printing aborted */ - nRet = SP_APPABORT; - } -#endif + WORD *data = HeapAlloc( GetProcessHeap(), 0, cch + 2 ); + + if (!data) return SP_OUTOFDISK; + *data = cch; + memcpy( data + 1, lpData, cch ); + ExtEscape( HDC_32(pPrintJob->hDC), PASSTHROUGH, cch + 2, (char *)data, 0, NULL ); + HeapFree( GetProcessHeap(), 0, data ); + nRet = cch; } return nRet; } @@ -472,12 +315,9 @@ INT16 WINAPI WriteDialog16(HPJOB16 hJob, LPSTR lpMsg, INT16 cchMsg) */ INT16 WINAPI DeleteJob16(HPJOB16 hJob, INT16 nNotUsed) { - int nRet; - TRACE("%04x\n", hJob); - nRet = FreePrintJob(hJob); - return nRet; + return CloseJob16( hJob ); } /*

1 0

Alexandre Julliard : kernelbase: Use wide character string literals in file.c.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: d88bbf0a45fd604b36ecab21cd0393ca9cf0aa3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88bbf0a45fd604b36ecab21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:52:26 2020 +0100 kernelbase: Use wide character string literals in file.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 65 ++++++++++++++++---------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d88bbf0a45fd604b36ec…

1 0

Alexandre Julliard : kernelbase: Use wide character string literals in debug.c.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 5be54b885e3cf13fcc38a32d0c49eeb2ed0a575f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be54b885e3cf13fcc38a32d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:50:14 2020 +0100 kernelbase: Use wide character string literals in debug.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 53b95aa6dd..60c9d09cf6 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -158,9 +158,7 @@ void WINAPI DECLSPEC_HOTPATCH FatalAppExitA( UINT action, LPCSTR str ) */ void WINAPI DECLSPEC_HOTPATCH FatalAppExitW( UINT action, LPCWSTR str ) { - static const WCHAR User32DllW[] = {'u','s','e','r','3','2','.','d','l','l',0}; - - HMODULE mod = GetModuleHandleW( User32DllW ); + HMODULE mod = GetModuleHandleW( L"user32.dll" ); MessageBoxW_funcptr pMessageBoxW = NULL; if (mod) pMessageBoxW = (MessageBoxW_funcptr)GetProcAddress( mod, "MessageBoxW" ); @@ -216,8 +214,7 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) if (!mutex_inited) { /* first call to OutputDebugString, initialize mutex handle */ - static const WCHAR mutexname[] = {'D','B','W','i','n','M','u','t','e','x',0}; - HANDLE mutex = CreateMutexExW( NULL, mutexname, 0, SYNCHRONIZE ); + HANDLE mutex = CreateMutexExW( NULL, L"DBWinMutex", 0, SYNCHRONIZE ); if (mutex) { if (InterlockedCompareExchangePointer( &DBWinMutex, mutex, 0 ) != 0) @@ -229,20 +226,17 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) if (DBWinMutex) { - static const WCHAR shmname[] = {'D','B','W','I','N','_','B','U','F','F','E','R',0}; - static const WCHAR eventbuffername[] = {'D','B','W','I','N','_','B','U','F','F','E','R','_','R','E','A','D','Y',0}; - static const WCHAR eventdataname[] = {'D','B','W','I','N','_','D','A','T','A','_','R','E','A','D','Y',0}; HANDLE mapping; - mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, shmname ); + mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, L"DBWIN_BUFFER" ); if (mapping) { LPVOID buffer; HANDLE eventbuffer, eventdata; buffer = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); - eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, eventbuffername ); - eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, eventdataname ); + eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY" ); + eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY" ); if (buffer && eventbuffer && eventdata) { @@ -519,16 +513,6 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) BOOL ret = FALSE; char buffer[256]; - static const WCHAR AeDebugW[] = {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'A','e','D','e','b','u','g',0}; - static const WCHAR DebuggerW[] = {'D','e','b','u','g','g','e','r',0}; - static const WCHAR AutoW[] = {'A','u','t','o',0}; - format_exception_msg( epointers, buffer, sizeof(buffer) ); MESSAGE( "wine: %s (thread %04x), starting debugger...\n", buffer, GetCurrentThreadId() ); @@ -538,14 +522,14 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, AeDebugW ); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ); if (!NtOpenKey( &dbg_key, KEY_READ, &attr )) { KEY_VALUE_PARTIAL_INFORMATION *info; DWORD format_size = 0; - RtlInitUnicodeString( &nameW, DebuggerW ); + RtlInitUnicodeString( &nameW, L"Debugger" ); if (NtQueryValueKey( dbg_key, &nameW, KeyValuePartialInformation, NULL, 0, &format_size ) == STATUS_BUFFER_TOO_SMALL) { @@ -570,7 +554,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) HeapFree( GetProcessHeap(), 0, data ); } - RtlInitUnicodeString( &nameW, AutoW ); + RtlInitUnicodeString( &nameW, L"Auto" ); if (!NtQueryValueKey( dbg_key, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer)-sizeof(WCHAR), &format_size )) { @@ -596,9 +580,8 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) } else { - static const WCHAR fmtW[] = {'w','i','n','e','d','b','g',' ','-','-','a','u','t','o',' ','%','l','d',' ','%','l','d',0}; cmdline = HeapAlloc( GetProcessHeap(), 0, 80 * sizeof(WCHAR) ); - swprintf( cmdline, 80, fmtW, (long)GetCurrentProcessId(), (long)HandleToLong(event) ); + swprintf( cmdline, 80, L"winedbg --auto %ld %ld", (long)GetCurrentProcessId(), (long)HandleToLong(event) ); } if (!autostart) @@ -625,15 +608,14 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) env = GetEnvironmentStringsW(); if (!TRACE_ON(winedbg)) { - static const WCHAR winedebugW[] = {'W','I','N','E','D','E','B','U','G','=',0}; for (p = env; *p; p += lstrlenW(p) + 1) { - if (!wcsncmp( p, winedebugW, lstrlenW(winedebugW) )) + if (!wcsncmp( p, L"WINEDEBUG=", 10 )) { WCHAR *next = p + lstrlenW(p); WCHAR *end = next + 1; while (*end) end += lstrlenW(end) + 1; - memmove( p + lstrlenW(winedebugW), next, end + 1 - next ); + memmove( p + 10, next, end + 1 - next ); break; } }

1 0

Alexandre Julliard : kernelbase: Use wide character string literals in path.c.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: fe79b87f025b25611eec04935e1a0d652a952295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe79b87f025b25611eec0493… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 19:55:35 2020 +0100 kernelbase: Use wide character string literals in path.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 182 +++++++++++++++++-------------------------------- 1 file changed, 63 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe79b87f025b25611eec…

1 0

Alexandre Julliard : winaspi: Get rid of DOS mode.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: a6a415fa5d06b87f64cde51a718d61d14a7e95ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a415fa5d06b87f64cde51a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:20:07 2020 +0100 winaspi: Get rid of DOS mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winaspi.dll16/winaspi.c | 46 +++++++++++++++----------------------------- include/wine/winaspi.h | 4 ---- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c index 0755b4dc10..4675c1e165 100644 --- a/dlls/winaspi.dll16/winaspi.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -73,9 +73,6 @@ struct sg_header #define SCSI_OFF sizeof(struct sg_header) -#define PTR_TO_LIN(ptr,mode) \ - ((mode) == ASPI_DOS ? ((void*)(((unsigned int)SELECTOROF(ptr) << 4) + OFFSETOF(ptr))) : MapSL(ptr)) - WINE_DEFAULT_DEBUG_CHANNEL(aspi); /* Just a container for seeing what devices are open */ @@ -158,11 +155,11 @@ ASPI_OpenDevice16(SRB_ExecSCSICmd16 *prb) static void -ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) +ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb) { int i; BYTE *cdb; - BYTE *lpBuf = PTR_TO_LIN( prb->SRB_BufPointer, mode ); + BYTE *lpBuf = MapSL( prb->SRB_BufPointer ); switch (prb->CDBByte[0]) { case CMD_INQUIRY: @@ -236,9 +233,9 @@ ASPI_PrintSenseArea16(SRB_ExecSCSICmd16 *prb) } static void -ASPI_DebugPrintResult(SRB_ExecSCSICmd16 *prb, UINT16 mode) +ASPI_DebugPrintResult(SRB_ExecSCSICmd16 *prb) { - BYTE *lpBuf = PTR_TO_LIN( prb->SRB_BufPointer, mode ); + BYTE *lpBuf = MapSL( prb->SRB_BufPointer ); switch (prb->CDBByte[0]) { case CMD_INQUIRY: @@ -251,9 +248,9 @@ ASPI_DebugPrintResult(SRB_ExecSCSICmd16 *prb, UINT16 mode) } static WORD -ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) +ASPI_ExecScsiCmd(DWORD ptrPRB) { - SRB_ExecSCSICmd16 *lpPRB = PTR_TO_LIN( ptrPRB, mode ); + SRB_ExecSCSICmd16 *lpPRB = MapSL( ptrPRB ); struct sg_header *sg_hd, *sg_reply_hdr; int status; BYTE *lpBuf = 0; @@ -261,7 +258,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) int error_code = 0; int fd; - ASPI_DebugPrintCmd(lpPRB, mode); + ASPI_DebugPrintCmd(lpPRB); fd = ASPI_OpenDevice16(lpPRB); if (fd == -1) { @@ -274,7 +271,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) sg_reply_hdr = NULL; lpPRB->SRB_Status = SS_PENDING; - lpBuf = PTR_TO_LIN( lpPRB->SRB_BufPointer, mode ); + lpBuf = MapSL( lpPRB->SRB_BufPointer ); if (!lpPRB->SRB_CDBLen) { WARN("Failed: lpPRB->SRB_CDBLen = 0.\n"); @@ -361,25 +358,12 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) if (ASPI_POSTING(lpPRB) && lpPRB->SRB_PostProc) { TRACE("Post Routine (%x) called\n", (DWORD) lpPRB->SRB_PostProc); - switch (mode) - { - case ASPI_DOS: - { - SEGPTR spPRB = MapLS(lpPRB); - - WOWCallback16((DWORD)lpPRB->SRB_PostProc, spPRB); - UnMapLS(spPRB); - break; - } - case ASPI_WIN16: - WOWCallback16((DWORD)lpPRB->SRB_PostProc, ptrPRB); - break; - } + WOWCallback16((DWORD)lpPRB->SRB_PostProc, ptrPRB); } HeapFree(GetProcessHeap(), 0, sg_reply_hdr); HeapFree(GetProcessHeap(), 0, sg_hd); - ASPI_DebugPrintResult(lpPRB, mode); + ASPI_DebugPrintResult(lpPRB); return SS_COMP; error_exit: @@ -419,14 +403,14 @@ WORD WINAPI GetASPISupportInfo16(void) } -static DWORD ASPI_SendASPICommand(DWORD ptrSRB, UINT16 mode) +static DWORD ASPI_SendASPICommand(DWORD ptrSRB) { #ifdef linux - LPSRB16 lpSRB = PTR_TO_LIN( ptrSRB, mode ); + LPSRB16 lpSRB = MapSL( ptrSRB ); static const char szId[] = "Wine ASPI16"; static const char szWh[] = "Wine host"; - if (mode == ASPI_WIN16 && ASPIChainFunc) + if (ASPIChainFunc) { /* This is not the post proc, it's the chain proc this time */ DWORD ret = WOWCallback16((DWORD)ASPIChainFunc, ptrSRB); @@ -457,7 +441,7 @@ adapter name */ FIXME("Not implemented SC_GET_DEV_TYPE\n"); break; case SC_EXEC_SCSI_CMD: - return ASPI_ExecScsiCmd(ptrSRB, mode); + return ASPI_ExecScsiCmd(ptrSRB); case SC_RESET_DEV: FIXME("Not implemented SC_RESET_DEV\n"); break; @@ -474,7 +458,7 @@ adapter name */ */ WORD WINAPI SendASPICommand16(SEGPTR segptr_srb) { - return ASPI_SendASPICommand(segptr_srb, ASPI_WIN16); + return ASPI_SendASPICommand(segptr_srb); } diff --git a/include/wine/winaspi.h b/include/wine/winaspi.h index 39dc63f67a..8b377e7dd4 100644 --- a/include/wine/winaspi.h +++ b/include/wine/winaspi.h @@ -29,10 +29,6 @@ extern "C" { #endif /* #ifdef __cplusplus */ -/* WINE SCSI Stuff */ -#define ASPI_DOS 1 -#define ASPI_WIN16 2 - #include <pshpack1.h> /* SRB HA_INQUIRY */

1 0

Alexandre Julliard : winaspi: Reimplement on top of wnaspi32.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 961041e0ee56ee6cbcbf39739c12eb7af8b44a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=961041e0ee56ee6cbcbf3973… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 17:50:43 2020 +0100 winaspi: Reimplement on top of wnaspi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winaspi.dll16/Makefile.in | 2 +- dlls/winaspi.dll16/winaspi.c | 484 ++++++----------------------------------- 2 files changed, 71 insertions(+), 415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=961041e0ee56ee6cbcbf…

1 0