wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Francois Gouget : testbot/web: Improve argument handling in the web methods.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 95b5ea0176af8ef17e4e262ce7e6cd31b7c80e6e URL: http://source.winehq.org/git/tools.git/?a=commit;h=95b5ea0176af8ef17e4e262c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:32 2014 +0200 testbot/web: Improve argument handling in the web methods. This standardizes the way we handle arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/web/Feedback.pl | 44 +++++++-------- testbot/web/ForgotPassword.pl | 29 +++++----- testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 76 ++++++++++++-------------- testbot/web/Login.pl | 36 ++++++------ testbot/web/Logout.pl | 12 ++-- testbot/web/PatchesList.pl | 41 ++++++-------- testbot/web/Register.pl | 48 ++++++++-------- testbot/web/ResetPassword.pl | 40 +++++++------- testbot/web/Screenshot.pl | 8 +-- testbot/web/Submit.pl | 106 +++++++++++++++++------------------- testbot/web/admin/BranchDetails.pl | 6 +- testbot/web/admin/BranchesList.pl | 11 ++-- testbot/web/admin/UserDetails.pl | 30 +++++----- testbot/web/admin/UsersList.pl | 30 +++++----- testbot/web/admin/VMDetails.pl | 13 ++--- testbot/web/admin/VMsList.pl | 24 ++++---- testbot/web/index.pl | 68 +++++++++++------------ 18 files changed, 299 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=95b5ea0176af8ef17e4e…

1 0

Francois Gouget : testbot/CGI: Improve the CGI methods argument handling.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 0e4eb3a13f794ad8c4f51947519c2af74a69e4a6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0e4eb3a13f794ad8c4f51947… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:04 2014 +0200 testbot/CGI: Improve the CGI methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 171 ++++++++++---------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 68 ++++---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 121 ++++++-------- testbot/lib/ObjectModel/CGI/FormPage.pm | 104 ++++++------ testbot/lib/ObjectModel/CGI/ItemPage.pm | 45 +++--- testbot/lib/ObjectModel/CGI/Page.pm | 105 ++++++------ testbot/lib/WineTestBot/CGI/PageBase.pm | 75 ++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 15 +- 8 files changed, 338 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=0e4eb3a13f794ad8c4f5…

1 0

Francois Gouget : testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize () method.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 6613e1526b41a50068c08147f4a65a144db37b19 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6613e1526b41a50068c08147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:28:31 2014 +0200 testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize() method. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8bbd1ae..6b2276d 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -45,7 +45,7 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize($Request, $RequiredRole); + $self->_initialize(@_); return $self; }

1 0

Francois Gouget : testbot/bin: Standardize handling of the function arguments and add prototypes.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 7533b8452fb45c9c0fe94ff145c5afd0e8d0d94a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7533b8452fb45c9c0fe94ff1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 10:56:23 2014 +0200 testbot/bin: Standardize handling of the function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. They also document which arguments are optional. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 21 +++++++++++---------- testbot/bin/build/Build.pl | 10 +++++----- testbot/bin/build/Reconfig.pl | 14 +++++++------- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 4eb2555..17b75d0 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ my %WineTestUrls = ( ); -sub AddJob +sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; @@ -140,7 +140,7 @@ sub AddJob return 1; } -sub AddReconfigJob +sub AddReconfigJob() { # First create a new job my $Jobs = CreateJobs(); diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index b2ae902..3712c4d 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -42,7 +42,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::VMs; -sub FatalError +sub FatalError($$) { my ($ErrMessage, $VM) = @_; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 5f4f1b1..c0a5057 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -43,9 +43,9 @@ use WineTestBot::Log; use WineTestBot::StepsTasks; -sub IsBotFailure +sub IsBotFailure($) { - my $ErrLine = $_[0]; + my ($ErrLine) = @_; return ($ErrLine =~ m/Can't set VM status to running/ || $ErrLine =~ m/Can't copy exe to VM/ || @@ -53,9 +53,9 @@ sub IsBotFailure $ErrLine =~ m/Can't copy generated executable from VM/); } -sub CheckErrLog +sub CheckErrLog($) { - my $ErrLogFileName = $_[0]; + my ($ErrLogFileName) = @_; my $BotFailure = !1; my $Messages = ""; @@ -82,7 +82,7 @@ sub CheckErrLog return ($BotFailure, $Messages); } -sub ReadLog +sub ReadLog($$$) { my ($LogName, $BaseName, $TestSet) = @_; @@ -127,16 +127,16 @@ sub ReadLog return \@Messages; } -sub GetLineKey +sub GetLineKey($) { - my $Line = $_[0]; + my ($Line) = @_; $Line =~ s/^([\w_.]+:)\d+(:.*)$/$1$2/; return $Line; } -sub CompareLogs +sub CompareLogs($$$$) { my ($SuiteLog, $TaskLog, $BaseName, $TestSet) = @_; @@ -166,9 +166,10 @@ sub CompareLogs return $Messages; } -sub SendLog +sub SendLog($) { - my $Job = shift; + my ($Job) = @_; + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); if (! defined($To)) { diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index ef3fece..f94b87e 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub InfoMsg +sub InfoMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -51,7 +51,7 @@ sub InfoMsg umask($oldumask); } -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -62,14 +62,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub ApplyPatch +sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; @@ -169,7 +169,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestExecutable +sub BuildTestExecutable($$$$$$$$) { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib) = @_; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index a82d879..f5ffcab 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Reconfig.log") @@ -51,14 +51,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub GitPull +sub GitPull() { system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -82,7 +82,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestAgentd +sub BuildTestAgentd() { # If testagentd already exists it's likely already running # so don't rebuild it. @@ -110,7 +110,7 @@ sub BuildTestAgentd return 1; } -sub BuildNative +sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . @@ -129,9 +129,9 @@ sub BuildNative return 1; } -sub BuildCross +sub BuildCross($) { - my $Bits = $_[0]; + my ($Bits) = @_; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits");

1 0

Huw Davies : gdi32: CLIP_DFA_DISABLE should disable the font association mechanism.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 80a29e2d31d3e1245cf1261f99c70a0fc3e26c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a29e2d31d3e1245cf1261f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 10 09:48:38 2014 +0100 gdi32: CLIP_DFA_DISABLE should disable the font association mechanism. --- dlls/gdi32/font.c | 9 ++++++--- dlls/gdi32/tests/font.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 66072af..af3ea5b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,12 +653,15 @@ static DWORD get_associated_charset_info(void) return associated_charset; } -static void update_font_code_page( DC *dc ) +static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + LOGFONTW lf; + + GetObjectW( font, sizeof(lf), &lf ); - if (charset == ANSI_CHARSET && + if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) && get_associated_charset_info() & ASSOC_CHARSET_ANSI) charset = DEFAULT_CHARSET; @@ -725,7 +728,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) ret = dc->hFont; dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; - update_font_code_page( dc ); + update_font_code_page( dc, handle ); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e978166..dd63297 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2570,6 +2570,22 @@ static void test_GdiGetCodePage(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* CLIP_DFA_DISABLE turns off the font association */ + lf.lfClipPrecision = CLIP_DFA_DISABLE; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage); + ok(codepage == 1252, "GdiGetCodePage returned %d\n", codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); } }

1 0

Jacek Caban : vbscript: Always initialize is_array value (valgrind).
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 2de2e10d47aa27321cb3ba0954105b966fee2ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de2e10d47aa27321cb3ba095… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 10 10:23:55 2014 +0200 vbscript: Always initialize is_array value (valgrind). --- dlls/vbscript/compile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e1245d6..73f0615 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1656,11 +1656,10 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) return E_OUTOFMEMORY; class_desc->props[i].is_public = prop_decl->is_public; + class_desc->props[i].is_array = prop_decl->is_array; - if(prop_decl->is_array) { - class_desc->props[i].is_array = TRUE; + if(prop_decl->is_array) class_desc->array_cnt++; - } } if(class_desc->array_cnt) {

1 0

Piotr Caban : msvcrt: Handle negative file->_cnt value in fwrite.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: b0424313fd16efea4a08732f4ed530df30d350cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0424313fd16efea4a08732f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 9 14:24:14 2014 +0200 msvcrt: Handle negative file->_cnt value in fwrite. --- dlls/msvcrt/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77a0fed..7ebf6d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3691,7 +3691,11 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si MSVCRT__lock_file(file); while(wrcnt) { - if(file->_cnt) { + if(file->_cnt < 0) { + WARN("negative file->_cnt value in %p\n", file); + file->_flag |= MSVCRT__IOERR; + break; + } else if(file->_cnt) { int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; memcpy(file->_ptr, ptr, pcnt); file->_cnt -= pcnt;

1 0

Jacek Caban : jscript: Properly handle NULL pvarResult in ParseScriptText.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 755eac8f0c722ece206eb6ad8433db6b69ce97df URL: http://source.winehq.org/git/wine.git/?a=commit;h=755eac8f0c722ece206eb6ad8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 9 14:02:35 2014 +0200 jscript: Properly handle NULL pvarResult in ParseScriptText. --- dlls/jscript/jscript.c | 3 ++- dlls/jscript/tests/run.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c56e638..4a32c4d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -783,7 +783,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, clear_ei(This->ctx); hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); if(SUCCEEDED(hres)) { - hres = jsval_to_variant(r, pvarResult); + if(pvarResult) + hres = jsval_to_variant(r, pvarResult); jsval_release(r); } exec_release(exec_ctx); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index a92282a..dbd9b6b 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1945,6 +1945,13 @@ static void test_script_exprs(void) hres = parse_script_expr("reportSuccess(); return true", &v); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script_expr("reportSuccess(); true", NULL); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + testing_expr = FALSE; }

1 0

Michael Stefaniuc : dmstyle: Move a struct definition to the .c file that uses it.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: e22458c224b6ff83c020888868b9fa25a9318bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22458c224b6ff83c02088886… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:29:47 2014 +0200 dmstyle: Move a struct definition to the .c file that uses it. --- dlls/dmstyle/dmstyle_private.h | 20 -------------------- dlls/dmstyle/style.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index bae61a0..95ad92f 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -45,8 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicStyle8Impl IDirectMusicStyle8Impl; - typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack; typedef struct IDirectMusicChordTrack IDirectMusicChordTrack; typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack; @@ -100,24 +98,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { /***************************************************************************** - * IDirectMusicStyle8Impl implementation structure - */ -struct IDirectMusicStyle8Impl { - IDirectMusicStyle8 IDirectMusicStyle8_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicStyle8Impl fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_STYLE style; - - /* data */ - struct list Motifs; - struct list Bands; -}; - -/***************************************************************************** * IDirectMusicAuditionTrack implementation structure */ struct IDirectMusicAuditionTrack { diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 2945e5d..ed40791 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleImpl implementation */ +typedef struct IDirectMusicStyle8Impl { + IDirectMusicStyle8 IDirectMusicStyle8_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_STYLE style; + struct list Motifs; + struct list Bands; +} IDirectMusicStyle8Impl; + static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface);

1 0

Michael Stefaniuc : dmcompos: Move a struct definition to the .c file that uses it.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 1aae7b0fa7be667601317b9d336023c1e37126b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aae7b0fa7be667601317b9d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:51 2014 +0200 dmcompos: Move a struct definition to the .c file that uses it. --- dlls/dmcompos/chordmap.c | 7 +++++++ dlls/dmcompos/dmcompos_private.h | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 9d2d8a9..c3483cd 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -25,6 +25,13 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicChordMapImpl implementation */ +typedef struct IDirectMusicChordMapImpl { + IDirectMusicChordMap IDirectMusicChordMap_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index d7113e5..6a80445 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -45,7 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicChordMapImpl IDirectMusicChordMapImpl; typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; @@ -58,20 +57,6 @@ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECL extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** - * IDirectMusicChordMapImpl implementation structure - */ -struct IDirectMusicChordMapImpl { - IDirectMusicChordMap IDirectMusicChordMap_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapImpl fields */ - LPDMUS_OBJECTDESC pDesc; - -}; - -/***************************************************************************** * IDirectMusicChordMapTrack implementation structure */ struct IDirectMusicChordMapTrack {

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2014