December 2012 - Wine-commits

Jacek Caban : atl: Changed AtlModuleInit FIXME to TRACE.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: dc160df8e92e3d94a3141db06cd6e948f359bdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc160df8e92e3d94a3141db06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 15:19:17 2012 +0100 atl: Changed AtlModuleInit FIXME to TRACE. --- dlls/atl/atl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index b6447ff..41b33ce 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -53,7 +53,7 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE INT i; UINT size; - FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + TRACE("(%p %p %p)\n", pM, p, h); size = pM->cbSize; switch (size)

1 0

Jacek Caban : atl: Added locking to AtlModuleExtractCreateWndData.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: 8dc7a72a145ba8026c0745f21e8e275675e36e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc7a72a145ba8026c0745f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 15:19:26 2012 +0100 atl: Added locking to AtlModuleExtractCreateWndData. --- dlls/atl/atl_main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 41b33ce..5ef083e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -440,27 +440,32 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData /*********************************************************************** * AtlModuleExtractCreateWndData [ATL.@] * - * NOTE: I failed to find any good description of this function. - * Tests show that this function extracts one of _AtlCreateWndData + * NOTE: Tests show that this function extracts one of _AtlCreateWndData * records from the current thread from a list * */ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) { _AtlCreateWndData **ppData; + void *ret = NULL; TRACE("(%p)\n", pM); + EnterCriticalSection(&pM->m_csWindowCreate); + for(ppData = &pM->m_pCreateWndList; *ppData!=NULL; ppData = &(*ppData)->m_pNext) { if ((*ppData)->m_dwThreadID == GetCurrentThreadId()) { _AtlCreateWndData *pData = *ppData; *ppData = pData->m_pNext; - return pData->m_pThis; + ret = pData->m_pThis; + break; } } - return NULL; + + LeaveCriticalSection(&pM->m_csWindowCreate); + return ret; } /***********************************************************************

1 0

Maarten Lankhorst : dsound: Use a thread instead of a timer for greater precision.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: f5abeb8471df40819679982b03177acd7d82b763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5abeb8471df40819679982b0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 19 10:30:04 2012 +0100 dsound: Use a thread instead of a timer for greater precision. --- dlls/dsound/dsound.c | 21 +++++++++++---------- dlls/dsound/dsound_private.h | 7 ++++--- dlls/dsound/mixer.c | 39 +++++++++++++++++++++++---------------- dlls/dsound/primary.c | 27 ++++++++++++++++++++++++--- 4 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ac85ba2..381d0e1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -670,14 +670,13 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) TRACE("(%p) ref was %u\n", device, ref + 1); if (!ref) { int i; - timeKillEvent(device->timerID); - timeEndPeriod(DS_TIME_RES); - /* The kill event should have allowed the timer process to expire - * but try to grab the lock just in case. Can't hold lock because - * secondarybuffer_destroy also grabs the lock */ - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); - RtlReleaseResource(&(device->buffer_list_lock)); + SetEvent(device->sleepev); + if (device->thread) { + WaitForSingleObject(device->thread, INFINITE); + CloseHandle(device->thread); + } + CloseHandle(device->sleepev); EnterCriticalSection(&DSOUND_renderers_lock); list_remove(&device->entry); @@ -813,6 +812,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->mmdevice = mmdevice; device->guid = devGUID; + device->sleepev = CreateEventW(0, 0, 0, 0); hr = DSOUND_ReopenDevice(device, FALSE); if (FAILED(hr)) @@ -869,9 +869,10 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG ZeroMemory(&device->volpan, sizeof(device->volpan)); hr = DSOUND_PrimaryCreate(device); - if (hr == DS_OK) - device->timerID = DSOUND_create_timer(DSOUND_timer, (DWORD_PTR)device); - else + if (hr == DS_OK) { + device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); + SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); + } else WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); *ppDevice = device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 62656a5..1a3900c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -68,9 +68,9 @@ struct DirectSoundDevice GUID guid; DSCAPS drvcaps; - DWORD priolevel; + DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; + UINT playing_offs_bytes, in_mmdev_bytes, prebuf; DWORD fraglen; LPBYTE buffer; DWORD writelead, buflen, state, playpos, mixpos; @@ -97,6 +97,7 @@ struct DirectSoundDevice IAudioStreamVolume *volume; IAudioRenderClient *render; + HANDLE sleepev, thread; struct list entry; }; @@ -226,7 +227,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot) DECLSPEC_HIDDEN; -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) DECLSPEC_HIDDEN; +DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; /* sound3d.c */ diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 84e029b..282808e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -820,7 +820,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_PrimaryStop(device); } - } else { + } else if (device->state != STATE_STOPPED) { DSOUND_WaveQueue(device, TRUE); @@ -843,22 +843,29 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* **** */ } -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, - DWORD_PTR dw1, DWORD_PTR dw2) +DWORD CALLBACK DSOUND_mixthread(void *p) { - DirectSoundDevice * device = (DirectSoundDevice*)dwUser; - DWORD start_time = GetTickCount(); - DWORD end_time; - TRACE("(%d,%d,0x%lx,0x%lx,0x%lx)\n",timerID,msg,dwUser,dw1,dw2); - TRACE("entering at %d\n", start_time); - - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); - - if (device->ref) - DSOUND_PerformMix(device); + DirectSoundDevice *dev = p; + TRACE("(%p)\n", dev); - RtlReleaseResource(&(device->buffer_list_lock)); + while (dev->ref) { + DWORD ret; - end_time = GetTickCount(); - TRACE("completed processing at %d, duration = %d\n", end_time, end_time - start_time); + /* + * Some audio drivers are retarded and won't fire after being + * stopped, add a timeout to handle this. + */ + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); + if (ret == WAIT_FAILED) + WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); + else if (ret != WAIT_OBJECT_0) + WARN("wait returned %08x!\n", ret); + if (!dev->ref) + break; + + RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + DSOUND_PerformMix(dev); + RtlReleaseResource(&(dev->buffer_list_lock)); + } + return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 3ac928b..dd810fd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -152,6 +152,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) REFERENCE_TIME prebuf_rt; WAVEFORMATEX *wfx = NULL; HRESULT hres; + REFERENCE_TIME period; + DWORD period_ms; TRACE("(%p, %d)\n", device, forcewave); @@ -192,14 +194,15 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; hres = IAudioClient_Initialize(device->client, - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - prebuf_rt, 0, device->pwfx, NULL); + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, prebuf_rt, 0, device->pwfx, NULL); if(FAILED(hres)){ IAudioClient_Release(device->client); device->client = NULL; WARN("Initialize failed: %08x\n", hres); return hres; } + IAudioClient_SetEventHandle(device->client, device->sleepev); hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, (void**)&device->render); @@ -234,6 +237,24 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } + /* Now kick off the timer so the event fires periodically */ + hres = IAudioClient_Start(device->client); + if (FAILED(hres)) + WARN("starting failed with %08x\n", hres); + + hres = IAudioClient_GetStreamLatency(device->client, &period); + if (FAILED(hres)) { + WARN("GetStreamLatency failed with %08x\n", hres); + period_ms = 10; + } else + period_ms = (period + 9999) / 10000; + TRACE("period %u ms fraglen %u prebuf %u\n", period_ms, device->fraglen, device->prebuf); + + if (period_ms < 3) + device->sleeptime = 5; + else + device->sleeptime = period_ms * 5 / 2; + return S_OK; } @@ -379,7 +400,7 @@ HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) TRACE("(%p)\n", device); hr = IAudioClient_Start(device->client); - if(FAILED(hr)){ + if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ WARN("Start failed: %08x\n", hr); return hr; }

1 0

Dmitry Timoshkov : wineps.drv: Update dmPaperWidth/ Height when dmPaperSize is being changed through UI.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 95d98d0bfc1fbf8d3d24dc235d60fcdf3228c201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d98d0bfc1fbf8d3d24dc235… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 25 12:18:33 2012 +0800 wineps.drv: Update dmPaperWidth/Height when dmPaperSize is being changed through UI. --- dlls/wineps.drv/driver.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c1e49d7..8ec51a2 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -340,10 +340,15 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, if(i >= Cursel) break; i++; } - TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); + TRACE("Setting pagesize to item %d, WinPage %d (%s), PaperSize %.2fx%.2f\n", Cursel, + ps->WinPage, ps->FullName, ps->PaperDimension->x, ps->PaperDimension->y); di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; di->dlgdm->dmPublic.dmFields |= DM_PAPERSIZE; + di->dlgdm->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points(ps->PaperDimension->x); + di->dlgdm->dmPublic.u1.s1.dmPaperLength = paper_size_from_points(ps->PaperDimension->y); + di->dlgdm->dmPublic.dmFields |= DM_PAPERLENGTH | DM_PAPERWIDTH; + if (di->dlgdm->dmPublic.dmSize >= FIELD_OFFSET(DEVMODEW, dmFormName) + CCHFORMNAME * sizeof(WCHAR)) { MultiByteToWideChar(CP_ACP, 0, ps->FullName, -1, di->dlgdm->dmPublic.dmFormName, CCHFORMNAME);

1 0

Dmitry Timoshkov : po: Correct Russian translation of Portrait/ Landscape to match other places.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 50d6583104f9f02e59ebf578d6372ead654fb194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d6583104f9f02e59ebf578d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 25 12:23:21 2012 +0800 po: Correct Russian translation of Portrait/Landscape to match other places. --- po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2e784b2..e940da4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -734,11 +734,11 @@ msgstr "&Источник:" #: comdlg32.rc:417 msgid "P&ortrait" -msgstr "&Портрет" +msgstr "&Книжная" #: comdlg32.rc:418 msgid "L&andscape" -msgstr "Л&андшафт" +msgstr "&Альбомная" #: comdlg32.rc:423 msgid "Setup Page"

1 0

Charles Davis : loader: Build with -fno-builtin.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: a6fdf73233d3df4435680d921f68089630bc9c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fdf73233d3df4435680d921… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Dec 24 09:38:06 2012 -0700 loader: Build with -fno-builtin. This prevents Clang from optimizing wld_memset() into a memset(3) call. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 41d69c7..ecc20ab 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,4 +1,5 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) +MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ main.c \

1 0

Ken Thomases : winemac.drv: Tell git' s diff engine to recognize Objective-C source files.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: ce0f9b3128cf2955b3430ff294c5de28bcf3b9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0f9b3128cf2955b3430ff29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:14 2012 -0600 winemac.drv: Tell git's diff engine to recognize Objective-C source files. --- dlls/winemac.drv/.gitattributes | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/.gitattributes b/dlls/winemac.drv/.gitattributes new file mode 100644 index 0000000..4e9525e --- /dev/null +++ b/dlls/winemac.drv/.gitattributes @@ -0,0 +1,2 @@ +*.m diff=objc +*.h diff=objc

1 0

Ken Thomases : makedep: Add support for Objective-C . m files and #import directive.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: dd2f2e4ee582a825632d43b753f62c33ecbdf299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2f2e4ee582a825632d43b75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:20 2012 -0600 makedep: Add support for Objective-C .m files and #import directive. --- tools/makedep.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2d3e5b4..c70b5a9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -653,8 +653,9 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) while (*p && isspace(*p)) p++; if (*p++ != '#') continue; while (*p && isspace(*p)) p++; - if (strncmp( p, "include", 7 )) continue; - p += 7; + if (!strncmp( p, "include", 7 )) p += 7; + else if (!strncmp( p, "import", 6 )) p += 6; + else continue; while (*p && isspace(*p)) p++; if (*p != '\"' && *p != '<' ) continue; quote = *p++; @@ -805,6 +806,7 @@ static void parse_file( INCL_FILE *pFile, int src ) else if (strendswith( pFile->filename, ".idl" )) parse_idl_file( pFile, file, 0 ); else if (strendswith( pFile->filename, ".c" ) || + strendswith( pFile->filename, ".m" ) || strendswith( pFile->filename, ".h" ) || strendswith( pFile->filename, ".l" ) || strendswith( pFile->filename, ".y" ))

1 0

Ken Thomases : makefiles: Allow use of Objective-C source files in modules.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 49dc686ae99a630460cfafcbfbbed8f43280610b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dc686ae99a630460cfafcbf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:24 2012 -0600 makefiles: Allow use of Objective-C source files in modules. --- Make.rules.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7c4a65c..38231a8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -2,6 +2,7 @@ # # Each individual makefile may define the following variables: # C_SRCS : C sources for the module +# OBJC_SRCS : Objective-C sources for the module # RC_SRCS : resource source files # EXTRA_SRCS : extra source files for make depend # EXTRA_OBJS : extra object files @@ -29,7 +30,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) @@ -47,6 +48,9 @@ filter: dummy .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< +.m.o: + $(CC) -c $(ALLCFLAGS) -o $@ $< + .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< @@ -137,7 +141,7 @@ winapi_check:: dummy # Rules for dependencies -DEPEND_SRCS = $(C_SRCS) $(RC_SRCS) $(MC_SRCS) \ +DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)

1 0

Ken Thomases : winemac.drv: Implement EnumDisplayMonitors.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 21c4fc3326eedeab996e7021235b58477227ec7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c4fc3326eedeab996e70212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:28 2012 -0600 winemac.drv: Implement EnumDisplayMonitors. --- dlls/winemac.drv/Makefile.in | 6 ++- dlls/winemac.drv/cocoa_display.m | 103 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 107 +++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 79 +++++++------------------- dlls/winemac.drv/macdrv_cocoa.h | 111 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 + 6 files changed, 352 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c4fc3326eedeab996e7…

1 0