December 2013 - Wine-commits

Ken Thomases : winemac: Track whether our windows would be visible if the process weren't hidden.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: ae4732360460914da61bedbed798511882d84719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4732360460914da61bedbed… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 31 01:05:09 2013 -0600 winemac: Track whether our windows would be visible if the process weren't hidden. The -[NSWindow isVisible] method returns FALSE when the process is hidden, but that's not what we need to know in some cases. This fixes full-screen games which minimize their window when they lose focus. Command-Tabbing away hides the process. Because the window was not visible, the code didn't actually minimize it. When switching back to the process, no event was sent to the Wine back-end telling it the window had been restored, so it never resumed drawing to it. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 40 +++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d3a244b..a74f6da 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -33,6 +33,7 @@ BOOL maximized; BOOL fullscreen; BOOL pendingMinimize; + BOOL savedVisibleState; WineWindow* latentParentWindow; NSMutableArray* latentChildWindows; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 002e359..a025d59 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -543,6 +543,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif WineWindow* window; WineContentView* contentView; NSTrackingArea* trackingArea; + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; [[WineApplicationController sharedController] flipRect:&window_frame]; @@ -595,12 +596,21 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [window setContentView:contentView]; [window setInitialFirstResponder:contentView]; - [[NSNotificationCenter defaultCenter] addObserver:window - selector:@selector(updateFullscreen) - name:NSApplicationDidChangeScreenParametersNotification - object:NSApp]; + [nc addObserver:window + selector:@selector(updateFullscreen) + name:NSApplicationDidChangeScreenParametersNotification + object:NSApp]; [window updateFullscreen]; + [nc addObserver:window + selector:@selector(applicationWillHide) + name:NSApplicationWillHideNotification + object:NSApp]; + [nc addObserver:window + selector:@selector(applicationDidUnhide) + name:NSApplicationDidUnhideNotification + object:NSApp]; + return window; } @@ -714,9 +724,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setHasShadow:wf->shadow]; } + // Indicates if the window would be visible if the app were not hidden. + - (BOOL) wouldBeVisible + { + return [NSApp isHidden] ? savedVisibleState : [self isVisible]; + } + - (BOOL) isOrderedIn { - return [self isVisible] || [self isMiniaturized]; + return [self wouldBeVisible] || [self isMiniaturized]; } - (NSInteger) minimumLevelForActive:(BOOL)active @@ -827,7 +843,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif pendingMinimize = FALSE; if (state->minimized && ![self isMiniaturized]) { - if ([self isVisible]) + if ([self wouldBeVisible]) { if ([self styleMask] & NSFullScreenWindowMask) { @@ -1198,6 +1214,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } else [self orderOut:nil]; + savedVisibleState = FALSE; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; @@ -1637,6 +1654,17 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } + - (void) applicationWillHide + { + savedVisibleState = [self isVisible]; + } + + - (void) applicationDidUnhide + { + if ([self isVisible]) + [self becameEligibleParentOrChild]; + } + /* * ---------- NSWindowDelegate methods ----------

1 0

Ken Thomases : winemac: Explicitly unhide the app early when showing windows.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: bcde44fb8a34a9fc9bab60a8ff90700f07b0d6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcde44fb8a34a9fc9bab60a8f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 31 01:05:13 2013 -0600 winemac: Explicitly unhide the app early when showing windows. Cocoa would implictly unhide it when we order a window, anyway. Doing it early avoids problems from querying -[NSWindow isVisible] while the app is hidden. That method returns FALSE even for windows which would be visible if the app weren't hidden. --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a025d59..07abbca 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1118,9 +1118,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (![self isMiniaturized]) { BOOL needAdjustWindowLevels = FALSE; - BOOL wasVisible = [self isVisible]; + BOOL wasVisible; [controller transformProcessToForeground]; + [NSApp unhide:nil]; + wasVisible = [self isVisible]; if (activate) [NSApp activateIgnoringOtherApps:YES];

1 0

Ken Thomases : winemac: For WINDOW_DID_UNMINIMIZE events, don' t attempt to restore windows which aren't minimized and visible.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 94cfa7799bac562a82ef9f403be93fce73519520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cfa7799bac562a82ef9f403… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 31 01:05:15 2013 -0600 winemac: For WINDOW_DID_UNMINIMIZE events, don't attempt to restore windows which aren't minimized and visible. The Win32 window state might have changed while the event was in the queue, making it obsolete. Sending WM_SYSCOMMAND/SC_RESTORE might re-show a hidden window, for example. --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index fd47ea2..5a1d5a7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2095,7 +2095,7 @@ void macdrv_window_did_unminimize(HWND hwnd) style = GetWindowLongW(hwnd, GWL_STYLE); data->minimized = FALSE; - if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data);

1 0

Ken Thomases : winemac: More thoroughly discard events which have been obsoleted by subsequent Wine- or program-driven changes .
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 4f9de6bcdf1722a258413ce99c26f2ee5b36dbf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9de6bcdf1722a258413ce99… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 31 01:05:18 2013 -0600 winemac: More thoroughly discard events which have been obsoleted by subsequent Wine- or program-driven changes. Among other things, this fixes Syberia 2. That game shows, hides, and then shows its window. Hiding it caused a WINDOW_LOST_FOCUS event to be queued. By the time it was processed, the window was the foreground window again. In response to being told it had lost focus, the game minimized its window. Hiding the window should have prevented or discarded the WINDOW_LOST_FOCUS event since the change was driven from Wine and the Win32 foreground/active window state would already be correct. In addition, when the program re-showed its window and made it foreground, that should have discarded the event as being out of date. Now they do. --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_event.m | 3 +++ dlls/winemac.drv/cocoa_window.m | 34 ++++++++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 17644d0..fea30e3 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2515,6 +2515,8 @@ void macdrv_set_mouse_capture_window(macdrv_window window) { WineWindow* w = (WineWindow*)window; + [w.queue discardEventsMatchingMask:event_mask_for_type(RELEASE_CAPTURE) forWindow:w]; + OnMainThread(^{ [[WineApplicationController sharedController] setMouseCaptureWindow:w]; }); diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 00f6f8e..85cac5f 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -269,6 +269,7 @@ static const OSType WineHotKeySignature = 'Wine'; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSIndexSet* indexes; [eventsLock lock]; @@ -282,6 +283,8 @@ static const OSType WineHotKeySignature = 'Wine'; [events removeObjectsAtIndexes:indexes]; [eventsLock unlock]; + + [pool release]; } - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 07abbca..54cb8db 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -838,7 +838,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (state->minimized_valid) { - BOOL discardUnminimize = TRUE; + macdrv_event_mask discard = event_mask_for_type(WINDOW_DID_UNMINIMIZE); pendingMinimize = FALSE; if (state->minimized && ![self isMiniaturized]) @@ -848,10 +848,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([self styleMask] & NSFullScreenWindowMask) { [self postDidUnminimizeEvent]; - discardUnminimize = FALSE; + discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); } else + { [super miniaturize:nil]; + discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | + event_mask_for_type(WINDOW_GOT_FOCUS) | + event_mask_for_type(WINDOW_LOST_FOCUS); + } } else pendingMinimize = TRUE; @@ -860,14 +865,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { ignore_windowDeminiaturize = TRUE; [self deminiaturize:nil]; + discard |= event_mask_for_type(WINDOW_LOST_FOCUS); } - if (discardUnminimize) - { - /* Whatever events regarding minimization might have been in the queue are now stale. */ - [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_DID_UNMINIMIZE) - forWindow:self]; - } + if (discard) + [queue discardEventsMatchingMask:discard forWindow:self]; } if (state->maximized != maximized) @@ -1221,6 +1223,14 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [controller updateFullscreenWindows]; [controller adjustWindowLevels]; [NSApp removeWindowsItem:self]; + + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) | + event_mask_for_type(WINDOW_GOT_FOCUS) | + event_mask_for_type(WINDOW_LOST_FOCUS) | + event_mask_for_type(WINDOW_MAXIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_MINIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_RESTORE_REQUESTED) + forWindow:self]; } - (void) updateFullscreen @@ -1399,6 +1409,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif causing_becomeKeyWindow = self; [self makeKeyWindow]; causing_becomeKeyWindow = nil; + + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_GOT_FOCUS) | + event_mask_for_type(WINDOW_LOST_FOCUS) + forWindow:self]; } - (void) postKey:(uint16_t)keyCode @@ -2168,6 +2182,10 @@ void macdrv_order_cocoa_window(macdrv_window w, macdrv_window p, orAbove:next activate:activate]; }); + [window.queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) + forWindow:window]; + [next.queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) + forWindow:next]; } /***********************************************************************

1 0

Dmitry Timoshkov : cabinet/tests: Add an FDICopy test which emulates extracting from a memory block.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 3cb5b93db996fe67dbbd18c111d3d826c72c6ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb5b93db996fe67dbbd18c11… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 25 13:24:50 2013 +0900 cabinet/tests: Add an FDICopy test which emulates extracting from a memory block. --- dlls/cabinet/tests/fdi.c | 246 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 246 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 919fdbf..a2c305d 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -2,6 +2,7 @@ * Unit tests for the File Decompression Interface * * Copyright (C) 2006 James Hawkins + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,105 @@ static CHAR CURR_DIR[MAX_PATH]; +/* avoid including CRT headers */ +#ifndef _O_BINARY +# define _O_BINARY 0x8000 +#endif + +#ifndef _S_IREAD +# define _S_IREAD 0x0100 +# define _S_IWRITE 0x0080 +#endif + +#include <pshpack1.h> + +struct CFHEADER +{ + UCHAR signature[4]; /* file signature */ + ULONG reserved1; /* reserved */ + ULONG cbCabinet; /* size of this cabinet file in bytes */ + ULONG reserved2; /* reserved */ + ULONG coffFiles; /* offset of the first CFFILE entry */ + ULONG reserved3; /* reserved */ + UCHAR versionMinor; /* cabinet file format version, minor */ + UCHAR versionMajor; /* cabinet file format version, major */ + USHORT cFolders; /* number of CFFOLDER entries in this cabinet */ + USHORT cFiles; /* number of CFFILE entries in this cabinet */ + USHORT flags; /* cabinet file option indicators */ + USHORT setID; /* must be the same for all cabinets in a set */ + USHORT iCabinet; /* number of this cabinet file in a set */ +#if 0 + USHORT cbCFHeader; /* (optional) size of per-cabinet reserved area */ + UCHAR cbCFFolder; /* (optional) size of per-folder reserved area */ + UCHAR cbCFData; /* (optional) size of per-datablock reserved area */ + UCHAR abReserve; /* (optional) per-cabinet reserved area */ + UCHAR szCabinetPrev; /* (optional) name of previous cabinet file */ + UCHAR szDiskPrev; /* (optional) name of previous disk */ + UCHAR szCabinetNext; /* (optional) name of next cabinet file */ + UCHAR szDiskNext; /* (optional) name of next disk */ +#endif +}; + +struct CFFOLDER +{ + ULONG coffCabStart; /* offset of the first CFDATA block in this folder */ + USHORT cCFData; /* number of CFDATA blocks in this folder */ + USHORT typeCompress; /* compression type indicator */ +#if 0 + UCHAR abReserve[]; /* (optional) per-folder reserved area */ +#endif +}; + +struct CFFILE +{ + ULONG cbFile; /* uncompressed size of this file in bytes */ + ULONG uoffFolderStart; /* uncompressed offset of this file in the folder */ + USHORT iFolder; /* index into the CFFOLDER area */ + USHORT date; /* date stamp for this file */ + USHORT time; /* time stamp for this file */ + USHORT attribs; /* attribute flags for this file */ +#if 0 + UCHAR szName[]; /* name of this file */ +#endif +}; + +struct CFDATA +{ + ULONG csum; /* checksum of this CFDATA entry */ + USHORT cbData; /* number of compressed bytes in this block */ + USHORT cbUncomp; /* number of uncompressed bytes in this block */ +#if 0 + UCHAR abReserve[]; /* (optional) per-datablock reserved area */ + UCHAR ab[cbData]; /* compressed data bytes */ +#endif +}; + +static const struct +{ + struct CFHEADER header; + struct CFFOLDER folder; + struct CFFILE file; + UCHAR szName[sizeof("file.dat")]; + struct CFDATA data; + UCHAR ab[sizeof("Hello World!")-1]; +} cab_data = +{ + { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, + { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, + { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { 'f','i','l','e','.','d','a','t',0 }, + { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, + { 'H','e','l','l','o',' ','W','o','r','l','d','!' } +}; + +#include <poppack.h> + +struct mem_data +{ + const char *base; + LONG size, pos; +}; + /* FDI callbacks */ static void * CDECL fdi_alloc(ULONG cb) @@ -592,6 +692,121 @@ static INT_PTR __cdecl CopyProgress(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION return 0; } +static INT_PTR CDECL fdi_mem_open(char *name, int oflag, int pmode) +{ + static const char expected[] = "memory\\block"; + struct mem_data *data; + + ok(!strcmp(name, expected), "expected %s, got %s\n", expected, name); + ok(oflag == _O_BINARY, "expected _O_BINARY, got %x\n", oflag); + ok(pmode == (_S_IREAD | _S_IWRITE), "expected _S_IREAD | _S_IWRITE, got %x\n", pmode); + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + if (!data) return -1; + + data->base = (const char *)&cab_data; + data->size = sizeof(cab_data); + data->pos = 0; + + trace("mem_open(%s,%x,%x) => %p\n", name, oflag, pmode, data); + return (INT_PTR)data; +} + +static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) +{ + struct mem_data *data = (struct mem_data *)hf; + UINT available, cb_read; + + available = data->size - data->pos; + cb_read = (available >= cb) ? cb : available; + + memcpy(pv, data->base + data->pos, cb_read); + data->pos += cb; + + /*trace("mem_read(%p,%p,%u) => %u\n", hf, pv, cb, cb_read);*/ + return cb_read; +} + +static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb) +{ + static const char expected[12] = "Hello World!"; + + trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb); + + ok(hf == 0x12345678, "expected 0x12345678, got %#lx\n", hf); + ok(cb == 12, "expected 12, got %u\n", cb); + ok(!memcmp(pv, expected, 12), "expected %s, got %s\n", expected, (const char *)pv); + + return cb; +} + +static int CDECL fdi_mem_close(INT_PTR hf) +{ + HeapFree(GetProcessHeap(), 0, (void *)hf); + return 0; +} + +static LONG CDECL fdi_mem_seek(INT_PTR hf, LONG dist, int seektype) +{ + struct mem_data *data = (struct mem_data *)hf; + + switch (seektype) + { + case SEEK_SET: + data->pos = dist; + break; + + case SEEK_CUR: + data->pos += dist; + break; + + case SEEK_END: + default: +todo_wine + ok(0, "seek: not expected type %d\n", seektype); + return -1; + } + + if (data->pos < 0) data->pos = 0; + if (data->pos > data->size) data->pos = data->size; + + /*mem_seek(%p,%d,%d) => %u\n", hf, dist, seektype, data->pos);*/ + return data->pos; +} + +static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION *info) +{ + static const char expected[9] = "file.dat\0"; + + switch (fdint) + { + case fdintCLOSE_FILE_INFO: + trace("mem_notify: CLOSE_FILE_INFO %s, handle %#lx\n", info->psz1, info->hf); + + ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); + ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); + ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); + ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + return 1; + + case fdintCOPY_FILE: + { + trace("mem_notify: COPY_FILE %s, %d bytes\n", info->psz1, info->cb); + + ok(info->cb == 12, "expected 12, got %u\n", info->cb); + ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + return 0x12345678; /* call write() callback */ + } + + default: + trace("mem_notify(%d,%p)\n", fdint, info); + return 0; + } + + return 0; +} + static void test_FDICopy(void) { CCAB cabParams; @@ -601,6 +816,11 @@ static void test_FDICopy(void) BOOL ret; char name[] = "extract.cab"; char path[MAX_PATH + 1]; + char memory_block[] = "memory\\block"; + char memory[] = "memory\\"; + char block[] = "block"; + FDICABINETINFO info; + INT_PTR fd; set_cab_parameters(&cabParams); @@ -648,6 +868,32 @@ static void test_FDICopy(void) FDIDestroy(hfdi); DeleteFileA(name); + + /* test extracting from a memory block */ + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_mem_open, fdi_mem_read, + fdi_mem_write, fdi_mem_close, fdi_mem_seek, cpuUNKNOWN, &erf); + ok(hfdi != NULL, "FDICreate error %d\n", erf.erfOper); + + fd = fdi_mem_open(memory_block, _O_BINARY, _S_IREAD | _S_IWRITE); + ok(fd != -1, "fdi_open failed\n"); + + memset(&info, 0, sizeof(info)); + ret = FDIIsCabinet(hfdi, fd, &info); +todo_wine { + ok(ret, "FDIIsCabinet error %d\n", erf.erfOper); + ok(info.cbCabinet == 0x59, "expected 0x59, got %#x\n", info.cbCabinet); + ok(info.cFiles == 1, "expected 1, got %d\n", info.cFiles); + ok(info.cFolders == 1, "expected 1, got %d\n", info.cFolders); + ok(info.setID == 0x1225, "expected 0x1225, got %#x\n", info.setID); + ok(info.iCabinet == 0x2013, "expected 0x2013, got %#x\n", info.iCabinet); +} + fdi_mem_close(fd); + + ret = FDICopy(hfdi, block, memory, 0, fdi_mem_notify, NULL, 0); +todo_wine + ok(ret, "FDICopy error %d\n", erf.erfOper); + + FDIDestroy(hfdi); }

1 0

Dmitry Timoshkov : cabinet: Read CAB size from the file header instead of calling FDI seek callback with SEEK_END .
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 4ddb9f691597b71cc083eef0079daf91b224b3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddb9f691597b71cc083eef00… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 25 13:24:58 2013 +0900 cabinet: Read CAB size from the file header instead of calling FDI seek callback with SEEK_END. SEEK_END is not supported by some callback implementations. --- dlls/cabinet/fdi.c | 23 +++++------------------ dlls/cabinet/tests/fdi.c | 5 +---- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 2e39444..f9e6522 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -536,7 +536,7 @@ static BOOL FDI_read_entries( PMORE_ISCAB_INFO pmii) { int num_folders, num_files, header_resv, folder_resv = 0; - LONG base_offset, cabsize; + LONG cabsize; USHORT setid, cabidx, flags; cab_UBYTE buf[64], block_resv; char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL; @@ -573,34 +573,21 @@ static BOOL FDI_read_entries( * -gmt */ - /* get basic offset & size info */ - base_offset = FDI_getoffset(fdi, hf); - - if (fdi->seek(hf, 0, SEEK_END) == -1) { - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } - - cabsize = FDI_getoffset(fdi, hf); - - if ((cabsize == -1) || (base_offset == -1) || - ( fdi->seek(hf, base_offset, SEEK_SET) == -1 )) { - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } - /* read in the CFHEADER */ if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) { if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); return FALSE; } - + /* check basic MSCF signature */ if (EndGetI32(buf+cfhead_Signature) != 0x4643534d) { if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); return FALSE; } + /* get the cabinet size */ + cabsize = EndGetI32(buf+cfhead_CabinetSize); + /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index a2c305d..afae707 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -762,7 +762,6 @@ static LONG CDECL fdi_mem_seek(INT_PTR hf, LONG dist, int seektype) case SEEK_END: default: -todo_wine ok(0, "seek: not expected type %d\n", seektype); return -1; } @@ -879,18 +878,16 @@ static void test_FDICopy(void) memset(&info, 0, sizeof(info)); ret = FDIIsCabinet(hfdi, fd, &info); -todo_wine { ok(ret, "FDIIsCabinet error %d\n", erf.erfOper); ok(info.cbCabinet == 0x59, "expected 0x59, got %#x\n", info.cbCabinet); ok(info.cFiles == 1, "expected 1, got %d\n", info.cFiles); ok(info.cFolders == 1, "expected 1, got %d\n", info.cFolders); ok(info.setID == 0x1225, "expected 0x1225, got %#x\n", info.setID); ok(info.iCabinet == 0x2013, "expected 0x2013, got %#x\n", info.iCabinet); -} + fdi_mem_close(fd); ret = FDICopy(hfdi, block, memory, 0, fdi_mem_notify, NULL, 0); -todo_wine ok(ret, "FDICopy error %d\n", erf.erfOper); FDIDestroy(hfdi);

1 0

Dmitry Timoshkov : cabinet: Remove a no longer valid comment about seeking and restoring CAB position.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 3b8f4a280c904b084733dacab722199728242135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8f4a280c904b084733dacab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 25 13:25:04 2013 +0900 cabinet: Remove a no longer valid comment about seeking and restoring CAB position. --- dlls/cabinet/fdi.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index f9e6522..ae0576b 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -543,36 +543,6 @@ static BOOL FDI_read_entries( TRACE("(fdi == ^%p, hf == %ld, pfdici == ^%p)\n", fdi, hf, pfdici); - /* - * FIXME: I just noticed that I am memorizing the initial file pointer - * offset and restoring it before reading in the rest of the header - * information in the cabinet. Perhaps that's correct -- that is, perhaps - * this API is supposed to support "streaming" cabinets which are embedded - * in other files, or cabinets which begin at file offsets other than zero. - * Otherwise, I should instead go to the absolute beginning of the file. - * (Either way, the semantics of wine's FDICopy require me to leave the - * file pointer where it is afterwards -- If Windows does not do so, we - * ought to duplicate the native behavior in the FDIIsCabinet API, not here. - * - * So, the answer lies in Windows; will native cabinet.dll recognize a - * cabinet "file" embedded in another file? Note that cabextract.c does - * support this, which implies that Microsoft's might. I haven't tried it - * yet so I don't know. ATM, most of wine's FDI cabinet routines (except - * this one) would not work in this way. To fix it, we could just make the - * various references to absolute file positions in the code relative to an - * initial "beginning" offset. Because the FDICopy API doesn't take a - * file-handle like this one, we would therein need to search through the - * file for the beginning of the cabinet (as we also do in cabextract.c). - * Note that this limits us to a maximum of one cabinet per. file: the first. - * - * So, in summary: either the code below is wrong, or the rest of fdi.c is - * wrong... I cannot imagine that both are correct ;) One of these flaws - * should be fixed after determining the behavior on Windows. We ought - * to check both FDIIsCabinet and FDICopy for the right behavior. - * - * -gmt - */ - /* read in the CFHEADER */ if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) { if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 );

1 0

Andrey Gusev : po: Ukrainian translation updates and spelling fixes.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 33132ce7621dcf33551b0417cf8902a51ba9be3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33132ce7621dcf33551b0417c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 31 16:06:34 2013 +0200 po: Ukrainian translation updates and spelling fixes. --- po/uk.po | 76 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33132ce7621dcf33551b0…

1 0

Bruno Jesus : ws2_32: Use a helper function to set the IPX packet type.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 2d4adfc49eba7028a4038369c7a639de7a2f6f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4adfc49eba7028a4038369c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 30 22:24:56 2013 -0200 ws2_32: Use a helper function to set the IPX packet type. --- dlls/ws2_32/socket.c | 53 +++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0d6838e..732bbad 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1159,6 +1159,36 @@ convert_socktype_u2w(int unixsocktype) { return -1; } +static int set_ipx_packettype(int sock, int ptype) +{ +#ifdef HAS_IPX + int fd = get_sock_fd( sock, 0, NULL ), ret = 0; + TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", ptype, fd); + + /* We try to set the ipx type on ipx socket level. */ +#ifdef SOL_IPX + if(setsockopt(fd, SOL_IPX, IPX_TYPE, &ptype, sizeof(ptype)) == -1) + { + ERR("IPX: could not set ipx option type; expect weird behaviour\n"); + ret = SOCKET_ERROR; + } +#else + { + struct ipx val; + /* Should we retrieve val using a getsockopt call and then + * set the modified one? */ + val.ipx_pt = ptype; + setsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, sizeof(struct ipx)); + } +#endif + release_sock_fd( sock, fd ); + return ret; +#else + WARN("IPX support is not enabled, can't set packet type\n"); + return SOCKET_ERROR; +#endif +} + /* ----------------------------------- API ----- * * Init / cleanup / error checking. @@ -4772,28 +4802,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, switch(optname) { case IPX_PTYPE: - fd = get_sock_fd( s, 0, NULL ); - TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", *(const int*)optval, fd); - - /* We try to set the ipx type on ipx socket level. */ -#ifdef SOL_IPX - if(setsockopt(fd, SOL_IPX, IPX_TYPE, optval, optlen) == -1) - { - ERR("IPX: could not set ipx option type; expect weird behaviour\n"); - release_sock_fd( s, fd ); - return SOCKET_ERROR; - } -#else - { - struct ipx val; - /* Should we retrieve val using a getsockopt call and then - * set the modified one? */ - val.ipx_pt = *optval; - setsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, sizeof(struct ipx)); - } -#endif - release_sock_fd( s, fd ); - return 0; + return set_ipx_packettype(s, *(int*)optval); case IPX_FILTERPTYPE: /* Sets the receive filter packet type, at the moment we don't support it */

1 0

Bruno Jesus : ws2_32: Add extended IPX protocol support.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 3eb39dc08e67cb33bd6dadbbe14af46dd8673ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb39dc08e67cb33bd6dadbbe… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 30 22:25:09 2013 -0200 ws2_32: Add extended IPX protocol support. --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++++--- dlls/ws2_32/tests/sock.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 732bbad..462ff86 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -201,6 +201,8 @@ static const INT valid_protocols[] = 0 }; +#define IS_IPX_PROTO(X) ((X) >= WS_NSPROTO_IPX && (X) <= WS_NSPROTO_IPX + 255) + #if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) # define LINUX_BOUND_IF struct interface_filter { @@ -1122,6 +1124,11 @@ convert_proto_w2u(int windowsproto) { for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; + + /* check for extended IPX */ + if (IS_IPX_PROTO(windowsproto)) + return windowsproto; + FIXME("unhandled Windows socket protocol %d\n", windowsproto); return -1; } @@ -1133,6 +1140,12 @@ convert_proto_u2w(int unixproto) { for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; + + /* if value is inside IPX range just return it - the kernel simply + * echoes the value used in the socket() function */ + if (IS_IPX_PROTO(unixproto)) + return unixproto; + FIXME("unhandled UNIX socket protocol %d\n", unixproto); return -1; } @@ -5976,7 +5989,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { SOCKET ret; DWORD err; - int unixaf, unixtype; + int unixaf, unixtype, ipxptype = -1; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -6011,13 +6024,16 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!type && (af || protocol)) { + int autoproto = protocol; WSAPROTOCOL_INFOW infow; /* default to the first valid protocol */ - if (!protocol) - protocol = valid_protocols[0]; + if (!autoproto) + autoproto = valid_protocols[0]; + else if(IS_IPX_PROTO(autoproto)) + autoproto = WS_NSPROTO_IPX; - if (WS_EnterSingleProtocolW(protocol, &infow)) + if (WS_EnterSingleProtocolW(autoproto, &infow)) { type = infow.iSocketType; @@ -6028,6 +6044,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } + /* + Windows has an extension to the IPX protocol that allows to create sockets + and set the IPX packet type at the same time, to do that a caller will use + a protocol like NSPROTO_IPX + <PACKET TYPE> + */ + if (IS_IPX_PROTO(protocol)) + ipxptype = protocol - WS_NSPROTO_IPX; + /* convert the socket family, type and protocol */ unixaf = convert_af_w2u(af); unixtype = convert_socktype_w2u(type); @@ -6083,7 +6107,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ret) { TRACE("\tcreated %04lx\n", ret ); - return ret; + if (ipxptype > 0) + set_ipx_packettype(ret, ipxptype); + return ret; } err = GetLastError(); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7bb39f7..59c356c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -26,6 +26,8 @@ #include <windows.h> #include <winternl.h> #include <ws2tcpip.h> +#include <wsipx.h> +#include <wsnwlink.h> #include <mswsock.h> #include <mstcpip.h> #include <stdio.h> @@ -2088,6 +2090,73 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); } + + /* IPX socket tests */ + + SetLastError(0xdeadbeef); + sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0); + if (sock == INVALID_SOCKET) + { + err = WSAGetLastError(); + ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); + skip("IPX is not supported\n"); + } + else + { + WSAPROTOCOL_INFOA info; + closesocket(sock); + + trace("IPX is supported\n"); + + sock = WSASocketA(0, 0, NSPROTO_IPX, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + + /* check socket family, type and protocol */ + size = sizeof(WSAPROTOCOL_INFOA); + err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &info, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(info.iProtocol == NSPROTO_IPX, "expected protocol %d, received %d\n", + NSPROTO_IPX, info.iProtocol); + ok(info.iAddressFamily == AF_IPX, "expected family %d, received %d\n", + AF_IPX, info.iProtocol); + ok(info.iSocketType == SOCK_DGRAM, "expected type %d, received %d\n", + SOCK_DGRAM, info.iSocketType); + closesocket(sock); + + /* SOCK_STREAM does not support NSPROTO_IPX */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_IPX, SOCK_STREAM, NSPROTO_IPX, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* test extended IPX support - that is adding any number between 0 and 255 + * to the IPX protocol value will make it be used as IPX packet type */ + for(i = 0;i <= 255;i += 17) + { + SetLastError(0xdeadbeef); + sock = WSASocketA(0, 0, NSPROTO_IPX + i, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(int); + socktype = -1; + err = getsockopt(sock, NSPROTO_IPX, IPX_PTYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == i, "Wrong IPX packet type, expected %d received %d\n", + i, socktype); + + closesocket(sock); + } + } } static void test_WSADuplicateSocket(void)

1 0