March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : setupapi: Implement SetupIterateCabinetW() on top of SetupIterateCabinetA().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 85afec5f2d09286d835c69bcc519780f6c103f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85afec5f2d09286d835c69bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:13 2021 -0600 setupapi: Implement SetupIterateCabinetW() on top of SetupIterateCabinetA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 318 +++++++++++++++-------------------------------- 1 file changed, 98 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85afec5f2d09286d835c…

1 0

Zebediah Figura : setupapi: Link directly to cabinet.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: ad59a006ac9839c8bd29e4c4c6b80e6fc736136d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad59a006ac9839c8bd29e4c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:14 2021 -0600 setupapi: Link directly to cabinet. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/setupcab.c | 36 +++--------------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 539bfed0caa..70ffd23d245 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 kernelbase -DELAYIMPORTS = shell32 wintrust ole32 winspool.drv comdlg32 user32 +DELAYIMPORTS = cabinet shell32 wintrust ole32 winspool.drv comdlg32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 55d0fe6f64c..02245a10b7f 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -63,17 +63,8 @@ OSVERSIONINFOW OsVersionInfo; -static HINSTANCE CABINET_hInstance = 0; HINSTANCE SETUPAPI_hInstance = 0; -static HFDI (__cdecl *sc_FDICreate)(PFNALLOC, PFNFREE, PFNOPEN, - PFNREAD, PFNWRITE, PFNCLOSE, PFNSEEK, int, PERF); - -static BOOL (__cdecl *sc_FDICopy)(HFDI, char *, char *, int, - PFNFDINOTIFY, PFNFDIDECRYPT, void *); - -static BOOL (__cdecl *sc_FDIDestroy)(HFDI); - #define SC_HSC_A_MAGIC 0xACABFEED typedef struct { UINT magic; @@ -86,23 +77,6 @@ typedef struct { WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -static BOOL LoadCABINETDll(void) -{ - if (!CABINET_hInstance) { - CABINET_hInstance = LoadLibraryA("cabinet.dll"); - if (CABINET_hInstance) { - sc_FDICreate = (void *)GetProcAddress(CABINET_hInstance, "FDICreate"); - sc_FDICopy = (void *)GetProcAddress(CABINET_hInstance, "FDICopy"); - sc_FDIDestroy = (void *)GetProcAddress(CABINET_hInstance, "FDIDestroy"); - return TRUE; - } else { - ERR("load cabinet dll failed.\n"); - return FALSE; - } - } else - return TRUE; -} - /* FDICreate callbacks */ static void * CDECL sc_cb_alloc(ULONG cb) @@ -392,9 +366,6 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); - if (!LoadCABINETDll()) - return FALSE; - if (!CabinetFile) { SetLastError(ERROR_INVALID_PARAMETER); @@ -429,14 +400,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, my_hsc.magic = SC_HSC_A_MAGIC; my_hsc.msghandler = MsgHandler; my_hsc.context = Context; - my_hsc.hfdi = sc_FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, + my_hsc.hfdi = FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf ); if (!my_hsc.hfdi) return FALSE; - ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); + ret = FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); - sc_FDIDestroy(my_hsc.hfdi); + FDIDestroy(my_hsc.hfdi); return ret; } @@ -572,7 +543,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: if (lpvReserved) break; SetupCloseLog(); - if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; }

1 0

Zebediah Figura : setupapi: Remove some superfluous traces.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 0b4d3dc2e8d4097997e69dd27ede7bbd8d92af05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4d3dc2e8d4097997e69dd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:15 2021 -0600 setupapi: Remove some superfluous traces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 128 +++++++++++------------------------------------ 1 file changed, 29 insertions(+), 99 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 02245a10b7f..e98178ff045 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -16,11 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * - * Many useful traces are commented in code, uncomment them if you have - * trouble and run with WINEDEBUG=+setupapi - * */ #include <stdarg.h> @@ -77,8 +72,6 @@ typedef struct { WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -/* FDICreate callbacks */ - static void * CDECL sc_cb_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); @@ -93,11 +86,8 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) { DWORD creation = 0, sharing = 0; int ioflag = 0; - INT_PTR ret = 0; SECURITY_ATTRIBUTES sa; - /* TRACE("(pszFile == %s, oflag == %d, pmode == %d)\n", debugstr_a(pszFile), oflag, pmode); */ - switch(oflag & (_O_RDONLY | _O_WRONLY | _O_RDWR)) { case _O_RDONLY: ioflag |= GENERIC_READ; @@ -120,7 +110,7 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) creation = CREATE_ALWAYS; else creation = OPEN_ALWAYS; - } else /* no _O_CREAT */ { + } else { if (oflag & _O_TRUNC) creation = TRUNCATE_EXISTING; else @@ -146,90 +136,52 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) return -1; } - if (oflag & ~(_O_BINARY | _O_TRUNC | _O_EXCL | _O_CREAT | _O_RDWR | _O_WRONLY | _O_NOINHERIT)) - WARN("unsupported oflag 0x%04x\n",oflag); - sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = !(ioflag & _O_NOINHERIT); - ret = (INT_PTR) CreateFileA(pszFile, ioflag, sharing, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); - - /* TRACE("<-- %d\n", ret); */ - - return ret; + return (INT_PTR) CreateFileA(pszFile, ioflag, sharing, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); } static UINT CDECL sc_cb_read(INT_PTR hf, void *pv, UINT cb) { - DWORD num_read; - BOOL rslt; + DWORD num_read; - /* TRACE("(hf == %d, pv == ^%p, cb == %u)\n", hf, pv, cb); */ - - rslt = ReadFile((HANDLE) hf, pv, cb, &num_read, NULL); - - - /* eof and failure both give "-1" return */ - if ((! rslt) || ((cb > 0) && (num_read == 0))) { - /* TRACE("<-- -1\n"); */ - return -1; - } - - /* TRACE("<-- %lu\n", num_read); */ - return num_read; + if (!ReadFile((HANDLE)hf, pv, cb, &num_read, NULL)) + return -1; + return num_read; } static UINT CDECL sc_cb_write(INT_PTR hf, void *pv, UINT cb) { - DWORD num_written; - /* BOOL rv; */ - - /* TRACE("(hf == %d, pv == ^%p, cb == %u)\n", hf, pv, cb); */ + DWORD num_written; - if ( /* (rv = */ WriteFile((HANDLE) hf, pv, cb, &num_written, NULL) /* ) */ - && (num_written == cb)) { - /* TRACE("<-- %lu\n", num_written); */ + if (!WriteFile((HANDLE)hf, pv, cb, &num_written, NULL)) + return -1; return num_written; - } else { - /* TRACE("rv == %d, num_written == %lu, cb == %u\n", rv, num_written,cb); */ - /* TRACE("<-- -1\n"); */ - return -1; - } } static int CDECL sc_cb_close(INT_PTR hf) { - /* TRACE("(hf == %d)\n", hf); */ - - if (CloseHandle((HANDLE) hf)) + if (!CloseHandle((HANDLE)hf)) + return -1; return 0; - else - return -1; } static LONG CDECL sc_cb_lseek(INT_PTR hf, LONG dist, int seektype) { - DWORD ret; - - /* TRACE("(hf == %d, dist == %ld, seektype == %d)\n", hf, dist, seektype); */ + DWORD ret; - if (seektype < 0 || seektype > 2) - return -1; + if (seektype < 0 || seektype > 2) + return -1; - if (((ret = SetFilePointer((HANDLE) hf, dist, NULL, seektype)) != INVALID_SET_FILE_POINTER) || !GetLastError()) { - /* TRACE("<-- %lu\n", ret); */ + if (((ret = SetFilePointer((HANDLE)hf, dist, NULL, seektype)) == INVALID_SET_FILE_POINTER) && GetLastError()) + return -1; return ret; - } else { - /* TRACE("<-- -1\n"); */ - return -1; - } } #define SIZEOF_MYSTERIO (MAX_PATH*3) -/* FDICopy callbacks */ - static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_A fici; @@ -242,8 +194,6 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p memset(mysterio, 0, SIZEOF_MYSTERIO); - TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (((PSC_HSC_A) pfdin->pv)->magic == SC_HSC_A_MAGIC)) phsc = pfdin->pv; else { @@ -253,13 +203,8 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p switch (fdint) { case fdintCABINET_INFO: - TRACE("Cabinet info notification\n"); - /* TRACE(" Cabinet name: %s\n", debugstr_a(pfdin->psz1)); - TRACE(" Cabinet disk: %s\n", debugstr_a(pfdin->psz2)); - TRACE(" Cabinet path: %s\n", debugstr_a(pfdin->psz3)); - TRACE(" Cabinet Set#: %d\n", pfdin->setID); - TRACE(" Cabinet Cab#: %d\n", pfdin->iCabinet); */ - WARN("SPFILENOTIFY_CABINETINFO undocumented: guess implementation.\n"); + TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", + debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2)); ci.CabinetFile = phsc->most_recent_cabinet_name; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; @@ -268,16 +213,10 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT_PTR) &ci, 0); return 0; case fdintPARTIAL_FILE: - TRACE("Partial file notification\n"); - /* TRACE(" Partial file name: %s\n", debugstr_a(pfdin->psz1)); */ return 0; case fdintCOPY_FILE: - TRACE("Copy file notification\n"); - TRACE(" File name: %s\n", debugstr_a(pfdin->psz1)); - /* TRACE(" File size: %ld\n", pfdin->cb); - TRACE(" File date: %u\n", pfdin->date); - TRACE(" File time: %u\n", pfdin->time); - TRACE(" File attr: %u\n", pfdin->attribs); */ + TRACE("Copy file %s, length %d, date %#x, time %#x, attributes %#x.\n", + debugstr_a(pfdin->psz1), pfdin->cb, pfdin->date, pfdin->time, pfdin->attribs); fici.NameInCabinet = pfdin->psz1; fici.FileSize = pfdin->cb; fici.Win32Error = 0; @@ -288,31 +227,26 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); if (err == FILEOP_DOIT) { - TRACE(" Callback specified filename: %s\n", debugstr_a(fici.FullTargetName)); + TRACE("Callback specified filename: %s\n", debugstr_a(fici.FullTargetName)); if (!fici.FullTargetName[0]) { - WARN(" Empty return string causing abort.\n"); + WARN("Empty return string causing abort.\n"); SetLastError(ERROR_PATH_NOT_FOUND); return -1; } strcpy( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { - TRACE(" Callback skipped file.\n"); + TRACE("Callback skipped file.\n"); return 0; } case fdintCLOSE_FILE_INFO: - TRACE("Close file notification\n"); - /* TRACE(" File name: %s\n", debugstr_a(pfdin->psz1)); - TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); - TRACE(" File hndl: %d\n", pfdin->hf); */ + TRACE("File extracted.\n"); fp.Source = phsc->most_recent_cabinet_name; fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; - /* the following should be a fixme -- but it occurs too many times */ - WARN("Should set file date/time/attribs (and execute files?)\n"); - if (sc_cb_close(pfdin->hf)) - WARN("_close failed.\n"); + /* FIXME: set file time and attributes */ + sc_cb_close(pfdin->hf); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (err) { SetLastError(err); @@ -320,18 +254,14 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p } else return TRUE; case fdintNEXT_CABINET: - TRACE("Next cabinet notification\n"); - /* TRACE(" Cabinet name: %s\n", debugstr_a(pfdin->psz1)); - TRACE(" Cabinet disk: %s\n", debugstr_a(pfdin->psz2)); - TRACE(" Cabinet path: %s\n", debugstr_a(pfdin->psz3)); - TRACE(" Cabinet Set#: %d\n", pfdin->setID); - TRACE(" Cabinet Cab#: %d\n", pfdin->iCabinet); */ + TRACE("Need new cabinet, path %s, file %s, disk %s, set %u, number %u.\n", + debugstr_a(pfdin->psz3), debugstr_a(pfdin->psz1), + debugstr_a(pfdin->psz2), pfdin->setID, pfdin->iCabinet); ci.CabinetFile = pfdin->psz1; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - /* remember the new cabinet name */ strcpy(phsc->most_recent_cabinet_name, pfdin->psz1); err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) {

1 0

Zebediah Figura : setupapi: Remove unnecessary error handling from cabinet callbacks.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 6b248f788c251223e2b7123cad90a25f55e13337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b248f788c251223e2b7123c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:16 2021 -0600 setupapi: Remove unnecessary error handling from cabinet callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index e98178ff045..562db2f50c9 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <fcntl.h> +#include <share.h> #include "windef.h" #include "winbase.h" @@ -33,36 +35,11 @@ #include "fdi.h" #include "wine/debug.h" -/* from msvcrt */ -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 - -#define _SH_COMPAT 0x00 -#define _SH_DENYRW 0x10 -#define _SH_DENYWR 0x20 -#define _SH_DENYRD 0x30 -#define _SH_DENYNO 0x40 - OSVERSIONINFOW OsVersionInfo; HINSTANCE SETUPAPI_hInstance = 0; -#define SC_HSC_A_MAGIC 0xACABFEED typedef struct { - UINT magic; HFDI hfdi; PSP_FILE_CALLBACK_A msghandler; PVOID context; @@ -98,9 +75,6 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) case _O_RDWR: ioflag |= GENERIC_READ | GENERIC_WRITE; break; - case _O_WRONLY | _O_RDWR: /* hmmm.. */ - ERR("_O_WRONLY & _O_RDWR in oflag?\n"); - return -1; } if (oflag & _O_CREAT) { @@ -131,9 +105,6 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) case _SH_DENYNO: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; - default: - ERR("<-- -1 (Unhandled pmode 0x%x)\n", pmode); - return -1; } sa.nLength = sizeof( SECURITY_ATTRIBUTES ); @@ -185,7 +156,7 @@ static LONG CDECL sc_cb_lseek(INT_PTR hf, LONG dist, int seektype) static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_A fici; - PSC_HSC_A phsc; + PSC_HSC_A phsc = pfdin->pv; CABINET_INFO_A ci; FILEPATHS_A fp; UINT err; @@ -194,13 +165,6 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p memset(mysterio, 0, SIZEOF_MYSTERIO); - if (pfdin && pfdin->pv && (((PSC_HSC_A) pfdin->pv)->magic == SC_HSC_A_MAGIC)) - phsc = pfdin->pv; - else { - ERR("pv %p is not an SC_HSC_A.\n", (pfdin) ? pfdin->pv : NULL); - return -1; - } - switch (fdint) { case fdintCABINET_INFO: TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", @@ -327,7 +291,6 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, /* remember the cabinet name */ strcpy(my_hsc.most_recent_cabinet_name, pszCabinet); - my_hsc.magic = SC_HSC_A_MAGIC; my_hsc.msghandler = MsgHandler; my_hsc.context = Context; my_hsc.hfdi = FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read,

1 0

Zebediah Figura : setupapi: Make the FDI handle a local variable.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: b70b153c59e2aa9365beecc94ef63f6fefb19b9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70b153c59e2aa9365beecc9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:17 2021 -0600 setupapi: Make the FDI handle a local variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 562db2f50c9..4824170d587 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -40,7 +40,6 @@ OSVERSIONINFOW OsVersionInfo; HINSTANCE SETUPAPI_hInstance = 0; typedef struct { - HFDI hfdi; PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; @@ -255,6 +254,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, ERF erf; CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; DWORD fpnsize; + HFDI hfdi; BOOL ret; TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", @@ -293,14 +293,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, my_hsc.msghandler = MsgHandler; my_hsc.context = Context; - my_hsc.hfdi = FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, - sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf ); + hfdi = FDICreate(sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, + sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf); - if (!my_hsc.hfdi) return FALSE; + if (!hfdi) return FALSE; - ret = FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); + ret = FDICopy(hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); - FDIDestroy(my_hsc.hfdi); + FDIDestroy(hfdi); return ret; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 784faaaea4bba9100da49f07bc895a665103a280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784faaaea4bba9100da49f07… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Mar 5 09:06:34 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8f3cc4dc3b6..74b49da407e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,18 +1,18 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2020. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2021. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-11-09 23:18+0200\n" +"PO-Revision-Date: 2021-03-05 09:05+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.2\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -21,26 +21,20 @@ msgid "Security" msgstr "Saugumas" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Naudotojo vardas:" +msgstr "&Grupių ar naudotojų vardai:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geltona" +msgstr "Leisti" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Drausti" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Prieiga nesuteikta" +msgstr "%1 teisės" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall"

1 0

Alexandre Julliard : include: Always define 32- and 64-bit versions of the TEB and PEB structures.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: e2659819b8193b151980e80679af1fa4748eb640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2659819b8193b151980e806… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 5 15:53:19 2021 +0100 include: Always define 32- and 64-bit versions of the TEB and PEB structures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 21 ---- dlls/kernelbase/debug.c | 32 ------ include/winternl.h | 251 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 248 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2659819b8193b151980…

1 0

Giovanni Mascellani : dwrite/tests: Remove overzealous test.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 23d6ac27dbbaacf3fc6caa3860df83e90c003692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d6ac27dbbaacf3fc6caa38… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 4 11:23:08 2021 +0100 dwrite/tests: Remove overzealous test. While this test happens to always be true on Windows, this is just a property of the fallback fonts installed on the system, not a property of the code. Since we cannot control the fonts installed on users' computers, it makes no sense to do this test. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index cc4079faa14..43a00b7e22e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4699,12 +4699,6 @@ todo_wine { todo_wine ok(font != NULL, "got %p\n", font); if (font) { - /* font returned for Hiragana character, check if it supports Latin too */ - exists = FALSE; - hr = IDWriteFont_HasCharacter(font, 'b', &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); - IDWriteFont_Release(font); } /* Try with explicit collection, Tahoma will be forced. */

1 0

Nikolay Sivov : wbemprox/tests: Use defined name for error code.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 4b8fbc324c82da4dc1eb41455c0824520c9561d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b8fbc324c82da4dc1eb4145… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:40:00 2021 +0300 wbemprox/tests: Use defined name for error code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index da985de01fa..5ad73e7a8ec 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -109,8 +109,8 @@ static void test_IWbemLocator(void) { L"\\\\.", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { L"\\ROOT", WBEM_E_INVALID_NAMESPACE }, - { L"\\\\ROOT", 0x800706ba, TRUE }, - { L"\\\\.ROOT", 0x800706ba, TRUE }, + { L"\\\\ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, + { L"\\\\.ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, { L"\\\\.\\NONE", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\ROOT", S_OK }, { L"\\\\\\.\\ROOT", WBEM_E_INVALID_PARAMETER },

1 0

Zebediah Figura : d3dx9/tests: Remove the fallback NAN definition.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 0d075b904b28a03cec304480446fab7753c3094f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d075b904b28a03cec304480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:14:27 2021 -0600 d3dx9/tests: Remove the fallback NAN definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 42deb32b934..e981f3623ce 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -29,16 +29,6 @@ #include "rmxftmpl.h" #include "rmxfguid.h" -#ifndef NAN -/* From wine/port.h */ -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace

1 0