February 2006 - Wine-Commits

Jan Zerebecki : wined3d: Make the returned driver version similar to windows.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: da2d1f883b410f281dfba38abfd84b9c1098283b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da2d1f883b410f281dfba38… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Feb 11 12:16:29 2006 +0100 wined3d: Make the returned driver version similar to windows. --- dlls/wined3d/directx.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f117f6f..02bd0dd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -299,6 +299,8 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine } minor = atoi(gl_string_cursor); + minor = major*100+minor; + major = 10; break; @@ -366,7 +368,7 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine minor = 9; } gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor); - TRACE_(d3d_caps)("found GL_VERSION (%s)->(0x%08lx)\n", debugstr_a(gl_string), gl_info->gl_driver_version); + TRACE_(d3d_caps)("found GL_VERSION (%s)->%i.%i->(0x%08lx)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version); /* Fill in the renderer information */ @@ -1019,7 +1021,8 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterId /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ - pIdentifier->DriverVersion->u.HighPart = 0xa; + /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */ + pIdentifier->DriverVersion->u.HighPart = MAKEDWORD_VERSION(6, 14); pIdentifier->DriverVersion->u.LowPart = This->gl_info.gl_driver_version; *(pIdentifier->VendorId) = This->gl_info.gl_vendor; *(pIdentifier->DeviceId) = This->gl_info.gl_card; @@ -1033,8 +1036,10 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterId strcpy(pIdentifier->Driver, "Display"); strcpy(pIdentifier->Description, "Direct3D HAL"); if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ - pIdentifier->DriverVersion->u.HighPart = 0xa; - pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(76, 76); /* last Linux Nvidia drivers */ + /* Current Windows Nvidia drivers have versions like e.g. 6.14.10.5672 */ + pIdentifier->DriverVersion->u.HighPart = MAKEDWORD_VERSION(6, 14); + /* 71.74 is a current Linux Nvidia driver version */ + pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(10, (71*100+74)); *(pIdentifier->VendorId) = VENDOR_NVIDIA; *(pIdentifier->DeviceId) = CARD_NVIDIA_GEFORCE4_TI4600; *(pIdentifier->SubSysId) = 0;

1 0

Jan Zerebecki : wined3d: Extend debug_d3drenderstate with missing states.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: 41e5478cdd2a49b4412a88307b7ec6e3fa4b08d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41e5478cdd2a49b4412a883… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Feb 11 12:15:31 2006 +0100 wined3d: Extend debug_d3drenderstate with missing states. --- dlls/wined3d/utils.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 961c2bb..90a8292 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -238,6 +238,39 @@ const char* debug_d3drenderstate(DWORD s D3DSTATE_TO_STR(WINED3DRS_BLENDOP ); D3DSTATE_TO_STR(WINED3DRS_POSITIONDEGREE ); D3DSTATE_TO_STR(WINED3DRS_NORMALDEGREE ); + D3DSTATE_TO_STR(WINED3DRS_SCISSORTESTENABLE ); + D3DSTATE_TO_STR(WINED3DRS_SLOPESCALEDEPTHBIAS ); + D3DSTATE_TO_STR(WINED3DRS_ANTIALIASEDLINEENABLE ); + D3DSTATE_TO_STR(WINED3DRS_MINTESSELLATIONLEVEL ); + D3DSTATE_TO_STR(WINED3DRS_MAXTESSELLATIONLEVEL ); + D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_X ); + D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_Y ); + D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_Z ); + D3DSTATE_TO_STR(WINED3DRS_ADAPTIVETESS_W ); + D3DSTATE_TO_STR(WINED3DRS_ENABLEADAPTIVETESSELLATION); + D3DSTATE_TO_STR(WINED3DRS_TWOSIDEDSTENCILMODE ); + D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILFAIL ); + D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILZFAIL ); + D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILPASS ); + D3DSTATE_TO_STR(WINED3DRS_CCW_STENCILFUNC ); + D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE1 ); + D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE2 ); + D3DSTATE_TO_STR(WINED3DRS_COLORWRITEENABLE3 ); + D3DSTATE_TO_STR(WINED3DRS_BLENDFACTOR ); + D3DSTATE_TO_STR(WINED3DRS_SRGBWRITEENABLE ); + D3DSTATE_TO_STR(WINED3DRS_DEPTHBIAS ); + D3DSTATE_TO_STR(WINED3DRS_WRAP8 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP9 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP10 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP11 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP12 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP13 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP14 ); + D3DSTATE_TO_STR(WINED3DRS_WRAP15 ); + D3DSTATE_TO_STR(WINED3DRS_SEPARATEALPHABLENDENABLE ); + D3DSTATE_TO_STR(WINED3DRS_SRCBLENDALPHA ); + D3DSTATE_TO_STR(WINED3DRS_DESTBLENDALPHA ); + D3DSTATE_TO_STR(WINED3DRS_BLENDOPALPHA ); #undef D3DSTATE_TO_STR default: FIXME("Unrecognized %lu render state!\n", state);

1 0

Dmitry Timoshkov : msvcrt: localtime should accept any positive time value.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: ea0e7b339751c16dca08c73cfc292a843f641bda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea0e7b339751c16dca08c73… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Feb 11 12:15:21 2006 +0100 msvcrt: localtime should accept any positive time value. --- dlls/msvcrt/time.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b2b67f1..819f905 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -152,8 +152,12 @@ struct MSVCRT_tm* MSVCRT_localtime(const SYSTEMTIME st; DWORD tzid; TIME_ZONE_INFORMATION tzinfo; + ULONGLONG time; - ULONGLONG time = *secs * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + /* time < 0 means a date before midnight of January 1, 1970 */ + if (*secs < 0) return NULL; + + time = *secs * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; ft.dwHighDateTime = (UINT)(time >> 32); ft.dwLowDateTime = (UINT)time; @@ -161,8 +165,6 @@ struct MSVCRT_tm* MSVCRT_localtime(const FileTimeToLocalFileTime(&ft, &lft); FileTimeToSystemTime(&lft, &st); - if (st.wYear < 1970) return NULL; - data->time_buffer.tm_sec = st.wSecond; data->time_buffer.tm_min = st.wMinute; data->time_buffer.tm_hour = st.wHour;

1 0

Dmitry Timoshkov : Handle ICM_CONFIGURE request in ICCVID and MSVIDC32 codecs.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: b4b3e6a165723b965af7b8352932ddf91fc404e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4b3e6a165723b965af7b83… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Feb 11 12:15:07 2006 +0100 Handle ICM_CONFIGURE request in ICCVID and MSVIDC32 codecs. --- dlls/iccvid/iccvid.c | 3 +++ dlls/msvidc32/msvideo1.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 69ccccd..a1afc2a 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -1006,6 +1006,9 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ FIXME("compression not implemented\n"); return ICERR_BADFORMAT; + case ICM_CONFIGURE: + return ICERR_UNSUPPORTED; + default: FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); } diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index a4c1193..dcd3d45 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -566,6 +566,10 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT r = ICERR_BADFORMAT; break; + case ICM_CONFIGURE: + r = ICERR_UNSUPPORTED; + break; + default: FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); }

1 0

Dmitry Timoshkov : msvfw32: Call codec' s Configure dialog if the codec supports it.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: cad998112ece02f9a768083462c60832f1cfcbb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cad998112ece02f9a768083… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Feb 11 12:14:57 2006 +0100 msvfw32: Call codec's Configure dialog if the codec supports it. Disable data rate and key frame fields if requested. --- dlls/msvideo/msvideo_main.c | 105 ++++++++++++++++++++++++++++++---------- dlls/msvideo/msvideo_private.h | 4 ++ 2 files changed, 84 insertions(+), 25 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 5f6956c..2ac5ff3 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -705,7 +705,13 @@ struct choose_compressor COMPVARS cv; }; -static BOOL enum_compressors(HWND list, COMPVARS *pcv) +struct codec_info +{ + HIC hic; + ICINFO icinfo; +}; + +static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) { UINT id, total = 0; ICINFO icinfo; @@ -714,7 +720,7 @@ static BOOL enum_compressors(HWND list, while (ICInfo(pcv->fccType, id, &icinfo)) { - ICINFO *ic; + struct codec_info *ic; DWORD idx; HIC hic; @@ -729,7 +735,7 @@ static BOOL enum_compressors(HWND list, */ DWORD fccHandler = icinfo.fccHandler; - if (pcv->lpbiIn) + if (!enum_all && pcv->lpbiIn) { if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK) { @@ -742,12 +748,12 @@ static BOOL enum_compressors(HWND list, ICGetInfo(hic, &icinfo, sizeof(icinfo)); icinfo.fccHandler = fccHandler; - ICClose(hic); idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(ICINFO)); - *ic = icinfo; + ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO)); + ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); } total++; @@ -762,22 +768,32 @@ static INT_PTR CALLBACK icm_choose_compr { case WM_INITDIALOG: { - ICINFO *ic; + struct codec_info *ic; WCHAR buf[128]; struct choose_compressor *choose_comp = (struct choose_compressor *)lparam; if (choose_comp->title) SetWindowTextA(hdlg, choose_comp->title); + if (!(choose_comp->flags & ICMF_CHOOSE_DATARATE)) + EnableWindow(GetDlgItem(hdlg, IDC_DATARATE), FALSE); + + if (!(choose_comp->flags & ICMF_CHOOSE_KEYFRAME)) + EnableWindow(GetDlgItem(hdlg, IDC_KEYFRAME), FALSE); + + /*if (!(choose_comp->flags & ICMF_CHOOSE_PREVIEW)) + EnableWindow(GetDlgItem(hdlg, IDC_PREVIEW), FALSE);*/ + LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(ICINFO)); - ic->fccType = streamtypeVIDEO; - ic->fccHandler = comptypeDIB; + ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic->icinfo.fccType = streamtypeVIDEO; + ic->icinfo.fccHandler = comptypeDIB; + ic->hic = 0; SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETITEMDATA, 0, (LPARAM)ic); - enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST), &choose_comp->cv); + enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST), &choose_comp->cv, choose_comp->flags & ICMF_CHOOSE_ALLCOMPRESSORS); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETCURSEL, 0, 0); SetFocus(GetDlgItem(hdlg, IDC_COMP_LIST)); @@ -789,28 +805,64 @@ static INT_PTR CALLBACK icm_choose_compr case WM_COMMAND: switch (LOWORD(wparam)) { + case IDC_COMP_LIST: + { + INT cur_sel; + struct codec_info *ic; + BOOL enable = FALSE; + + if (HIWORD(wparam != CBN_SELCHANGE)) + break; + + cur_sel = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); + + ic = (struct codec_info *)SendMessageW((HWND)lparam, CB_GETITEMDATA, cur_sel, 0); + if (ic && ic->hic) + { + if (ICQueryConfigure(ic->hic) == DRVCNF_OK) + enable = TRUE; + } + EnableWindow(GetDlgItem(hdlg, IDC_CONFIGURE), enable); + break; + } + + case IDC_CONFIGURE: + { + HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); + INT cur_sel; + struct codec_info *ic; + + if (HIWORD(wparam != BN_CLICKED)) + break; + + cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); + + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); + if (ic && ic->hic) + ICConfigure(ic->hic, hdlg); + + break; + } + case IDOK: { HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); INT cur_sel; - ICINFO *ic; + struct codec_info *ic; cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); - ic = (ICINFO *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); if (ic) { struct choose_compressor *choose_comp = (struct choose_compressor *)GetWindowLongPtrW(hdlg, DWLP_USER); - if (ic->fccHandler != comptypeDIB) - choose_comp->cv.hic = ICOpen(ic->fccType, ic->fccHandler, ICMODE_COMPRESS); + choose_comp->cv.hic = ic->hic; + choose_comp->cv.fccType = ic->icinfo.fccType; + choose_comp->cv.fccHandler = ic->icinfo.fccHandler; + /* FIXME: fill everything else */ - if (ic->fccHandler == comptypeDIB || choose_comp->cv.hic) - { - choose_comp->cv.fccType = ic->fccType; - choose_comp->cv.fccHandler = ic->fccHandler; - choose_comp->cv.hic = ICOpen(ic->fccType, ic->fccHandler, ICMODE_COMPRESS); - /* FIXME: fill everything else */ - } + /* prevent closing the codec handle below */ + ic->hic = 0; } } /* fall through */ @@ -821,11 +873,14 @@ static INT_PTR CALLBACK icm_choose_compr while (1) { - LRESULT ret = SendMessageW(list, CB_GETITEMDATA, idx++, 0); + struct codec_info *ic; + + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, idx++, 0); - if (!ret || ret == CB_ERR) break; + if (!ic || (LONG_PTR)ic == CB_ERR) break; - HeapFree(GetProcessHeap(), 0, (void *)ret); + if (ic->hic) ICClose(ic->hic); + HeapFree(GetProcessHeap(), 0, ic); } EndDialog(hdlg, LOWORD(wparam) == IDOK); diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvideo/msvideo_private.h index c5394fb..6631ef8 100644 --- a/dlls/msvideo/msvideo_private.h +++ b/dlls/msvideo/msvideo_private.h @@ -57,4 +57,8 @@ extern LRESULT (CALLBACK *pFnCallTo16)( #define HDRAWDIB_16(h32) (LOWORD(h32)) #define HIC_16(h32) (LOWORD(h32)) +#define IDC_CONFIGURE 882 +#define IDC_KEYFRAME 888 +#define IDC_DATARATE 895 + #endif /* __WINE_MSVIDEO_PRIVATE_H */

1 0

Milko Krachounov : winecfg: Update Bulgarian translation.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: 46f4894d665a739b9ba901cd3f984a8ac880ed09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46f4894d665a739b9ba901c… Author: Milko Krachounov <milko(a)3mhz.net> Date: Sat Feb 11 12:14:34 2006 +0100 winecfg: Update Bulgarian translation. --- programs/winecfg/Bg.rc | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 50844b7..f78f182 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -49,6 +49,8 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " �� ",IDC_STATIC, 8,4,244,240 + + /* FIXME: Make the explanation comprehensible */ LTEXT "Wine �� Windows �� . �� , �� , �� , � �� .", IDC_STATIC,15,20,227,50 CONTROL "Applications",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, @@ -63,28 +65,32 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " �� ",IDC_STATIC,8,25,244,110 + GROUPBOX " �� ",IDC_STATIC,8,10,244,195 - CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "�� ",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "�� ",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + /* FIXME: the wording is terrible */ + LTEXT "�� Wine �� , �� , � �� . \n\n�� , �� , �� -�� -��.", + IDC_STATIC,15,43,228,80 + CONTROL "�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,117,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "�� , � �� e �� , �� .", - IDC_STATIC,15,73,228,28 - LTEXT "�� :",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "�� :",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "�� Vertex Shader: ",IDC_STATIC,15,150,105,30 - COMBOBOX IDC_D3D_VSHADER_MODE,115,148,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�� Vertex Shader: ",IDC_STATIC,15,220,105,30 + COMBOBOX IDC_D3D_VSHADER_MODE,115,218,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� Pixel Shader (�� )",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "�� Pixel Shader (�� )",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -201,3 +207,14 @@ BEGIN IDS_THEMEFILE_SELECT "�� " IDS_AUDIO_MISSING "�� .\n\n�� .\n�� .\n\n�� , �� ." END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "�� . �� , �� ?" + IDS_DLL_WARNING_CAPTION "��: �� " + IDS_DLL_NATIVE "��" + IDS_DLL_BUILTIN "��" + IDS_DLL_NATIVE_BUILTIN "��, ��" + IDS_DLL_BUILTIN_NATIVE "��, ��" + IDS_DLL_DISABLED "��" +END

1 0

Louis Lenders : wined3d: Prevent crash in setup_light.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: 25c885e269645d8ec6f8b5f92a294c6f5f0d4757 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25c885e269645d8ec6f8b5f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Feb 11 12:14:19 2006 +0100 wined3d: Prevent crash in setup_light. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a642f79..4b10c6d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include <float.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -165,7 +166,7 @@ static void setup_light(IWineD3DDevice * glLightf(GL_LIGHT0+Index, GL_LINEAR_ATTENUATION, lightInfo->OriginalParms.Attenuation1); checkGLcall("glLightf"); - if ((lightInfo->OriginalParms.Range *lightInfo->OriginalParms.Range) != 0) { + if ((lightInfo->OriginalParms.Range *lightInfo->OriginalParms.Range) >= FLT_MIN) { quad_att = 1.4/(lightInfo->OriginalParms.Range *lightInfo->OriginalParms.Range); } else { quad_att = 0; /* 0 or MAX? (0 seems to be ok) */

1 0

Maarten Lankhorst : include: Add dpnathlp.h header.
by Alexandre Julliard Feb. 11, 2006

Feb. 11, 2006

Module: wine Branch: refs/heads/master Commit: 8a756a2052dc2cec6c1df25b5978653607de0ec6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a756a2052dc2cec6c1df25… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Feb 11 12:14:04 2006 +0100 include: Add dpnathlp.h header. --- include/Makefile.in | 1 include/dpnathlp.h | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 include/dpnathlp.h diff --git a/include/Makefile.in b/include/Makefile.in index 8d6d6cf..4629180 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -120,6 +120,7 @@ WINDOWS_INCLUDES = \ dplay8.h \ dplobby.h \ dplobby8.h \ + dpnathlp.h \ dsconf.h \ dsdriver.h \ dshow.h \ diff --git a/include/dpnathlp.h b/include/dpnathlp.h new file mode 100644 index 0000000..c31a3da --- /dev/null +++ b/include/dpnathlp.h @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2006 Maarten Lankhorst + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __DPNATHLP_H__ +#define __DPNATHLP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT DirectPlayNATHelpCreate(const PGUID pIID, void ** ppvInterface); + +DEFINE_GUID(CLSID_DirectPlayNATHelpUPnP, 0xb9c2e9c4,0x68c1,0x4d42,0xa7,0xa1,0xe7,0x6a,0x26,0x98,0x2a,0xd6); +DEFINE_GUID(CLSID_DirectPlayNATHelpPAST, 0x963ab779,0x16a1,0x477c,0xa3,0x6d,0xcb,0x5e,0x71,0x19,0x38,0xf7); +DEFINE_GUID(IID_IDirectPlayNATHelp, 0x154940b6,0x2278,0x4a2f,0x91,0x01,0x9b,0xa9,0xf4,0x31,0xf6,0x03); + +#define DPNHGETCAPS_UPDATESERVERSTATUS 0x01 + +#define DPNHREGISTERPORTS_TCP 0x01 +#define DPNHREGISTERPORTS_FIXEDPORTS 0x02 +#define DPNHREGISTERPORTS_SHAREDPORTS 0x04 + +#define DPNHADDRESSTYPE_TCP 0x01 +#define DPNHADDRESSTYPE_FIXEDPORTS 0x02 +#define DPNHADDRESSTYPE_SHAREDPORTS 0x04 +#define DPNHADDRESSTYPE_LOCALFIREWALL 0x08 +#define DPNHADDRESSTYPE_GATEWAY 0x10 +#define DPNHADDRESSTYPE_GATEWAYISLOCAL 0x20 + +#define DPNHCAPSFLAG_LOCALFIREWALLPRESENT 0x01 +#define DPNHCAPSFLAG_GATEWAYPRESENT 0x02 +#define DPNHCAPSFLAG_GATEWAYISLOCAL 0x04 +#define DPNHCAPSFLAG_PUBLICADDRESSAVAILABLE 0x08 +#define DPNHCAPSFLAG_NOTALLSUPPORTACTIVENOTIFY 0x10 + +#define DPNHINITIALIZE_DISABLEGATEWAYSUPPORT 0x01 +#define DPNHINITIALIZE_DISABLELOCALFIREWALLSUPPORT 0x02 + +#define DPNHQUERYADDRESS_TCP 0x01 +#define DPNHQUERYADDRESS_CACHEFOUND 0x02 +#define DPNHQUERYADDRESS_CACHENOTFOUND 0x04 +#define DPNHQUERYADDRESS_CHECKFORPRIVATEBUTUNMAPPED 0x08 + +#define DPNHGETREGISTEREDADDRESSES_LOCALFIREWALLREMAPONLY 0x01 + +#define _DPNH_FACILITY_CODE 0x015 +#define _DPNH_HRESULT_BASE 0xF000 + +#define MAKE_DPNHSUCCESS(code) \ + MAKE_HRESULT(0, _DPNH_FACILITY_CODE, (code + _DPNH_HRESULT_BASE)) +#define MAKE_DPNHFAILURE(code) \ + MAKE_HRESULT(1, _DPNH_FACILITY_CODE, (code + _DPNH_HRESULT_BASE)) + +#define DPNH_OK S_OK +#define DPNHSUCCESS_ADDRESSESCHANGED MAKE_DPNHSUCCESS(0x10) + +#define DPNHERR_ALREADYINITIALIZED MAKE_DPNHFAILURE(0x10) +#define DPNHERR_BUFFERTOOSMALL MAKE_DPNHFAILURE(0x20) +#define DPNHERR_GENERIC E_FAIL +#define DPNHERR_INVALIDFLAGS MAKE_DPNHFAILURE(0x30) +#define DPNHERR_INVALIDOBJECT MAKE_DPNHFAILURE(0x40) +#define DPNHERR_INVALIDPARAM E_INVALIDARG +#define DPNHERR_INVALIDPOINTER E_POINTER +#define DPNHERR_NOMAPPING MAKE_DPNHFAILURE(0x50) +#define DPNHERR_NOMAPPINGBUTPRIVATE MAKE_DPNHFAILURE(0x60) +#define DPNHERR_NOTINITIALIZED MAKE_DPNHFAILURE(0x70) +#define DPNHERR_OUTOFMEMORY E_OUTOFMEMORY +#define DPNHERR_PORTALREADYREGISTERED MAKE_DPNHFAILURE(0x80) +#define DPNHERR_PORTUNAVAILABLE MAKE_DPNHFAILURE(0x90) +#define DPNHERR_REENTRANT MAKE_DPNHFAILURE(0x95) +#define DPNHERR_SERVERNOTAVAILABLE MAKE_DPNHFAILURE(0xA0) +#define DPNHERR_UPDATESERVERSTATUS MAKE_DPNHFAILURE(0xC0) + +typedef DWORD_PTR DPNHHANDLE; +typedef DWORD_PTR *PDPNHHANDLE; + +typedef struct _DPNHCAPS +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwNumRegisteredPorts; + DWORD dwMinLeaseTimeRemaining; + DWORD dwRecommendedGetCapsInterval; +} DPNHCAPS, *PDPNHCAPS; + + +#define INTERFACE IDirectPlayNATHelp +DECLARE_INTERFACE_(IDirectPlayNATHelp,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface) (THIS_ + REFIID riid, + void** ppvObject) PURE; + + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + + STDMETHOD_(ULONG,Release) (THIS) PURE; + + /*** IDirectPlayNATHelp functions ***/ + STDMETHOD(Initialize) (THIS_ + const DWORD dwFlags) PURE; + + STDMETHOD(Close) (THIS_ + const DWORD dwFlags) PURE; + + STDMETHOD(GetCaps) (THIS_ + const PDPNHCAPS pCaps, + const DWORD dwFlags) PURE; + + STDMETHOD(RegisterPorts) (THIS_ + const PSOCKADDR aLocalAddresses, + const DWORD dwAddressSize, + const DWORD dwAddresses, + const DWORD dwTime, + const PDPNHHANDLE phRegisteredPorts, + const DWORD dwFlags) PURE; + + STDMETHOD(GetRegisteredAddresses) (THIS_ + const PDPNHHANDLE hRegisteredPorts, + const PSOCKADDR paPublicAddresses, + const DWORD *dwAddressSize, + const DWORD *dwAddressFlags, + const DWORD *dwRemaining, + const DWORD dwFlags) PURE; + + STDMETHOD(DeregisterPorts)(THIS_ + const DPNHHANDLE hRegPorts, + const DWORD dwFlags) PURE; + + STDMETHOD(QueryAddress) (THIS_ + const PSOCKADDR pSource, + const PSOCKADDR pQuery, + const PSOCKADDR pResponse, + const INT iAddresses, + const DWORD dwFlags) PURE; + + STDMETHOD(SetAlertEvent) (THIS_ + const HANDLE hEvent, + const DWORD dwFlags) PURE; + + STDMETHOD(SetAlertIOCompletionPort)(THIS_ + const HANDLE hIOCompletionPort, + const DWORD dwCompletion, + const DWORD dwMaxThreads, + const DWORD dwFlags) PURE; + + STDMETHOD(ExtendRegisteredPortsLease)(THIS_ + const DPNHHANDLE hRegisteredPorts, + const DWORD dwLeaseTime, + const DWORD dwFlags) PURE; +}; + +#undef INTERFACE + +#ifdef COBJMACROS +#define IDirectPlayNATHelp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectPlayNATHelp_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectPlayNATHelp_Release(p) (p)->lpVtbl->Release(p) +#define IDirectPlayNATHelp_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) +#define IDirectPlayNATHelp_Close(p,a) (p)->lpVtbl->Close(p,a) +#define IDirectPlayNATHelp_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b) +#define IDirectPlayNATHelp_RegisterPorts(p,a,b,c,d,e,f) (p)->lpVtbl->RegisterPorts(p,a,b,c,d,e,f) +#define IDirectPlayNATHelp_GetRegisteredAddresses(p,a,b,c,d,e,f) (p)->lpVtbl->GetRegisteredAddresses(p,a,b,c,d,e,f) +#define IDirectPlayNATHelp_DeregisterPorts(p,a,b) (p)->lpVtbl->DeregisterPorts(p,a,b) +#define IDirectPlayNATHelp_QueryAddress(p,a,b,c,d,e) (p)->lpVtbl->QueryAddress(p,a,b,c,d,e) +#define IDirectPlayNATHelp_SetAlertEvent(p,a,b) (p)->lpVtbl->SetAlertEvent(p,a,b) +#define IDirectPlayNATHelp_SetAlertIOCompletionPort(p,a,b,c,d) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c,d) +#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c) +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __DPNATHLP_H__ */

1 0

lostwages/wwn wn20060210_305.xml
by WineHQ Feb. 10, 2006

Feb. 10, 2006

ChangeSet ID: 22939 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/02/10 16:14:31 Modified files: wwn : wn20060210_305.xml Log message: Fix section heading Patch: http://cvs.winehq.org/patch.py?id=22939 Old revision New revision Changes Path 1.1 1.2 +5 -5 lostwages/wwn/wn20060210_305.xml Index: lostwages/wwn/wn20060210_305.xml diff -u -p lostwages/wwn/wn20060210_305.xml:1.1 lostwages/wwn/wn20060210_305.xml:1.2 --- lostwages/wwn/wn20060210_305.xml:1.1 10 Feb 2006 22:14:31 -0000 +++ lostwages/wwn/wn20060210_305.xml 10 Feb 2006 22:14:31 -0000 @@ -142,12 +142,12 @@ system license to do it."</p></quote> </section> <section - title="" - subject="" - archive="http://www.winehq.com/pipermail/wine-devel/2005-October/.html" - posts="" + title="Eating Dogfood" + subject="The Dogfood Challenge: use Wine to run your web browser, etc." + archive="http://www.winehq.org/pipermail/wine-devel/2006-January/044498.html" + posts="3" > -<topic></topic> +<topic>Testing</topic> <p>Dan Kegel thought some Wine developers should start eating their own dogfood:</p> <quote who="Dan Kegel"><p>

1 0

lostwages/ news/2006021001.xml wwn/wn20060210_ ...
by WineHQ Feb. 10, 2006

Feb. 10, 2006

ChangeSet ID: 22938 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/02/10 15:52:19 Added files: news : 2006021001.xml wwn : wn20060210_305.xml Log message: WWN #305 Patch: http://cvs.winehq.org/patch.py?id=22938 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006021001.xml Added 1.1 +0 -0 lostwages/wwn/wn20060210_305.xml

1 0