June 2006 - Wine-Commits - list.winehq.org

Mike McCormack : wingdi: Fix typo in definition of BLTALIGNMENT ( spotted by Choe Hwanjin).
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 9985c42150582c07038ece79a0a874bef8379d9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9985c42150582c07038ece7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 18:24:11 2006 +0900 wingdi: Fix typo in definition of BLTALIGNMENT (spotted by Choe Hwanjin). --- dlls/wineps.drv/init.c | 2 +- dlls/x11drv/init.c | 2 +- include/wingdi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e754334..ca749af 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -498,7 +498,7 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE * case VREFRESH: case DESKTOPVERTRES: case DESKTOPHORZRES: - case BTLALIGNMENT: + case BLTALIGNMENT: return 0; default: FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap ); diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 937a0bb..0aa38a4 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -255,7 +255,7 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE case VREFRESH: case DESKTOPVERTRES: case DESKTOPHORZRES: - case BTLALIGNMENT: + case BLTALIGNMENT: return 0; default: FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap ); diff --git a/include/wingdi.h b/include/wingdi.h index f6acd74..eb7986e 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1634,7 +1634,7 @@ #define SCALINGFACTORY 115 #define VREFRESH 116 #define DESKTOPVERTRES 117 #define DESKTOPHORZRES 118 -#define BTLALIGNMENT 119 +#define BLTALIGNMENT 119 #define SHADEBLENDCAPS 120 #define COLORMGMTCAPS 121

1 0

Mike McCormack : msi: Fix loading of long strings.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: cfe36cc81d27d134f7bf080afce39c3fc07ec23c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfe36cc81d27d134f7bf080… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 16:58:55 2006 +0900 msi: Fix loading of long strings. --- dlls/msi/table.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 007958e..96623df 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -717,8 +717,8 @@ string_table *load_string_table( IStorag * and its the high word of the length is inserted in the null string's * reference count field. */ - if( pool[i*2-2] == 0 ) - len += pool[i*2-1] * 0x10000; + if( pool[i*2-2] == 0 && pool[i*2-1] ) + len += pool[i*2+1] * 0x10000; if( (offset + len) > datasize ) {

1 0

Mike McCormack : winmm: Undefine SW_MAX defined by linux/input. h to avoid a conflict with winuser.h.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 25f521f1b211551932b9bc7ff17d0dbb0cbd2413 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25f521f1b211551932b9bc7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 16:58:38 2006 +0900 winmm: Undefine SW_MAX defined by linux/input.h to avoid a conflict with winuser.h. --- dlls/winmm/joystick/joystick.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c index 17b86bd..094daff 100644 --- a/dlls/winmm/joystick/joystick.c +++ b/dlls/winmm/joystick/joystick.c @@ -54,6 +54,9 @@ #include <linux/ioctl.h> #endif #ifdef HAVE_LINUX_JOYSTICK_H #include <linux/joystick.h> +#ifdef SW_MAX +#undef SW_MAX +#endif #define JOYDEV_NEW "/dev/input/js%d" #define JOYDEV_OLD "/dev/js%d" #endif

1 0

Michael Stefaniuc : Yet another round of redundant NULL checks before HeapFree.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: fee72b607a66732e09f0b2802cb6e3df1146a90f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fee72b607a66732e09f0b28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 12 00:11:36 2006 +0200 Yet another round of redundant NULL checks before HeapFree. --- dlls/avifil32/acmstream.c | 12 ++++-------- dlls/avifil32/avifile.c | 13 +++++-------- dlls/avifil32/getframe.c | 8 +++----- dlls/avifil32/wavfile.c | 6 ++---- dlls/comdlg32/filedlg31.c | 2 +- dlls/dbghelp/msc.c | 2 +- dlls/ddraw/executebuffer.c | 2 +- dlls/gdi/gdiobj.c | 2 +- dlls/mciseq/mcimidi.c | 6 ++---- dlls/mpr/wnet.c | 2 +- dlls/msvfw32/msvideo_main.c | 24 ++++++++---------------- dlls/ntdll/path.c | 2 +- dlls/user/exticon.c | 4 ++-- dlls/user/listbox.c | 2 +- 14 files changed, 33 insertions(+), 54 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 92fa4ea..19dc981 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -175,14 +175,10 @@ static ULONG WINAPI ACMStream_fnRelease( acmStreamClose(This->has, 0); This->has = NULL; } - if (This->acmStreamHdr.pbSrc != NULL) { - HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); - This->acmStreamHdr.pbSrc = NULL; - } - if (This->acmStreamHdr.pbDst != NULL) { - HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); - This->acmStreamHdr.pbDst = NULL; - } + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); + This->acmStreamHdr.pbSrc = NULL; + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); + This->acmStreamHdr.pbDst = NULL; if (This->lpInFormat != NULL) { HeapFree(GetProcessHeap(), 0, This->lpInFormat); This->lpInFormat = NULL; diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 7264469..1805623 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -326,10 +326,9 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->fileextra.cb = 0; } - if (This->szFileName != NULL) { - HeapFree(GetProcessHeap(), 0, This->szFileName); - This->szFileName = NULL; - } + HeapFree(GetProcessHeap(), 0, This->szFileName); + This->szFileName = NULL; + if (This->hmmio != NULL) { mmioClose(This->hmmio, 0); This->hmmio = NULL; @@ -1565,10 +1564,8 @@ static void AVIFILE_DestructAVIStream This->idxFrames = NULL; This->nIdxFrames = 0; } - if (This->idxFmtChanges != NULL) { - HeapFree(GetProcessHeap(), 0, This->idxFmtChanges); - This->idxFmtChanges = NULL; - } + HeapFree(GetProcessHeap(), 0, This->idxFmtChanges); + This->idxFmtChanges = NULL; if (This->lpBuffer != NULL) { HeapFree(GetProcessHeap(), 0, This->lpBuffer); This->lpBuffer = NULL; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 113f80c..172a0b0 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -97,14 +97,12 @@ typedef struct _IGetFrameImpl { static void AVIFILE_CloseCompressor(IGetFrameImpl *This) { - if (This->lpOutFormat != NULL && This->lpInFormat != This->lpOutFormat) { + if (This->lpInFormat != This->lpOutFormat) { HeapFree(GetProcessHeap(), 0, This->lpOutFormat); This->lpOutFormat = NULL; } - if (This->lpInFormat != NULL) { - HeapFree(GetProcessHeap(), 0, This->lpInFormat); - This->lpInFormat = NULL; - } + HeapFree(GetProcessHeap(), 0, This->lpInFormat); + This->lpInFormat = NULL; if (This->hic != NULL) { if (This->bResize) ICDecompressExEnd(This->hic); diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 376e104..8a0f6ab 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -297,10 +297,8 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->extra.lp = NULL; This->extra.cb = 0; } - if (This->szFileName != NULL) { - HeapFree(GetProcessHeap(), 0, This->szFileName); - This->szFileName = NULL; - } + HeapFree(GetProcessHeap(), 0, This->szFileName); + This->szFileName = NULL; if (This->hmmio != NULL) { mmioClose(This->hmmio, 0); This->hmmio = NULL; diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index a283068..79141fa 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -764,7 +764,7 @@ void FD31_FreeOfnW(LPOPENFILENAMEW ofnW) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); - if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName))) + if (HIWORD(ofnW->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName); } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4f044fb..fb6b413 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -370,7 +370,7 @@ static void codeview_clear_type_table(vo for (i = 0; i < CV_MAX_MODULES; i++) { - if (cv_zmodules[i].allowed && cv_zmodules[i].defined_types) + if (cv_zmodules[i].allowed) HeapFree(GetProcessHeap(), 0, cv_zmodules[i].defined_types); cv_zmodules[i].allowed = FALSE; cv_zmodules[i].defined_types = NULL; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index bcd0f45..274c2a0 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -536,7 +536,7 @@ Main_IDirect3DExecuteBufferImpl_1_Releas TRACE("(%p/%p)->()decrementing from %lu.\n", This, iface, ref + 1); if (!ref) { - if ((This->desc.lpData != NULL) && This->need_free) + if (This->need_free) HeapFree(GetProcessHeap(),0,This->desc.lpData); HeapFree(GetProcessHeap(),0,This->vertex_data); HeapFree(GetProcessHeap(),0,This->indices); diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c index a4dfe79..24c20fc 100644 --- a/dlls/gdi/gdiobj.c +++ b/dlls/gdi/gdiobj.c @@ -732,7 +732,7 @@ BOOL GDI_FreeObject( HGDIOBJ handle, voi object->wMagic = 0; /* Mark it as invalid */ object->funcs = NULL; i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) + if (i >= 0 && i < MAX_LARGE_HANDLES) { HeapFree( GetProcessHeap(), 0, large_handles[i] ); large_handles[i] = NULL; diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 39131cc..fcf30e8 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1231,10 +1231,8 @@ static DWORD MIDI_mciRecord(UINT wDevID, TRACE("Before MIDM_UNPREPARE\n"); dwRet = midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); TRACE("After MIDM_UNPREPARE\n"); - if (midiHdr.lpData != NULL) { - HeapFree(GetProcessHeap(), 0, midiHdr.lpData); - midiHdr.lpData = NULL; - } + HeapFree(GetProcessHeap(), 0, midiHdr.lpData); + midiHdr.lpData = NULL; wmm->dwStatus = MCI_MODE_STOP; if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 60a2a29..804b457 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -653,7 +653,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScop if (ret == WN_SUCCESS) ret = WNetOpenEnumW(dwScope, dwType, dwUsage, lpNetWide, lphEnum); - if (allocated && lpNetWide) + if (allocated) HeapFree(GetProcessHeap(), 0, lpNetWide); } else diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4044ec5..5aa050a 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1004,22 +1004,14 @@ void VFWAPI ICCompressorFree(PCOMPVARS p ICClose(pc->hic); pc->hic = NULL; } - if (pc->lpbiIn != NULL) { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - pc->lpbiIn = NULL; - } - if (pc->lpBitsOut != NULL) { - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; - } - if (pc->lpBitsPrev != NULL) { - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - pc->lpBitsPrev = NULL; - } - if (pc->lpState != NULL) { - HeapFree(GetProcessHeap(), 0, pc->lpState); - pc->lpState = NULL; - } + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + pc->lpbiIn = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + pc->lpBitsOut = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + pc->lpBitsPrev = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpState); + pc->lpState = NULL; pc->dwFlags = 0; } } diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cfe7fdb..e9286a0 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -802,7 +802,7 @@ static ULONG get_full_path_helper(LPCWST if (reqsize) memcpy(buffer, ins_str, reqsize); reqsize += deplen; - if (ins_str && ins_str != tmp && ins_str != cd->Buffer) + if (ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(GetProcessHeap(), 0, ins_str); collapse_path( buffer, mark ); diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index ddc1ccd..485aef0 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -455,7 +455,7 @@ static UINT ICO_ExtractIconExW( if (nIcons == 0) { ret = iconDirCount; - if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ + if (lpiID) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); } else if (nIconIndex < iconDirCount) @@ -472,7 +472,7 @@ static UINT ICO_ExtractIconExW( pIconId[i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx1, cy1, flags); if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx2, cy2, flags); } - if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ + if (lpiID) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); for (icon = 0; icon < nIcons; icon++) diff --git a/dlls/user/listbox.c b/dlls/user/listbox.c index 0b21a39..08c1eb7 100644 --- a/dlls/user/listbox.c +++ b/dlls/user/listbox.c @@ -1652,7 +1652,7 @@ static void LISTBOX_DeleteItem( LB_DESCR dis.itemData = descr->items[index].data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - if (HAS_STRINGS(descr) && descr->items[index].str) + if (HAS_STRINGS(descr)) HeapFree( GetProcessHeap(), 0, descr->items[index].str ); }

1 0

Alexandre Julliard : msvcrt: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 24beabfd4e1951409c2dc237a9d49e730303c463 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24beabfd4e1951409c2dc23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 11:21:19 2006 +0200 msvcrt: Explicitly specify CDECL calling convention on exported functions. --- dlls/msvcrt/console.c | 16 ++- dlls/msvcrt/cpp.c | 20 ++-- dlls/msvcrt/cppexcept.c | 26 +++-- dlls/msvcrt/ctype.c | 42 ++++----- dlls/msvcrt/data.c | 46 +++++---- dlls/msvcrt/dir.c | 64 ++++++------- dlls/msvcrt/environ.c | 8 +- dlls/msvcrt/errno.c | 14 +-- dlls/msvcrt/except.c | 30 +++--- dlls/msvcrt/exit.c | 22 ++-- dlls/msvcrt/file.c | 232 ++++++++++++++++++++++++----------------------- dlls/msvcrt/heap.c | 44 ++++----- dlls/msvcrt/locale.c | 24 ++--- dlls/msvcrt/lock.c | 4 - dlls/msvcrt/main.c | 2 dlls/msvcrt/math.c | 146 +++++++++++++++--------------- dlls/msvcrt/mbcs.c | 122 ++++++++++++------------- dlls/msvcrt/misc.c | 24 ++--- dlls/msvcrt/process.c | 52 +++++------ dlls/msvcrt/scanf.c | 14 +-- dlls/msvcrt/string.c | 22 ++-- dlls/msvcrt/thread.c | 8 +- dlls/msvcrt/time.c | 48 +++++----- dlls/msvcrt/undname.c | 12 +- dlls/msvcrt/wcs.c | 60 ++++++------ 25 files changed, 551 insertions(+), 551 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=24beabfd4e1951409c2…

1 0

Alexandre Julliard : oledlg: Declare varargs functions as WINAPIV instead of cdecl.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 28bbdf116cadba3e5436f78fa811ec2761c1af20 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28bbdf116cadba3e5436f78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 11:18:15 2006 +0200 oledlg: Declare varargs functions as WINAPIV instead of cdecl. --- dlls/oledlg/oledlg_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 4e373f8..c7daf5f 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -245,7 +245,7 @@ BOOL WINAPI OleUIUpdateLinksW( /*********************************************************************** * OleUIPromptUserA (OLEDLG.10) */ -INT __cdecl OleUIPromptUserA( +INT WINAPIV OleUIPromptUserA( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent); @@ -256,7 +256,7 @@ INT __cdecl OleUIPromptUserA( /*********************************************************************** * OleUIPromptUserW (OLEDLG.13) */ -INT __cdecl OleUIPromptUserW( +INT WINAPIV OleUIPromptUserW( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);

1 0

Alexandre Julliard : avifil32: Declare varargs functions as WINAPIV instead of cdecl.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 1db7a349c987ddc2800389617619913b43bec0dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1db7a349c987ddc28003896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 11:18:09 2006 +0200 avifil32: Declare varargs functions as WINAPIV instead of cdecl. --- dlls/avifil32/api.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index c53b724..03cb983 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2315,7 +2315,7 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAV return AVIERR_UNSUPPORTED; } -HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, +HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, @@ -2324,7 +2324,7 @@ HRESULT CDECL AVISaveA(LPCSTR szFile, CL return AVIERR_UNSUPPORTED; } -HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, +HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_w(szFile), pclsidHandler, lpfnCallback,

1 0

Mike McCormack : userenv: Add profinfo.h.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 4a2d96077e20c9e4c1008004ada4c896fe7be1ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a2d96077e20c9e4c100800… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:34:23 2006 +0900 userenv: Add profinfo.h. --- dlls/userenv/userenv_main.c | 12 +---------- include/Makefile.in | 1 + include/profinfo.h | 47 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 include/profinfo.h diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index e5e1334..9c55874 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "profinfo.h" #include "wine/debug.h" @@ -78,17 +79,6 @@ BOOL WINAPI GetProfilesDirectoryW( LPWST return FALSE; } -typedef struct _PROFILEINFOA { - DWORD dwSize; - DWORD dwFlags; - LPSTR lpUserName; - LPSTR lpProfilePath; - LPSTR lpDefaultPath; - LPSTR lpServerName; - LPSTR lpPolicyPath; - HANDLE hProfile; -} PROFILEINFOA, *LPPROFILEINFOA; - BOOL WINAPI LoadUserProfileA( HANDLE hToken, LPPROFILEINFOA lpProfileInfo ) { FIXME("%p %p\n", hToken, lpProfileInfo ); diff --git a/include/Makefile.in b/include/Makefile.in index 49e4a0e..75d928d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -219,6 +219,7 @@ WINDOWS_INCLUDES = \ pktdef.h \ poppack.h \ powrprof.h \ + profinfo.h \ prsht.h \ psapi.h \ pshpack1.h \ diff --git a/include/profinfo.h b/include/profinfo.h new file mode 100644 index 0000000..e8f4d55 --- /dev/null +++ b/include/profinfo.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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 + */ + +#ifndef __WINE_PROFINFO_H +#define __WINE_PROFINFO_H + +typedef struct _PROFILEINFOA { + DWORD dwSize; + DWORD dwFlags; + LPSTR lpUserName; + LPSTR lpProfilePath; + LPSTR lpDefaultPath; + LPSTR lpServerName; + LPSTR lpPolicyPath; + HANDLE hProfile; +} PROFILEINFOA, *LPPROFILEINFOA; + +typedef struct _PROFILEINFOW { + DWORD dwSize; + DWORD dwFlags; + LPWSTR lpUserName; + LPWSTR lpProfilePath; + LPWSTR lpDefaultPath; + LPWSTR lpServerName; + LPWSTR lpPolicyPath; + HANDLE hProfile; +} PROFILEINFOW, *LPPROFILEINFOW; + +DECL_WINELIB_TYPE_AW(PROFILEINFO) +DECL_WINELIB_TYPE_AW(LPPROFILEINFO) + +#endif /* __WINE_PROFINFO_H */

1 0

Ivan Gyurdiev : wined3d: Fix params for DP2ADD/TEXLDD.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 45dbb78d733ef99c6acf57ef051aad581a424c28 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45dbb78d733ef99c6acf57e… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 06:58:33 2006 -0400 wined3d: Fix params for DP2ADD/TEXLDD. DP2ADD is valid on pshaders 2.0 and above, has 4 parameters. TEXLDD is valid on pshaders 2.x and above, has 5 parameters. --- dlls/wined3d/pixelshader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index d1b71f9..60bbfaf 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -590,7 +590,7 @@ static void pshader_defi(WINED3DSHADERVE FIXME(" : Stub\n"); } -static void pshader_dp2add(WINED3DSHADERVECTOR* d) { +static void pshader_dp2add(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) { FIXME(" : Stub\n"); } @@ -602,7 +602,7 @@ static void pshader_dsy(WINED3DSHADERVEC FIXME(" : Stub\n"); } -static void pshader_texldd(WINED3DSHADERVECTOR* d) { +static void pshader_texldd(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) { FIXME(" : Stub\n"); } @@ -676,7 +676,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_SINCOS, "sincos", NULL, 1, 4, pshader_sincos2, NULL, NULL, D3DPS_VERSION(2,0), D3DPS_VERSION(2,0)}, {D3DSIO_SINCOS, "sincos", NULL, 1, 2, pshader_sincos3, NULL, NULL, D3DPS_VERSION(3,0), -1}, /* TODO: dp2add can be made out of multiple instuctions */ - {D3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 1, 2, pshader_dp2add, NULL, NULL, 0, 0}, + {D3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 1, 4, pshader_dp2add, NULL, NULL, D3DPS_VERSION(2,0), -1}, /* Matrix */ {D3DSIO_M4x4, "m4x4", "undefined", 1, 3, pshader_m4x4, NULL, shader_glsl_mnxn, 0, 0}, @@ -738,7 +738,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI /* TODO: dp2add can be made out of multiple instuctions */ {D3DSIO_DSX, "dsx", GLNAME_REQUIRE_GLSL, 1, 2, pshader_dsx, NULL, NULL, 0, 0}, {D3DSIO_DSY, "dsy", GLNAME_REQUIRE_GLSL, 1, 2, pshader_dsy, NULL, NULL, 0, 0}, - {D3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 1, 2, pshader_texldd, NULL, NULL, 0, 0}, + {D3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 1, 5, pshader_texldd, NULL, NULL, D3DPS_VERSION(2,1), -1}, {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 1, 3, pshader_setp, NULL, NULL, 0, 0}, {D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 1, 2, pshader_texldl, NULL, NULL, 0, 0}, {D3DSIO_PHASE, "phase", GLNAME_REQUIRE_GLSL, 0, 0, pshader_nop, NULL, NULL, 0, 0},

1 0

Ivan Gyurdiev : wined3d: Mark instructions without a destination token.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 8c6ee8df0d7e95218e1bb850605faf1fb0a3e068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c6ee8df0d7e95218e1bb85… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jun 12 06:57:04 2006 -0400 wined3d: Mark instructions without a destination token. There are a total of 17 instructions without a destination token. Of those 9 have num_params != 0, which means that we will not process any of them correctly, because we assume the first token (if present) is a destination token. Those are basically all the flow control instructions, which we plan to support very soon. They have source tokens, and no destination. Add a flag that marks them up to the ins table. Use this flag in the trace pass, and generation pass. --- dlls/wined3d/baseshader.c | 70 +++++++++------- dlls/wined3d/pixelshader.c | 170 ++++++++++++++++++++-------------------- dlls/wined3d/vertexshader.c | 116 ++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 4 files changed, 183 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8c6ee8df0d7e95218e1…

1 0