August 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : d3dx9: Avoid some needless casts.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 7175367ad5c010dfe83b921cad4ff92a626722d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175367ad5c010dfe83b921ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:47 2013 +0200 d3dx9: Avoid some needless casts. --- dlls/d3dx9_36/shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8e5236d..e3f6d5c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -328,13 +328,13 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -343,13 +343,13 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -448,13 +448,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -464,13 +464,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -534,13 +534,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages); @@ -549,13 +549,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (void **)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages);

1 0

Ken Thomases : winemac: A window is ineligible to be a Cocoa parent or child while minimized.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: fad48773f6f20efdd5d6d167bc20fa589938c816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad48773f6f20efdd5d6d167b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:58 2013 -0500 winemac: A window is ineligible to be a Cocoa parent or child while minimized. --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 512d2ff..b71d31e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1383,6 +1383,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) ignore_windowDeminiaturize = FALSE; + [self becameEligibleParentOrChild]; + if (fullscreen && [self isOnActiveSpace]) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; @@ -1483,6 +1485,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowWillMiniaturize:(NSNotification *)notification { + [self becameIneligibleParentOrChild]; + if (!ignore_windowMiniaturize) { macdrv_event* event;

1 0

Ken Thomases : winemac: Track latent child windows ( the inverse of the latent parent window relationship).
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 84903c5db33c992dff916cee3dddbbbe980f1628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84903c5db33c992dff916cee3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:56 2013 -0500 winemac: Track latent child windows (the inverse of the latent parent window relationship). This allows the relationship to be restored when the window becomes eligible again. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 78 +++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e0e581b..5cf47b4 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -32,6 +32,7 @@ BOOL fullscreen; BOOL pendingMinimize; WineWindow* latentParentWindow; + NSMutableArray* latentChildWindows; void* hwnd; WineEventQueue* queue; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1977ca0..512d2ff 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -537,6 +537,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [liveResizeDisplayTimer invalidate]; [liveResizeDisplayTimer release]; [queue release]; + [latentChildWindows release]; [latentParentWindow release]; [shape release]; [super dealloc]; @@ -679,11 +680,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([self level] > [child level]) [child setLevel:[self level]]; [self addChildWindow:child ordered:NSWindowAbove]; + [latentChildWindows removeObjectIdenticalTo:child]; child.latentParentWindow = nil; reordered = TRUE; } else + { + if (!latentChildWindows) + latentChildWindows = [[NSMutableArray alloc] init]; + if (![latentChildWindows containsObject:child]) + [latentChildWindows addObject:child]; child.latentParentWindow = self; + } return reordered; } @@ -698,15 +706,52 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self removeChildWindow:child]; if (child.latentParentWindow == self) child.latentParentWindow = nil; + [latentChildWindows removeObjectIdenticalTo:child]; } - (BOOL) becameEligibleParentOrChild { + BOOL reordered = FALSE; + NSUInteger count; + // If we aren't visible currently, we assume that we should be and soon // will be. So, if the latent parent is visible that's enough to assume // we can establish the parent-child relationship in Cocoa. That will // actually make us visible, which is fine. - return [latentParentWindow addChildWineWindow:self assumeVisible:TRUE]; + if ([latentParentWindow addChildWineWindow:self assumeVisible:TRUE]) + reordered = TRUE; + + // Here, though, we may not actually be visible yet and adding a child + // won't make us visible. The caller will have to call this method + // again after actually making us visible. + if ([self isVisible] && (count = [latentChildWindows count])) + { + NSMutableIndexSet* indexesToRemove = [NSMutableIndexSet indexSet]; + NSUInteger i; + + for (i = 0; i < count; i++) + { + WineWindow* child = [latentChildWindows objectAtIndex:i]; + if ([child isVisible]) + { + if (child.latentParentWindow == self) + { + if ([self level] > [child level]) + [child setLevel:[self level]]; + [self addChildWindow:child ordered:NSWindowAbove]; + child.latentParentWindow = nil; + reordered = TRUE; + } + else + ERR(@"shouldn't happen: %@ thinks %@ is a latent child, but it doesn't agree\n", self, child); + [indexesToRemove addIndex:i]; + } + } + + [latentChildWindows removeObjectsAtIndexes:indexesToRemove]; + } + + return reordered; } - (void) becameIneligibleParentOrChild @@ -716,6 +761,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (parent) { + if (!parent->latentChildWindows) + parent->latentChildWindows = [[NSMutableArray alloc] init]; + [parent->latentChildWindows insertObject:self atIndex:0]; self.latentParentWindow = parent; [parent removeChildWindow:self]; } @@ -723,11 +771,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([childWindows count]) { WineWindow* child; - for (child in [[childWindows copy] autorelease]) + + childWindows = [[childWindows copy] autorelease]; + for (child in childWindows) { child.latentParentWindow = self; [self removeChildWindow:child]; } + + if (latentChildWindows) + [latentChildWindows replaceObjectsInRange:NSMakeRange(0, 0) withObjectsFromArray:childWindows]; + else + latentChildWindows = [childWindows mutableCopy]; } } @@ -887,6 +942,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self orderFront:nil]; needAdjustWindowLevels = TRUE; } + + if ([self becameEligibleParentOrChild]) + needAdjustWindowLevels = TRUE; + if (needAdjustWindowLevels) { if (!wasVisible && fullscreen && [self isOnActiveSpace]) @@ -1406,7 +1465,20 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowWillClose:(NSNotification*)notification { - self.latentParentWindow = nil; + WineWindow* child; + + if (latentParentWindow) + { + [latentParentWindow->latentChildWindows removeObjectIdenticalTo:self]; + self.latentParentWindow = nil; + } + + for (child in latentChildWindows) + { + if (child.latentParentWindow == self) + child.latentParentWindow = nil; + } + [latentChildWindows removeAllObjects]; } - (void)windowWillMiniaturize:(NSNotification *)notification

1 0

Ken Thomases : winemac: Skip minimized windows when looking for z-ordering neighbor.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 315b39ec8d3ecc5b1324253046e640e48188bc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=315b39ec8d3ecc5b132425304… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:42 2013 -0500 winemac: Skip minimized windows when looking for z-ordering neighbor. --- dlls/winemac.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c4da870..5991290 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -600,14 +600,14 @@ static void show_window(struct macdrv_win_data *data) /* find window that this one must be after */ prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) prev = GetWindow(prev, GW_HWNDPREV); if (!prev_window) { /* find window that this one must be before */ next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && + while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && (next_window = macdrv_get_cocoa_window(next, TRUE)))) next = GetWindow(next, GW_HWNDNEXT); }

1 0

Alexandre Julliard : testbot: Use https URLs when SSL is enabled.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: tools Branch: master Commit: 0909a7476a8da51e7245659e736d92424be8bffc URL: http://source.winehq.org/git/tools.git/?a=commit;h=0909a7476a8da51e7245659e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:14:09 2013 +0200 testbot: Use https URLs when SSL is enabled. --- testbot/bin/WineSendLog.pl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ce69c21..aec2bee 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -424,6 +424,8 @@ EOF } } + my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; + if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); @@ -440,7 +442,7 @@ Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at EOF - print SENDMAIL "http://$WebHostName/JobDetails.pl?Key=", + print SENDMAIL "$WebSite/JobDetails.pl?Key=", $Job->GetKey(), "\n\n"; print SENDMAIL "Your paranoid android.\n\n"; @@ -468,7 +470,7 @@ EOF { print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; print $result "Job-ID: " . $Job->Id . "\n"; - print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + print $result "URL: $WebSite/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; foreach my $Key (@SortedKeys) {

1 0

Alexandre Julliard : patches: Allow specifying the directory that contains the patch data.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: tools Branch: master Commit: 4fe66f8d3a5077f6e8f96d66b113994973fb11ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=4fe66f8d3a5077f6e8f96d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:31:00 2013 +0200 patches: Allow specifying the directory that contains the patch data. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index baf2a2a..52d4d88 100755 --- a/patches/update +++ b/patches/update @@ -84,7 +84,7 @@ my @legend = "<li>The <a href=\"//testbot.winehq.org/\">testbot</a> detected new failures on Windows.</li></ul>" ], ); -my $dir = "$ENV{HOME}/patches"; +my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches;

1 0

Alexandre Julliard : patches: Add a link to the testbot job id if available .
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: tools Branch: master Commit: c0f93c48c30159c5b2359927e40dd0ee1d85a49c URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0f93c48c30159c5b2359927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:13:55 2013 +0200 patches: Add a link to the testbot job id if available. --- patches/update | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index 52d4d88..4ccc910 100755 --- a/patches/update +++ b/patches/update @@ -115,7 +115,8 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", - "<th class=\"status\">Testbot</th></tr>\n"; + "<th class=\"status\">Testbot</th>", + "<th class=\"status\">Job ID</th></tr>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -146,9 +147,21 @@ foreach my $file (readdir DIR) close ORDER; } $patch{"testbot"} = ""; + $patch{"testjob"} = ""; + $patch{"testurl"} = ""; if (-f "$dir/$file.testbot") { $patch{"testbot"} = "OK"; + if (open LOG, "<$dir/$file.testbot") + { + while (<LOG>) + { + last if /^$/; + if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } + } + close LOG; + } } if (-f "$dir/$file.testfail") { @@ -175,6 +188,16 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; } + if ($patch->{"testjob"} && $patch->{"testurl"}) + { + printf INDEX "<td class=\"%s\"><a href=\"%s\">%s</a></td>", + ($patch->{"testbot"} eq "Failed") ? " testbot botfail" : "testbot", + $patch->{"testurl"}, $patch->{"testjob"}; + } + else + { + print INDEX "<td></td>"; + } print INDEX "</tr>\n"; $row++; }

1 0

Alexandre Julliard : testbot: Add status and URL fields to the test result file.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: tools Branch: master Commit: 1c345024e5706af0bffdf7286acb11971b9f8937 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1c345024e5706af0bffdf728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:33:46 2013 +0200 testbot: Add status and URL fields to the test result file. --- testbot/bin/WineSendLog.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3c3ff8c..ce69c21 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -466,6 +466,10 @@ EOF } if (open (my $result, ">", "$BaseName.testbot")) { + print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; + print $result "Job-ID: " . $Job->Id . "\n"; + print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key);

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: docs Branch: master Commit: 1a74d640104c7d516852ea77e74d04dea658d0ca URL: http://source.winehq.org/git/docs.git/?a=commit;h=1a74d640104c7d516852ea77e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 30 09:34:03 2013 +0200 winedev: Assorted formatting & tagging fixes. Note that OLE/COM chapter needs an overhaul but that's outside the scope of this patch. --- en/winedev-ole.sgml | 352 +++++++++++++++++++++++++++------------------------ 1 files changed, 185 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=1a74d640104c7d516852e…

1 0

Jacek Caban : guiddef.h: Better GUID declaration for widl.
by Alexandre Julliard Aug. 29, 2013

Aug. 29, 2013

Module: wine Branch: master Commit: 21c395cbfac70fafb4cb54da0299efc52cf63868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c395cbfac70fafb4cb54da0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:40 2013 +0200 guiddef.h: Better GUID declaration for widl. --- include/guiddef.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index b7de1b1..36c932c 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -18,6 +18,16 @@ #ifndef GUID_DEFINED #define GUID_DEFINED + +#ifdef __WIDL__ +typedef struct +{ + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + byte Data4[ 8 ]; +} GUID; +#else typedef struct _GUID { #ifdef _MSC_VER @@ -29,6 +39,7 @@ typedef struct _GUID unsigned short Data3; unsigned char Data4[ 8 ]; } GUID; +#endif /* Macros for __uuidof emulation */ #if defined(__cplusplus) && !defined(_MSC_VER)

1 0