November 2013 - Wine-commits

Frédéric Delanoy : twain_32: Ensure FreeLibrary is called on error case (coverity).
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 8e262f87361b7d864c1d98b06fcc7dc478cbaf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e262f87361b7d864c1d98b06… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 13:50:35 2013 +0100 twain_32: Ensure FreeLibrary is called on error case (coverity). --- dlls/twain_32/dsm_ctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 09e49c8..9bbd0fa 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -75,7 +75,7 @@ twain_add_onedriver(const char *dsname) { ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId); if (ret != TWRC_SUCCESS) { ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n"); - return; + break; } TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer)); TRACE("ProductFamily: %s\n", debugstr_a(sourceId.ProductFamily));

1 0

Alexandre Julliard : makefiles: Make sure config. h is updated before building anything.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 4aea18bdc3cc634df7f7eca8a69cd8c0eb86779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aea18bdc3cc634df7f7eca8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 17:58:22 2013 +0100 makefiles: Make sure config.h is updated before building anything. --- Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 045d708..eb4d0da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,6 +67,7 @@ libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp +libs/port libs/wine libs/wpp: include/config.h # Misc rules

1 0

Francois Gouget : libport: Add an isfinite() implementation for Solaris.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: e4856dbb705b89add4936b6c17a27e6f3a395744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4856dbb705b89add4936b6c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 15:06:33 2013 +0100 libport: Add an isfinite() implementation for Solaris. --- configure | 36 ++++++++++++++++++++++++++++- configure.ac | 11 ++++++++- dlls/msvcrt/math.c | 61 +++++++++++++++++++++---------------------------- include/config.h.in | 6 ++-- include/wine/port.h | 4 +++ libs/port/Makefile.in | 1 + libs/port/isfinite.c | 46 +++++++++++++++++++++++++++++++++++++ 7 files changed, 125 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4856dbb705b89add4936…

1 0

Francois Gouget : xcopy: Add tests to show that the / D option only accepts dates in the m-d-y format.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 61358d04a4ba93410589b2bc8c2530c488f3cfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=61358d04a4ba93410589b2bc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 15:14:42 2013 +0100 xcopy: Add tests to show that the /D option only accepts dates in the m-d-y format. --- configure | 1 + configure.ac | 1 + programs/xcopy/tests/Makefile.in | 6 ++ programs/xcopy/tests/xcopy.c | 96 ++++++++++++++++++++++++++++++++++++++ programs/xcopy/xcopy.c | 7 ++- 5 files changed, 108 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5ec15e9..80348f3 100755 --- a/configure +++ b/configure @@ -17459,6 +17459,7 @@ wine_fn_config_program wscript enable_wscript clean,install wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po +wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage wine_fn_config_tool tools clean,install-dev,install-lib,manpage wine_fn_config_tool tools/widl clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index 7f3165b..81b7027 100644 --- a/configure.ac +++ b/configure.ac @@ -3414,6 +3414,7 @@ WINE_CONFIG_PROGRAM(wscript,,[clean,install]) WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) +WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in new file mode 100644 index 0000000..40a53b9 --- /dev/null +++ b/programs/xcopy/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = xcopy.exe + +C_SRCS = \ + xcopy.c + +(a)MAKE_TEST_RULES@ diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c new file mode 100644 index 0000000..4cd6b1a --- /dev/null +++ b/programs/xcopy/tests/xcopy.c @@ -0,0 +1,96 @@ +/* + * Copyright 2013 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ + +#include <windows.h> + +#include "wine/test.h" + + +static DWORD runcmd(const char* cmd) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + char* wcmd; + DWORD rc; + + /* Create a writable copy for CreateProcessA() */ + wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); + strcpy(wcmd, cmd); + rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, wcmd); + if (!rc) + return 260; + + rc = WaitForSingleObject(pi.hProcess, 5000); + if (rc == WAIT_OBJECT_0) + GetExitCodeProcess(pi.hProcess, &rc); + else + TerminateProcess(pi.hProcess, 1); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + return rc; +} + +static void test_date_format(void) +{ + DWORD rc; + + rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest"); + ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, + "xcopy should not have created xcopytest\\xcopy1\n"); + + rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); + + rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); +} + +START_TEST(xcopy) +{ + char tmpdir[MAX_PATH]; + HANDLE hfile; + + GetTempPathA(MAX_PATH, tmpdir); + SetCurrentDirectoryA(tmpdir); + trace("%s\n", tmpdir); + + CreateDirectoryA("xcopytest", NULL); + hfile = CreateFileA("xcopy1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create xcopy1 file\n"); + if (hfile == INVALID_HANDLE_VALUE) + { + skip("skipping xcopy tests\n"); + return; + } + CloseHandle(hfile); + + test_date_format(); + + DeleteFileA("xcopy1"); + RemoveDirectoryA("xcopytest"); +} diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 3967b18..e424eea 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -778,19 +778,20 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); - /* Parse the arg : Month */ + /* Microsoft's xcopy's usage implies that the date + * format depends on the locale but that false. + * It is hardcoded to month-day-year + */ st.wMonth = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; - /* Parse the arg : Day */ if (!isError) { st.wDay = _wtol(pos); while (*pos && isdigit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; } - /* Parse the arg : Year */ if (!isError) { st.wYear = _wtol(pos); while (*pos && isdigit(*pos)) pos++;

1 0

Ken Thomases : winemac: Move test for valid GL drawable into -[ WineContentView addGLContext:].
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: fd04552fe3d2acfc487192f7c6696526bd8c9950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd04552fe3d2acfc487192f7c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 27 15:32:46 2013 -0600 winemac: Move test for valid GL drawable into -[WineContentView addGLContext:]. Improves encapsulation. Avoids a round trip to the main thread. --- dlls/winemac.drv/cocoa_opengl.m | 9 ++------- dlls/winemac.drv/cocoa_window.m | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 45799db..85b3639 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,16 +123,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL viewIsValidDrawable; - macdrv_add_view_opengl_context(v, c); - OnMainThread(^{ - viewIsValidDrawable = [[view window] windowNumber] > 0 && - !NSIsEmptyRect([view visibleRect]); - }); - if (viewIsValidDrawable) + if (context.needsUpdate) { + context.needsUpdate = FALSE; [context setView:view]; [context setLatentView:nil]; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a29f20e..74fa191 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -294,8 +294,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) pendingGlContexts = [[NSMutableArray alloc] init]; - [pendingGlContexts addObject:context]; - [self setNeedsDisplay:YES]; + + if ([[self window] windowNumber] > 0 && !NSIsEmptyRect([self visibleRect])) + { + [glContexts addObject:context]; + context.needsUpdate = TRUE; + } + else + { + [pendingGlContexts addObject:context]; + [self setNeedsDisplay:YES]; + } + [(WineWindow*)[self window] updateColorSpace]; } @@ -2407,7 +2417,7 @@ void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) WineContentView* view = (WineContentView*)v; WineOpenGLContext *context = (WineOpenGLContext*)c; - OnMainThreadAsync(^{ + OnMainThread(^{ [view addGLContext:context]; });

1 0

Ken Thomases : winemac: Clear OpenGL views to black the first time a context is attached.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 4124478b8526d04b0049aae980c0674230136cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4124478b8526d04b0049aae98… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 27 15:33:19 2013 -0600 winemac: Clear OpenGL views to black the first time a context is attached. This prevents VRAM garbage from being displayed before the program draws. --- dlls/winemac.drv/cocoa_opengl.h | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 33 ++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 13 +++++++++++++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.h b/dlls/winemac.drv/cocoa_opengl.h index 60e8c16..2cdcdbd 100644 --- a/dlls/winemac.drv/cocoa_opengl.h +++ b/dlls/winemac.drv/cocoa_opengl.h @@ -25,8 +25,10 @@ { NSView* latentView; BOOL needsUpdate; + BOOL shouldClearToBlack; } @property BOOL needsUpdate; +(a)property BOOL shouldClearToBlack; @end diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 85b3639..13b9ea3 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -30,7 +30,7 @@ @implementation WineOpenGLContext -(a)synthesize latentView, needsUpdate; +(a)synthesize latentView, needsUpdate, shouldClearToBlack; - (void) dealloc { @@ -63,6 +63,32 @@ [self clearDrawable]; } + - (void) clearToBlackIfNeeded + { + if (shouldClearToBlack) + { + NSOpenGLContext* origContext = [NSOpenGLContext currentContext]; + + [self makeCurrentContext]; + + glPushAttrib(GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT); + glDrawBuffer(GL_FRONT_AND_BACK); + glDisable(GL_SCISSOR_TEST); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(0, 0, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); + glPopAttrib(); + glFlush(); + + if (origContext) + [origContext makeCurrentContext]; + else + [NSOpenGLContext clearCurrentContext]; + + shouldClearToBlack = FALSE; + } + } + @end @@ -135,6 +161,9 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:view]; [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -163,6 +192,8 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) { [context setView:context.latentView]; context.latentView = nil; + + [context clearToBlackIfNeeded]; } else [context update]; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 74fa191..6fa6ee8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -154,6 +154,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL clearedGlSurface; NSMutableAttributedString* markedText; NSRange markedTextSelection; @@ -221,7 +222,14 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif WineWindow* window = (WineWindow*)[self window]; for (WineOpenGLContext* context in pendingGlContexts) + { + if (!clearedGlSurface) + { + context.shouldClearToBlack = TRUE; + clearedGlSurface = TRUE; + } context.needsUpdate = TRUE; + } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects]; @@ -298,6 +306,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([[self window] windowNumber] > 0 && !NSIsEmptyRect([self visibleRect])) { [glContexts addObject:context]; + if (!clearedGlSurface) + { + context.shouldClearToBlack = TRUE; + clearedGlSurface = TRUE; + } context.needsUpdate = TRUE; } else

1 0

André Hentschel : winefile: Use defines instead of numbers.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: ca58cea0a5feb3852bcb7d596c97ae0ad85b9370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca58cea0a5feb3852bcb7d596… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 27 23:06:34 2013 +0100 winefile: Use defines instead of numbers. --- programs/winefile/resource.h | 2 ++ programs/winefile/winefile.rc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 83a6368..99f94aa 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -47,6 +47,8 @@ #define ID_FILE_MOVE 106 #define ID_FILE_COPY 107 #define ID_FILE_DELETE 108 +#define ID_RENAME 109 +#define ID_MKDIR 111 #define ID_FILE_EXIT 115 #define ID_CONNECT_NETWORK_DRIVE 252 #define ID_DISCONNECT_NETWORK_DRIVE 253 diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 21c1c98..758f740 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -29,12 +29,12 @@ IDM_WINEFILE MENU MENUITEM "&Move...\tF7", ID_FILE_MOVE MENUITEM "&Copy...\tF8", ID_FILE_COPY MENUITEM "&Delete\tDel", ID_FILE_DELETE - MENUITEM "Re&name...", 109 + MENUITEM "Re&name...", ID_RENAME MENUITEM "Propert&ies\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "&Run...", ID_RUN MENUITEM SEPARATOR - MENUITEM "Cr&eate Directory...", 111 + MENUITEM "Cr&eate Directory...", ID_MKDIR MENUITEM SEPARATOR MENUITEM "E&xit", ID_FILE_EXIT }

1 0

Frédéric Delanoy : winecrt0: Use BOOL type where appropriate.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 299edf3217244f1a8730eeb0fee9091654baa460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299edf3217244f1a8730eeb0f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 23:19:04 2013 +0100 winecrt0: Use BOOL type where appropriate. --- dlls/winecrt0/exe_main.c | 3 ++- dlls/winecrt0/exe_wmain.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index ec8e6d5..89ffa7b 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -27,7 +27,8 @@ int main( int argc, char *argv[] ) { STARTUPINFOA info; char *cmdline = GetCommandLineA(); - int bcount = 0, in_quotes = 0; + int bcount = 0; + BOOL in_quotes = FALSE; while (*cmdline) { diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index 0a4464f..ce685f8 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -29,7 +29,8 @@ int wmain( int argc, WCHAR *argv[] ) { STARTUPINFOW info; WCHAR *cmdline = GetCommandLineW(); - int bcount = 0, in_quotes = 0; + int bcount = 0; + BOOL in_quotes = FALSE; while (*cmdline) {

1 0

Frédéric Delanoy : winejoystick.drv: Use BOOL type where appropriate.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 39afda4f6c402ce2dc3454545057797f8cad3430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39afda4f6c402ce2dc3454545… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 23:19:05 2013 +0100 winejoystick.drv: Use BOOL type where appropriate. --- dlls/winejoystick.drv/joystick.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 577e593..00ca4e2 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); typedef struct tagWINE_JSTCK { int joyIntf; - int in_use; + BOOL in_use; /* Some extra info we need to make this actually work under the Linux 2.2 event api. First of all, we cannot keep closing and reopening the device file - @@ -129,7 +129,7 @@ static LRESULT JSTCK_drvOpen(LPSTR str, DWORD dwIntf) return 0; JSTCK_Data[dwIntf].joyIntf = dwIntf; - JSTCK_Data[dwIntf].in_use = 1; + JSTCK_Data[dwIntf].in_use = TRUE; return (LRESULT)&JSTCK_Data[dwIntf]; } @@ -142,7 +142,7 @@ static LRESULT JSTCK_drvClose(DWORD_PTR dwDevID) if (jstck == NULL) return 0; - jstck->in_use = 0; + jstck->in_use = FALSE; if (jstck->dev > 0) { close(jstck->dev);

1 0

Nikolay Sivov : include: Added IBackgroundCopyCallback2 definition.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: fb3c58903d06f6370470b1a709a900c4f09f9c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3c58903d06f6370470b1a70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:30:52 2013 +0400 include: Added IBackgroundCopyCallback2 definition. --- .gitignore | 1 + dlls/qmgrprxy/qmgrprxy.idl | 1 + include/Makefile.in | 1 + include/bits3_0.idl | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8a093ad..7cd10bb 100644 --- a/.gitignore +++ b/.gitignore @@ -156,6 +156,7 @@ include/audiopolicy.h include/austream.h include/bits.h include/bits1_5.h +include/bits3_0.h include/comcat.h include/commoncontrols.h include/config.h diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index 828bcd8..97c1da3 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -24,6 +24,7 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" +#include "bits3_0.idl" [ threading(both), diff --git a/include/Makefile.in b/include/Makefile.in index f4f1ce2..2d91150 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ PUBLIC_IDL_H_SRCS = \ austream.idl \ bits.idl \ bits1_5.idl \ + bits3_0.idl \ comcat.idl \ commoncontrols.idl \ control.idl \ diff --git a/include/bits3_0.idl b/include/bits3_0.idl new file mode 100644 index 0000000..6cf48b7 --- /dev/null +++ b/include/bits3_0.idl @@ -0,0 +1,34 @@ +/* + * Background Intelligent Transfer Service (BITS) 3.0 interface + * + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +#endif + +[ + uuid(659cdeac-489e-11d9-a9cd-000d56965251), + odl +] +interface IBackgroundCopyCallback2 : IBackgroundCopyCallback +{ + HRESULT FileTransferred([in] IBackgroundCopyJob *job, + [in] IBackgroundCopyFile *file); +}

1 0