September 2011 - Wine-commits

Michael Stefaniuc : shell32: Pass the object instead of the iface to helper functions.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 87b3644256fb822540234dd689f488abc91f8069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b3644256fb822540234dd68… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 26 11:58:35 2011 +0200 shell32: Pass the object instead of the iface to helper functions. --- dlls/shell32/shellpath.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b35cbbf..25ba4be 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3333,10 +3333,9 @@ static HRESULT WINAPI knownfolder_QueryInterface( } static HRESULT knownfolder_set_id( - IKnownFolder *iface, + struct knownfolder *knownfolder, const KNOWNFOLDERID *kfid) { - struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HKEY hKey; HRESULT hr; @@ -3636,7 +3635,7 @@ static const struct IKnownFolderVtbl knownfolder_vtbl = knownfolder_GetFolderDefinition }; -static HRESULT knownfolder_create( void **ppv ) +static HRESULT knownfolder_create( struct knownfolder **knownfolder ) { struct knownfolder *kf; @@ -3648,9 +3647,9 @@ static HRESULT knownfolder_create( void **ppv ) memset( &kf->id, 0, sizeof(kf->id) ); kf->registryPath = NULL; - *ppv = &kf->IKnownFolder_iface.lpVtbl; + *knownfolder = kf; - TRACE("returning iface %p\n", *ppv); + TRACE("returning iface %p\n", &kf->IKnownFolder_iface); return S_OK; } @@ -3783,6 +3782,7 @@ static HRESULT WINAPI foldermanager_GetFolder( IKnownFolder **ppkf) { struct foldermanager *fm = impl_from_IKnownFolderManager( iface ); + struct knownfolder *kf; HRESULT hr; TRACE("%s, %p\n", debugstr_guid(rfid), ppkf); @@ -3792,9 +3792,14 @@ static HRESULT WINAPI foldermanager_GetFolder( WARN("unknown folder\n"); return E_INVALIDARG; } - hr = knownfolder_create( (void **)ppkf ); + hr = knownfolder_create( &kf ); if (SUCCEEDED( hr )) - hr = knownfolder_set_id( *ppkf, rfid ); + { + hr = knownfolder_set_id( kf, rfid ); + *ppkf = &kf->IKnownFolder_iface; + } + else + *ppkf = NULL; return hr; }

1 0

André Hentschel : gdi32: Add traces for the gamma functions.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 3373e1e587720e11c441ad88c3a0c67a710151e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3373e1e587720e11c441ad88c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 21:22:52 2011 +0200 gdi32: Add traces for the gamma functions. --- dlls/gdi32/dc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 65cc3f7..b50ea70 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1286,6 +1286,7 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) BOOL ret = FALSE; DC *dc = get_dc_ptr( hDC ); + TRACE("%p, %p\n", hDC, ptr); if( dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); @@ -1303,6 +1304,7 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) BOOL ret = FALSE; DC *dc = get_dc_ptr( hDC ); + TRACE("%p, %p\n", hDC, ptr); if( dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); @@ -1317,7 +1319,7 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) */ HCOLORSPACE WINAPI GetColorSpace(HDC hdc) { -/*FIXME Need to to whatever GetColorSpace actually does */ +/*FIXME Need to do whatever GetColorSpace actually does */ return 0; }

1 0

André Hentschel : wer: Add stub for WerReportAddDump.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 504931d8618ba3996e17f132f5f628863540271f URL: http://source.winehq.org/git/wine.git/?a=commit;h=504931d8618ba3996e17f132f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:31:11 2011 +0200 wer: Add stub for WerReportAddDump. --- dlls/wer/main.c | 29 +++++++++++++++++++++++++++++ dlls/wer/wer.spec | 2 +- include/werapi.h | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 0d43c0e..d68d652 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -170,6 +170,35 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) } /*********************************************************************** + * WerReportAddDump (wer.@) + * + * Add a dump of dumpType to hReportHandle. + * + * PARAMS + * hReportHandle [i] error reporting handle to add the dump + * hProcess [i] handle to the regarding process + * hThread [o] handle to the regarding thread + * dumpType [i] type of the dump + * pExceptionParam [o] pointer to a WER_EXCEPTION_INFORMATION + * pDumpCustomOptions [o] pointer to a WER_DUMP_CUSTOM_OPTIONS + * dwFlags [i] flag to control the heap dump + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE hThread, + WER_DUMP_TYPE dumpType, PWER_EXCEPTION_INFORMATION pExceptionParam, + PWER_DUMP_CUSTOM_OPTIONS pDumpCustomOptions, DWORD dwFlags) +{ + FIXME("(%p, %p, %p, %d, %p, %p, %u) :stub\n", hReportHandle, hProcess, hThread, dumpType, + pExceptionParam, pDumpCustomOptions, dwFlags); + + return E_NOTIMPL; +} + +/*********************************************************************** * WerReportCloseHandle (wer.@) * * Close an error reporting handle and free associated resources diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index 4303c20..bfc39e4 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -63,7 +63,7 @@ @ stub WerpSvcReportFromMachineQueue @ stdcall WerAddExcludedApplication(wstr long) @ stdcall WerRemoveExcludedApplication(wstr long) -@ stub WerReportAddDump +@ stdcall WerReportAddDump(ptr ptr ptr long ptr ptr long) @ stub WerReportAddFile @ stdcall WerReportCloseHandle(ptr) @ stdcall WerReportCreate(wstr long ptr ptr) diff --git a/include/werapi.h b/include/werapi.h index 2486d3d..e8ec487 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -54,6 +54,9 @@ extern "C" { #define WER_SUBMIT_ARCHIVE_PARAMETERS_ONLY 0x1000 #define WER_SUBMIT_REPORT_MACHINE_ID 0x2000 +#define WER_MAX_PREFERRED_MODULES 128 +#define WER_MAX_PREFERRED_MODULES_BUFFER 256 + /* #### */ typedef HANDLE HREPORT; @@ -110,6 +113,38 @@ typedef enum _WER_SUBMIT_RESULT WerCustomAction } WER_SUBMIT_RESULT, *PWER_SUBMIT_RESULT; +typedef enum _WER_DUMP_TYPE +{ + WerDumpTypeMicroDump = 1, + WerDumpTypeMiniDump, + WerDumpTypeHeapDump, + WerDumpTypeMax +} WER_DUMP_TYPE; + +/* #### */ + +typedef struct _WER_DUMP_CUSTOM_OPTIONS +{ + DWORD dwSize; + DWORD dwMask; + DWORD dwDumpFlags; + BOOL bOnlyThisThread; + DWORD dwExceptionThreadFlags; + DWORD dwOtherThreadFlags; + DWORD dwExceptionThreadExFlags; + DWORD dwOtherThreadExFlags; + DWORD dwPreferredModuleFlags; + DWORD dwOtherModuleFlags; + WCHAR wzPreferredModuleList[WER_MAX_PREFERRED_MODULES_BUFFER]; + +} WER_DUMP_CUSTOM_OPTIONS, *PWER_DUMP_CUSTOM_OPTIONS; + +typedef struct _WER_EXCEPTION_INFORMATION +{ + PEXCEPTION_POINTERS pExceptionPointers; + BOOL bClientPointers; +} WER_EXCEPTION_INFORMATION, *PWER_EXCEPTION_INFORMATION; + /* #### */ HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL);

1 0

Francois Gouget : oleview: Separate the file filters with a space.
by Alexandre Julliard 26 Sep '11

26 Sep '11

1 0

Michael Stefaniuc : wineqtdecoder: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 64f2dad59866b8c4c30ad2ce7bc27cd6a1e32fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f2dad59866b8c4c30ad2ce7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:30:03 2011 +0200 wineqtdecoder: Use FAILED instead of !SUCCEEDED. --- dlls/wineqtdecoder/qtsplitter.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c50afd3..394fc40 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -922,7 +922,7 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) if (trk) hr = QT_Process_Video_Track(filter, trk); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; trk = GetMovieIndTrackType(filter->pQTMovie, 1, AudioMediaCharacteristic, movieTrackCharacteristic | movieTrackEnabledOnly); @@ -959,14 +959,14 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, hr = VFW_E_INVALID_DIRECTION; } - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { LeaveCriticalSection(This->pin.pCritSec); return hr; } hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { LeaveCriticalSection(This->pin.pCritSec); TRACE("Input source is not an AsyncReader\n"); @@ -976,7 +976,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, LeaveCriticalSection(This->pin.pCritSec); EnterCriticalSection(&((QTSplitter *)This->pin.pinInfo.pFilter)->filter.csFilter); hr = QT_Process_Movie((QTSplitter *)This->pin.pinInfo.pFilter); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { LeaveCriticalSection(&((QTSplitter *)This->pin.pinInfo.pFilter)->filter.csFilter); TRACE("Unable to process movie\n");

1 0

Michael Stefaniuc : oleaut32/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: a2e5b5071140c04e32496b900cac213a2763b9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e5b5071140c04e32496b900… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:31:20 2011 +0200 oleaut32/tests: Use FAILED instead of !SUCCEEDED. --- dlls/oleaut32/tests/tmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c2fa3b4..8161689 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -495,12 +495,12 @@ static HRESULT WINAPI Widget_VariantCArray( for (i = 0; i < count; i++) { VariantInit(&res); hr = VarAdd(&values[i], &inc, &res); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { ok(0, "VarAdd failed at %u with error 0x%x\n", i, hr); return hr; } hr = VariantCopy(&values[i], &res); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { ok(0, "VariantCopy failed at %u with error 0x%x\n", i, hr); return hr; }

1 0

Michael Stefaniuc : wshom.ocx: Don't bother with a FIXME in DllCanUnloadNow ().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: e0f763abf98f6fee20a1ecd85ae96836440443e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f763abf98f6fee20a1ecd85… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:32:28 2011 +0200 wshom.ocx: Don't bother with a FIXME in DllCanUnloadNow(). --- dlls/wshom.ocx/wshom_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 2e6016c..b05eb86 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -115,7 +115,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); return S_FALSE; }

1 0

Michael Stefaniuc : ieframe: Don't open code CONTAINING_RECORD().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: c955f038869eff08387b2d63f50322b76d69bccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c955f038869eff08387b2d63f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:33:28 2011 +0200 ieframe: Don't open code CONTAINING_RECORD(). --- dlls/ieframe/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 846e133..17a13ec 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -77,7 +77,7 @@ static inline InternetShortcut* impl_from_IPersistFile(IPersistFile *iface) static inline InternetShortcut* impl_from_IPropertySetStorage(IPropertySetStorage *iface) { - return (InternetShortcut*)((char*)iface - FIELD_OFFSET(InternetShortcut, IPropertySetStorage_iface)); + return CONTAINING_RECORD(iface, InternetShortcut, IPropertySetStorage_iface); } static BOOL run_winemenubuilder( const WCHAR *args )

1 0

Michael Stefaniuc : krnl386.exe16: Don't open code CONTAINING_RECORD().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 2ce0957e210174a3be681ada0605b638013819cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0957e210174a3be681ada0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:45:35 2011 +0200 krnl386.exe16: Don't open code CONTAINING_RECORD(). --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index c6c28a3..feb882b 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -223,7 +223,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { /* unwinding: restore the stack pointer in the TEB, and leave the Win16 mutex */ - STACK32FRAME *frame32 = (STACK32FRAME *)((char *)frame - offsetof(STACK32FRAME,frame)); + STACK32FRAME *frame32 = CONTAINING_RECORD(frame, STACK32FRAME, frame); NtCurrentTeb()->WOW32Reserved = (void *)frame32->frame16; _LeaveWin16Lock(); }

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Turkish translation .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 9c0085aa26d865dd2022805af8bc9acab367332f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0085aa26d865dd2022805af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 02:28:16 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Turkish translation. --- po/tr.po | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index b69b3c8..07c3fce 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2468,9 +2468,8 @@ msgid "Invalid drive\n" msgstr "Geçersiz Sözdizimi" #: winerror.mc:106 -#, fuzzy msgid "Can't delete current directory\n" -msgstr "CHDIR hakkında yardım\n" +msgstr "" #: winerror.mc:111 msgid "Not same device\n" @@ -8048,12 +8047,14 @@ msgstr "" "kendisini çağıran tarafından miras alınır.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "CD hakkında yardım\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "CHDIR hakkında yardım\n" @@ -8062,22 +8063,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS konsol ekranını temizler\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "COPY hakkında yardım\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "CTTY hakkında yardım\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "DATE hakkında yardım\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "DEL hakkında yardım\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "DIR hakkında yardım\n" @@ -8102,6 +8108,7 @@ msgstr "" "getirerek engelleyebilirsiniz.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE hakkında yardım\n" @@ -8147,6 +8154,7 @@ msgstr "" "GOTO komutunun etkileşimli olarak kullanımının bir etkisi yoktur.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8188,10 +8196,12 @@ msgstr "" "Disk bölüm etiketini VOL komutu ile gösterebilirsiniz.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "MD hakkında yardım\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR hakkında yardım\n" @@ -8301,6 +8311,7 @@ msgstr "" "açıklama olarak kullanılabilir.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "REN hakkında yardım\n" @@ -8310,10 +8321,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME hakkında yardım\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "RD hakkında yardım\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "RMDIR hakkında yardım\n" @@ -8363,6 +8376,7 @@ msgstr "" "çağrıldığında bir etkisi yoktur.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "TIME hakkında yardım\n" @@ -8403,6 +8417,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER kullandığınız cmd sürümünü gösterir\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "VOL hakkında yardım\n"

1 0