January 2013 - Wine-commits

Christian Costa : dmusic: COM cleanup of IDirectMusicDownload.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 1c77528a893d1e66014be04e9d4d02d36366872d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c77528a893d1e66014be04e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Jan 9 10:22:55 2013 +0100 dmusic: COM cleanup of IDirectMusicDownload. --- dlls/dmusic/dmusic_private.h | 8 ++-- dlls/dmusic/download.c | 112 +++++++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 53 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 286b48b..ff16833 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -148,11 +148,11 @@ struct IDirectMusicDownloadedInstrumentImpl { * IDirectMusicDownloadImpl implementation structure */ struct IDirectMusicDownloadImpl { - /* IUnknown fields */ - const IDirectMusicDownloadVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicDownload IDirectMusicDownload_iface; + LONG ref; - /* IDirectMusicDownloadImpl fields */ + /* IDirectMusicDownloadImpl fields */ }; /***************************************************************************** diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index 11ab117..b306513 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -1,4 +1,5 @@ -/* IDirectMusicDownload Implementation +/* + * IDirectMusicDownload Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,72 +22,85 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface); +} + /* IDirectMusicDownloadImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) - || IsEqualIID (riid, &IID_IDirectMusicDownload)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; +static HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface(IDirectMusicDownload *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDirectMusicDownload)) + { + IDirectMusicDownload_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD iface) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); +static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) +{ + IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } -static ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); +static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface) +{ + IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + DMUSIC_UnlockModule(); - DMUSIC_UnlockModule(); - - return refCount; + return ref; } /* IDirectMusicDownloadImpl IDirectMusicDownload part: */ -static HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, void** ppvBuffer, DWORD* pdwSize) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - FIXME("(%p, %p, %p): stub\n", This, ppvBuffer, pdwSize); - return S_OK; +static HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer(IDirectMusicDownload *iface, void **buffer, DWORD *size) +{ + FIXME("(%p, %p, %p): stub\n", iface, buffer, size); + + return S_OK; } static const IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = { - IDirectMusicDownloadImpl_QueryInterface, - IDirectMusicDownloadImpl_AddRef, - IDirectMusicDownloadImpl_Release, - IDirectMusicDownloadImpl_GetBuffer + IDirectMusicDownloadImpl_QueryInterface, + IDirectMusicDownloadImpl_AddRef, + IDirectMusicDownloadImpl_Release, + IDirectMusicDownloadImpl_GetBuffer }; /* for ClassFactory */ -HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicDownloadImpl* dmdl; - - dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl)); - if (NULL == dmdl) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmdl->lpVtbl = &DirectMusicDownload_Vtbl; - dmdl->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicDownloadImpl_QueryInterface ((LPDIRECTMUSICDOWNLOAD)dmdl, lpcGUID, ppobj); +HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, IUnknown *unk_outer) +{ + IDirectMusicDownloadImpl *download; + + download = HeapAlloc(GetProcessHeap(), 0, sizeof(*download)); + if (!download) + { + *ret_iface = NULL; + return E_OUTOFMEMORY; + } + + download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; + download->ref = 1; + + return S_OK; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: c607607dc0281648281d5dd2e312b01755da4a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c607607dc0281648281d5dd2e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 8 22:49:12 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index a86dc8f..0b15c3f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-07 21:59+0300\n" +"PO-Revision-Date: 2013-01-08 22:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10398,50 +10398,40 @@ msgid "State" msgstr "Būsena" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Sąsajos" +msgstr "Sąsajos statistika" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Išsiųsta" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Gauta" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "baitai" +msgstr "Baitų" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "„Unicast“ paketų" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Ne „unicast“ paketų" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Garantijų nedavimas" +msgstr "Atmetimai" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Klaida" +msgstr "Klaidos" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Nežinomas prievadas.\n" +msgstr "Nežinomi protokolai" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: b5dc55673b84844f1e0b1a6945f233eca8df762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dc55673b84844f1e0b1a694… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 9 01:23:19 2013 +0100 po: Update German translation. --- po/de.po | 42 ++++++++++++------------------------------ 1 files changed, 12 insertions(+), 30 deletions(-) diff --git a/po/de.po b/po/de.po index 3c97cef..0b83bde 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-03 05:17+0100\n" +"PO-Revision-Date: 2013-01-09 01:25+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -8294,16 +8294,12 @@ msgid "Don't install" msgstr "Nicht installieren" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Wenn ActiveX installiert ist, hat es Vollzugriff auf ihren Computer. Klicken " -"Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " +"Eine installierte ActiveX-Komponente hat Vollzugriff auf ihren Computer. " +"Klicken Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " "vertrauen." #: urlmon.rc:48 @@ -10271,10 +10267,8 @@ msgid "Connection-specific DNS suffix" msgstr "Verbindungsspezifisches DNS-Suffix" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP-Adresse" +msgstr "IPv4 Adresse" #: ipconfig.rc:34 msgid "Hostname" @@ -10317,10 +10311,8 @@ msgid "Default gateway" msgstr "Standard Gateway" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP-Adresse" +msgstr "IPv6 Adresse" #: net.rc:27 msgid "" @@ -10473,50 +10465,40 @@ msgid "State" msgstr "Zustand" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Schnittstellen" +msgstr "Schnittstellen-Statistik" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Gesendet" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Empfangen" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" msgstr "Bytes" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Unicast Pakete" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Nicht-Unicast Pakete" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Haftungsausschluss" +msgstr "Verworfen" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "Fehler" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Unbekannter Anschluss.\n" +msgstr "Unbekannte Protokolle" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Ken Thomases : winemac: Add a custom NSApplication subclass, WineApplication.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: daf0fd75e638729240f874a39ed7a28830ff02ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0fd75e638729240f874a39… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:31 2013 -0600 winemac: Add a custom NSApplication subclass, WineApplication. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 30 +++++++++++++++++++++ dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 2082b37..38d8f7e 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ window.c OBJC_SRCS = \ + cocoa_app.m \ cocoa_display.m @MAKE_DLL_RULES@ diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h new file mode 100644 index 0000000..cc3ede3 --- /dev/null +++ b/dlls/winemac.drv/cocoa_app.h @@ -0,0 +1,30 @@ +/* + * MACDRV Cocoa application class declaration + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import <AppKit/AppKit.h> + +#include "macdrv_cocoa.h" + + +(a)interface WineApplication : NSApplication <NSApplicationDelegate> + + - (void) transformProcessToForeground; + +(a)end diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m new file mode 100644 index 0000000..ee7e2f8 --- /dev/null +++ b/dlls/winemac.drv/cocoa_app.m @@ -0,0 +1,58 @@ +/* + * MACDRV Cocoa application class + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import "cocoa_app.h" + + +(a)implementation WineApplication + + - (void) transformProcessToForeground + { + if ([self activationPolicy] != NSApplicationActivationPolicyRegular) + { + NSMenu* mainMenu; + NSMenu* submenu; + NSString* bundleName; + NSString* title; + NSMenuItem* item; + + [self setActivationPolicy:NSApplicationActivationPolicyRegular]; + [self activateIgnoringOtherApps:YES]; + + mainMenu = [[[NSMenu alloc] init] autorelease]; + + submenu = [[[NSMenu alloc] initWithTitle:@"Wine"] autorelease]; + bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; + if ([bundleName length]) + title = [NSString stringWithFormat:@"Quit %@", bundleName]; + else + title = @"Quit"; + item = [submenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; + [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + item = [[[NSMenuItem alloc] init] autorelease]; + [item setTitle:@"Wine"]; + [item setSubmenu:submenu]; + [mainMenu addItem:item]; + + [self setMainMenu:mainMenu]; + } + } + +(a)end

1 0

Ken Thomases : winemac: Convert main thread to Cocoa main loop on process attach.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 35319684d3eb0a06a94d474558d91228912d3012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35319684d3eb0a06a94d47455… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:36 2013 -0600 winemac: Convert main thread to Cocoa main loop on process attach. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_main.m | 122 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 6 ++- dlls/winemac.drv/macdrv_main.c | 14 +++-- 4 files changed, 138 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 38d8f7e..a388b9b 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ OBJC_SRCS = \ cocoa_app.m \ - cocoa_display.m + cocoa_display.m \ + cocoa_main.m @MAKE_DLL_RULES@ diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m new file mode 100644 index 0000000..d920036 --- /dev/null +++ b/dlls/winemac.drv/cocoa_main.m @@ -0,0 +1,122 @@ +/* + * MACDRV Cocoa initialization code + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import <AppKit/AppKit.h> + +#include "macdrv_cocoa.h" +#import "cocoa_app.h" + + +/* Condition values for an NSConditionLock. Used to signal between run_cocoa_app + and macdrv_start_cocoa_app so the latter knows when the former is running + the application event loop. */ +enum { + COCOA_APP_NOT_RUNNING, + COCOA_APP_RUNNING, +}; + + +/*********************************************************************** + * run_cocoa_app + * + * Transforms the main thread from merely idling in its run loop to + * being a Cocoa application running its event loop. + * + * This will be the perform callback of a custom run loop source that + * will be scheduled in the main thread's run loop from a secondary + * thread by macdrv_start_cocoa_app. This function communicates that + * it has successfully started the application by changing the condition + * of a shared NSConditionLock, passed in via the info parameter. + * + * This function never returns. It's the new permanent home of the + * main thread. + */ +static void run_cocoa_app(void* info) +{ + NSConditionLock* lock = info; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [WineApplication sharedApplication]; + [NSApp setDelegate:(WineApplication*)NSApp]; + + /* Retain the lock while we're using it, so macdrv_start_cocoa_app() + doesn't deallocate it in the middle of us unlocking it. */ + [lock retain]; + [lock lock]; + [lock unlockWithCondition:COCOA_APP_RUNNING]; + [lock release]; + + [pool release]; + + /* Never returns */ + [NSApp run]; +} + + +/*********************************************************************** + * macdrv_start_cocoa_app + * + * Tells the main thread to transform itself into a Cocoa application. + * + * Returns 0 on success, non-zero on failure. + */ +int macdrv_start_cocoa_app(void) +{ + int ret = -1; + CFRunLoopSourceRef source; + NSConditionLock* lock; + NSDate* timeLimit; + CFRunLoopSourceContext source_context = { 0 }; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + /* Make sure Cocoa is in multi-threading mode by detaching a + do-nothing thread. */ + [NSThread detachNewThreadSelector:@selector(self) + toTarget:[NSThread class] + withObject:nil]; + + lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + timeLimit = [NSDate dateWithTimeIntervalSinceNow:5]; + + source_context.info = lock; + source_context.perform = run_cocoa_app; + source = CFRunLoopSourceCreate(NULL, 0, &source_context); + + if (source && lock && timeLimit) + { + CFRunLoopAddSource(CFRunLoopGetMain(), source, kCFRunLoopCommonModes); + CFRunLoopSourceSignal(source); + CFRunLoopWakeUp(CFRunLoopGetMain()); + + if ([lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) + { + [lock unlock]; + ret = 0; + } + } + + if (source) + CFRelease(source); + [lock release]; + [pool release]; + return ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 720073e..932aa90 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -1,7 +1,7 @@ /* * MACDRV Cocoa interface declarations * - * Copyright 2011, 2012 Ken Thomases for CodeWeavers Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -104,6 +104,10 @@ struct macdrv_display { }; +/* main */ +extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN; + + /* display */ extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 17aebf6..9ee249d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -3,6 +3,7 @@ * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +21,10 @@ */ #include "config.h" -#include <stdarg.h> +#include "macdrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(macdrv); -#include "windef.h" -#include "winbase.h" -#include "winreg.h" /*********************************************************************** * MACDRV initialisation routine @@ -36,7 +36,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - /* Do attach */ + if (macdrv_start_cocoa_app()) + { + ERR("Failed to start Cocoa app main loop\n"); + ret = FALSE; + } break; case DLL_THREAD_DETACH: /* do thread detach */

1 0

Ken Thomases : winemac: Implement basic window functionality.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 8da2cb169848756ae6858c530ac52c2b11864c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da2cb169848756ae6858c530… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:44 2013 -0600 winemac: Implement basic window functionality. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_app.h | 3 + dlls/winemac.drv/cocoa_app.m | 20 ++ dlls/winemac.drv/cocoa_window.h | 25 ++ dlls/winemac.drv/cocoa_window.m | 331 +++++++++++++++++++ dlls/winemac.drv/macdrv.h | 16 + dlls/winemac.drv/macdrv_cocoa.h | 25 ++ dlls/winemac.drv/window.c | 635 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 7 + 9 files changed, 1064 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8da2cb169848756ae6858…

1 0

Alexandre Julliard : make_makefiles: Add support for Objective-C sources.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: ad16c4c0dfc45837934b319399377b98387f88d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad16c4c0dfc45837934b31939… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 13:07:19 2013 +0100 make_makefiles: Add support for Objective-C sources. --- tools/make_makefiles | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index be106c9..f408545 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -318,7 +318,7 @@ sub parse_makefile($) push @{$make{"=flags"}}, "manpage" if $var eq "MANPAGE"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -389,6 +389,7 @@ sub assign_sources_to_makefiles(@) else { if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; } + elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $name; } @@ -501,6 +502,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); + replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );

1 0

Jacek Caban : mshtml: Wine Gecko 1.9 release.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 136b738b502f6093dbe91fff6f862c406fa43b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136b738b502f6093dbe91fff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 14:21:18 2013 +0100 mshtml: Wine Gecko 1.9 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 6 ++ dlls/mshtml/navigate.c | 5 +- dlls/mshtml/nsiface.idl | 137 +++++++++++++++++++++++++++-------------- dlls/mshtml/nsio.c | 22 ++++++- 7 files changed, 123 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=136b738b502f6093dbe91…

1 0

Alexandre Julliard : winedevice: Retrieve the page size from ntdll.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 58176bba105c4e9af54f0ea9ef13fe06ce886819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58176bba105c4e9af54f0ea9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:01:48 2013 +0100 winedevice: Retrieve the page size from ntdll. --- programs/winedevice/device.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e48218e..72bc124 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -66,7 +66,7 @@ static HMODULE load_driver_module( const WCHAR *name ) { IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *imports; - size_t page_size = getpagesize(); + SYSTEM_BASIC_INFORMATION info; int i; INT_PTR delta; ULONG size; @@ -80,7 +80,8 @@ static HMODULE load_driver_module( const WCHAR *name ) /* the loader does not apply relocations to non page-aligned binaries or executables, * we have to do it ourselves */ - if (nt->OptionalHeader.SectionAlignment < page_size || + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); + if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { DWORD old; @@ -94,10 +95,10 @@ static HMODULE load_driver_module( const WCHAR *name ) while (rel < end && rel->SizeOfBlock) { void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, page_size, PAGE_EXECUTE_READWRITE, &old ); + VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); if (!rel) goto error; } /* make sure we don't try again */

1 0

Alexandre Julliard : kernel32: Retrieve the system info from ntdll on startup.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 62f22dd4e3ab4f4b21f8e6b571fd7f9ba3547020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f22dd4e3ab4f4b21f8e6b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:02:21 2013 +0100 kernel32: Retrieve the system info from ntdll on startup. --- dlls/kernel32/cpu.c | 19 +++++++++---------- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/process.c | 2 ++ dlls/kernel32/virtual.c | 18 ++++++------------ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 333e402..0ebf8f3 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -39,9 +39,10 @@ #include "winnt.h" #include "winternl.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/unicode.h" +#include "kernel_private.h" #include "wine/debug.h" -#include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -104,13 +105,11 @@ VOID WINAPI GetSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) { NTSTATUS nts; - SYSTEM_BASIC_INFORMATION sbi; SYSTEM_CPU_INFORMATION sci; TRACE("si=0x%p\n", si); - if ((nts = NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL )) != STATUS_SUCCESS || - (nts = NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) != STATUS_SUCCESS) + if ((nts = NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) != STATUS_SUCCESS) { SetLastError(RtlNtStatusToDosError(nts)); return; @@ -118,11 +117,11 @@ VOID WINAPI GetSystemInfo( si->u.s.wProcessorArchitecture = sci.Architecture; si->u.s.wReserved = 0; - si->dwPageSize = sbi.PageSize; - si->lpMinimumApplicationAddress = sbi.LowestUserAddress; - si->lpMaximumApplicationAddress = sbi.HighestUserAddress; - si->dwActiveProcessorMask = sbi.ActiveProcessorsAffinityMask; - si->dwNumberOfProcessors = sbi.NumberOfProcessors; + si->dwPageSize = system_info.PageSize; + si->lpMinimumApplicationAddress = system_info.LowestUserAddress; + si->lpMaximumApplicationAddress = system_info.HighestUserAddress; + si->dwActiveProcessorMask = system_info.ActiveProcessorsAffinityMask; + si->dwNumberOfProcessors = system_info.NumberOfProcessors; switch (sci.Architecture) { @@ -162,7 +161,7 @@ VOID WINAPI GetSystemInfo( FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0; } - si->dwAllocationGranularity = sbi.AllocationGranularity; + si->dwAllocationGranularity = system_info.AllocationGranularity; si->wProcessorLevel = sci.Level; si->wProcessorRevision = sci.Revision; } diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index feeeb55..cfc2935 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -53,6 +53,7 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) #define KERNEL32_CONSOLE_SHELL ((HANDLE)2) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; +extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR *DIR_Windows DECLSPEC_HIDDEN; extern const WCHAR *DIR_System DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3a88aaa..8fcf67b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -87,6 +87,7 @@ static BOOL is_wow64; static const int is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; +SYSTEM_BASIC_INFORMATION system_info = { 0 }; const WCHAR *DIR_Windows = NULL; const WCHAR *DIR_System = NULL; @@ -1146,6 +1147,7 @@ void CDECL __wine_kernel_init(void) setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); LOCALE_Init(); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index bddd638..0470073 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -48,8 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); -static unsigned int page_size; - /*********************************************************************** * VirtualAlloc (KERNEL32.@) @@ -648,19 +646,17 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; - - if (!page_size) page_size = getpagesize(); __TRY { volatile const char *p = ptr; char dummy __attribute__((unused)); UINT count = size; - while (count > page_size) + while (count > system_info.PageSize) { dummy = *p; - p += page_size; - count -= page_size; + p += system_info.PageSize; + count -= system_info.PageSize; } dummy = p[0]; dummy = p[count - 1]; @@ -692,18 +688,16 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; - - if (!page_size) page_size = getpagesize(); __TRY { volatile char *p = ptr; UINT count = size; - while (count > page_size) + while (count > system_info.PageSize) { *p |= 0; - p += page_size; - count -= page_size; + p += system_info.PageSize; + count -= system_info.PageSize; } p[0] |= 0; p[count - 1] |= 0;

1 0