August 2008 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : regedit: Convert printing&help to unicode.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5cb8bccf462790338677dac3bfb394df8f4da020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb8bccf462790338677dac3b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 10 12:43:06 2008 +0200 regedit: Convert printing&help to unicode. --- programs/regedit/framewnd.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 873a255..927e26e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -375,10 +375,10 @@ static BOOL ExportRegistryFile(HWND hWnd, BOOL export_branch) return TRUE; } -static BOOL PrintRegistryHive(HWND hWnd, LPCTSTR path) +static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) { #if 1 - PRINTDLG pd; + PRINTDLGW pd; ZeroMemory(&pd, sizeof(PRINTDLG)); pd.lStructSize = sizeof(PRINTDLG); @@ -391,15 +391,15 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCTSTR path) pd.nToPage = 0xFFFF; pd.nMinPage = 1; pd.nMaxPage = 0xFFFF; - if (PrintDlg(&pd)) { + if (PrintDlgW(&pd)) { /* GDI calls to render output. */ DeleteDC(pd.hDC); /* Delete DC when done.*/ } #else HRESULT hResult; - PRINTDLGEX pd; + PRINTDLGEXW pd; - hResult = PrintDlgEx(&pd); + hResult = PrintDlgExW(&pd); if (hResult == S_OK) { switch (pd.dwResultAction) { case PD_RESULT_APPLY: @@ -671,8 +671,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_REGISTRY_DISCONNECTNETWORKREGISTRY: break; case ID_REGISTRY_PRINT: - PrintRegistryHive(hWnd, _T("")); + { + const WCHAR empty = 0; + PrintRegistryHive(hWnd, empty); break; + } case ID_EDIT_DELETE: if (GetFocus() == g_pChildWnd->hTreeWnd) { WCHAR* keyPathW = GetWideString(keyPath); @@ -842,8 +845,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) toggle_child(hWnd, LOWORD(wParam), hStatusBar); break; case ID_HELP_HELPTOPICS: - WinHelp(hWnd, _T("regedit"), HELP_FINDER, 0); + { + const WCHAR help_regedit[] = {'r','e','g','e','d','i','t',0}; + WinHelpW(hWnd, help_regedit, HELP_FINDER, 0); break; + } case ID_HELP_ABOUT: ShowAboutBox(hWnd); break; @@ -914,8 +920,11 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; case WM_DESTROY: - WinHelp(hWnd, _T("regedit"), HELP_QUIT, 0); + { + const WCHAR help_regedit[] = {'r','e','g','e','d','i','t',0}; + WinHelpW(hWnd, help_regedit, HELP_QUIT, 0); PostQuitMessage(0); + } default: return DefWindowProc(hWnd, message, wParam, lParam); }

1 0

Roy Shea : include: Added defines used by TASK_TRIGGER members.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 1bc0cdded184d6e8a734ec9c91a3a229f8f9b980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc0cdded184d6e8a734ec9c9… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Aug 19 10:55:13 2008 -0700 include: Added defines used by TASK_TRIGGER members. --- include/mstask.idl | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/mstask.idl b/include/mstask.idl index cac9e08..cc70cce 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -22,6 +22,37 @@ import "oaidl.idl"; import "oleidl.idl"; +cpp_quote("#define TASK_SUNDAY 0x1") +cpp_quote("#define TASK_MONDAY 0x2") +cpp_quote("#define TASK_TUESDAY 0x4") +cpp_quote("#define TASK_WEDNESDAY 0x8") +cpp_quote("#define TASK_THURSDAY 0x10") +cpp_quote("#define TASK_FRIDAY 0x20") +cpp_quote("#define TASK_SATURDAY 0x40") + +cpp_quote("#define TASK_FIRST_WEEK 1") +cpp_quote("#define TASK_SECOND_WEEK 2") +cpp_quote("#define TASK_THIRD_WEEK 3") +cpp_quote("#define TASK_FOURTH_WEEK 4") +cpp_quote("#define TASK_LAST_WEEK 5") + +cpp_quote("#define TASK_JANUARY 0x1") +cpp_quote("#define TASK_FEBRUARY 0x2") +cpp_quote("#define TASK_MARCH 0x4") +cpp_quote("#define TASK_APRIL 0x8") +cpp_quote("#define TASK_MAY 0x10") +cpp_quote("#define TASK_JUNE 0x20") +cpp_quote("#define TASK_JULY 0x40") +cpp_quote("#define TASK_AUGUST 0x80") +cpp_quote("#define TASK_SEPTEMBER 0x100") +cpp_quote("#define TASK_OCTOBER 0x200") +cpp_quote("#define TASK_NOVEMBER 0x400") +cpp_quote("#define TASK_DECEMBER 0x800") + +cpp_quote("#define TASK_TRIGGER_FLAG_HAS_END_DATE 0x1") +cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2") +cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4") + [ local, object,

1 0

H. Verbeet : secur32: Reserved3 / Reserved4 are actually EncryptMessage / DecryptMessage.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: af96a43ce930fc3c49681e851845cd93b79dcecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=af96a43ce930fc3c49681e851… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Aug 19 17:50:53 2008 +0200 secur32: Reserved3 / Reserved4 are actually EncryptMessage / DecryptMessage. --- dlls/secur32/secur32.c | 8 ++++---- dlls/secur32/tests/secur32.c | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8b3c2bb..d552e13 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -104,8 +104,8 @@ static SecurityFunctionTableA securityFunctionTableA = { VerifySignature, FreeContextBuffer, QuerySecurityPackageInfoA, - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ + EncryptMessage, /* Reserved3 */ + DecryptMessage, /* Reserved4 */ ExportSecurityContext, ImportSecurityContextA, AddCredentialsA, @@ -135,8 +135,8 @@ static SecurityFunctionTableW securityFunctionTableW = { VerifySignature, FreeContextBuffer, QuerySecurityPackageInfoW, - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ + EncryptMessage, /* Reserved3 */ + DecryptMessage, /* Reserved4 */ ExportSecurityContext, ImportSecurityContextW, AddCredentialsW, diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 43704a9..955d7bf 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -99,10 +99,8 @@ static void test_InitSecurityInterface(void) ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftA->dwVersion); ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); - todo_wine - ok(sftA->Reserved3 != NULL, "Reserved3 should not be NULL in security function table\n"); - todo_wine - ok(sftA->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(sftA->Reserved3 == sftA->EncryptMessage, "Reserved3 should be equal to EncryptMessage in the security function table\n"); + ok(sftA->Reserved4 == sftA->DecryptMessage, "Reserved4 should be equal to DecryptMessage in the security function table\n"); if (!pInitSecurityInterfaceW) { @@ -114,10 +112,8 @@ static void test_InitSecurityInterface(void) ok(sftW != NULL, "pInitSecurityInterfaceW failed\n"); ok(sftW->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftW->dwVersion); ok(!sftW->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftW->Reserved2); - todo_wine - ok(sftW->Reserved3 != NULL, "Reserved3 should note be NULL in security function table\n"); - todo_wine - ok(sftW->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(sftW->Reserved3 == sftW->EncryptMessage, "Reserved3 should be equal to EncryptMessage in the security function table\n"); + ok(sftW->Reserved4 == sftW->DecryptMessage, "Reserved4 should be equal to DecryptMessage in the security function table\n"); } START_TEST(secur32)

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl : Add Norwegian Bokmål translation.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: dc3f854a83d73bfd40fa8624065fa2c5b8156d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3f854a83d73bfd40fa86240… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 17 20:09:47 2008 +0200 appwiz.cpl: Add Norwegian Bokmål translation. --- dlls/appwiz.cpl/No.rc | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc new file mode 100644 index 0000000..43f503c --- /dev/null +++ b/dlls/appwiz.cpl/No.rc @@ -0,0 +1,79 @@ +/* +* Add/Remove Programs Norwegian Bokm�l resources +* +* Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> +* +* 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 +* +*/ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Legg til/Fjern programmer" + IDS_CPL_DESC, "Lar deg installere ny programvare eller fjerne installerte programmer." + IDS_TAB1_TITLE, "Programmer" + + IDS_UNINSTALL_FAILED, "Klarte ikke kj�re avinstalleringsprogrammet, �%s�. Vil du fjerne oppf�ringen fra listen over installerte programmer?" + IDS_NOT_SPECIFIED, "Ikke oppgitt" + + IDS_COLUMN_NAME, "Navn" + IDS_COLUMN_PUBLISHER, "Utgiver" + IDS_COLUMN_VERSION, "Versjon" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installer/Avinstaller" +FONT 8, "MS Sans Serif" +{ + CONTROL "Trykk �Installer� for � installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installer ...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "F�lgende programmer kan fjernes automatisk. Merk et program og trykk �Legg til/Fjern� for � fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Legg til/Fje&rn ...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&St�tteinformasjon ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "St�tteinformasjon" +FONT 8, "MS Sans Serif" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "F�lgende informasjon kan brukes til � f� teknisk st�tte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Utgiver:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "St�tteinformasjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Kundest�tte, tlf:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Lesmeg-fil:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produktoppdateringer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 8b88911..b4a8dd5 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -27,6 +27,7 @@ #include "En.rc" #include "Nl.rc" +#include "No.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Detlef Riekenberg : winealsa.drv: Fix a typo in an error message.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 2dedf4c097d922da4d03d94a937b38e3077e20cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dedf4c097d922da4d03d94a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 19 23:45:47 2008 +0200 winealsa.drv: Fix a typo in an error message. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 62e7f4f..6dfb088 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -764,7 +764,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_stop_threshold(pcm, sw_params, boundary), MMSYSERR_ERROR, "unable to set xrun mode"); + EXIT_ON_ERROR( snd_pcm_sw_params_set_stop_threshold(pcm, sw_params, boundary), MMSYSERR_ERROR, "unable to set stop threshold"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR

1 0

Roy Shea : include: Add task scheduler specific error codes.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5331fa49d9dd7eb0233cbb6a6f7865c5cb7a4df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5331fa49d9dd7eb0233cbb6a6… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Aug 19 10:54:43 2008 -0700 include: Add task scheduler specific error codes. --- include/winerror.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 9cf495e..5d32374 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2020,6 +2020,49 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned long x) #define CO_E_DECODEFAILED _HRESULT_TYPEDEF_(0x8004021AL) #define CO_E_ACNOTINITIALIZED _HRESULT_TYPEDEF_(0x8004021BL) +/* Task Scheduler Service Error Codes */ +#define SCHED_S_TASK_READY _HRESULT_TYPEDEF_(0x00041300L) +#define SCHED_S_TASK_RUNNING _HRESULT_TYPEDEF_(0x00041301L) +#define SCHED_S_TASK_DISABLED _HRESULT_TYPEDEF_(0x00041302L) +#define SCHED_S_TASK_HAS_NOT_RUN _HRESULT_TYPEDEF_(0x00041303L) +#define SCHED_S_TASK_NO_MORE_RUNS _HRESULT_TYPEDEF_(0x00041304L) +#define SCHED_S_TASK_NOT_SCHEDULED _HRESULT_TYPEDEF_(0x00041305L) +#define SCHED_S_TASK_TERMINATED _HRESULT_TYPEDEF_(0x00041306L) +#define SCHED_S_TASK_NO_VALID_TRIGGERS _HRESULT_TYPEDEF_(0x00041307L) +#define SCHED_S_EVENT_TRIGGER _HRESULT_TYPEDEF_(0x00041308L) +#define SCHED_E_TRIGGER_NOT_FOUND _HRESULT_TYPEDEF_(0x80041309L) +#define SCHED_E_TASK_NOT_READY _HRESULT_TYPEDEF_(0x8004130AL) +#define SCHED_E_TASK_NOT_RUNNING _HRESULT_TYPEDEF_(0x8004130BL) +#define SCHED_E_SERVICE_NOT_INSTALLED _HRESULT_TYPEDEF_(0x8004130CL) +#define SCHED_E_CANNOT_OPEN_TASK _HRESULT_TYPEDEF_(0x8004130DL) +#define SCHED_E_INVALID_TASK _HRESULT_TYPEDEF_(0x8004130EL) +#define SCHED_E_ACCOUNT_INFORMATION_NOT_SET _HRESULT_TYPEDEF_(0x8004130FL) +#define SCHED_E_ACCOUNT_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x80041310L) +#define SCHED_E_ACCOUNT_DBASE_CORRUPT _HRESULT_TYPEDEF_(0x80041311L) +#define SCHED_E_NO_SECURITY_SERVICES _HRESULT_TYPEDEF_(0x80041312L) +#define SCHED_E_UNKNOWN_OBJECT_VERSION _HRESULT_TYPEDEF_(0x80041313L) +#define SCHED_E_UNSUPPORTED_ACCOUNT_OPTION _HRESULT_TYPEDEF_(0x80041314L) +#define SCHED_E_SERVICE_NOT_RUNNING _HRESULT_TYPEDEF_(0x80041315L) +#define SCHED_E_UNEXPECTEDNODE _HRESULT_TYPEDEF_(0x80041316L) +#define SCHED_E_NAMESPACE _HRESULT_TYPEDEF_(0x80041317L) +#define SCHED_E_INVALIDVALUE _HRESULT_TYPEDEF_(0x80041318L) +#define SCHED_E_MISSINGNODE _HRESULT_TYPEDEF_(0x80041319L) +#define SCHED_E_MALFORMEDXML _HRESULT_TYPEDEF_(0x8004131AL) +#define SCHED_S_SOME_TRIGGERS_FAILED _HRESULT_TYPEDEF_(0x0004131BL) +#define SCHED_S_BATCH_LOGON_PROBLEM _HRESULT_TYPEDEF_(0x0004131CL) +#define SCHED_E_TOO_MANY_NODES _HRESULT_TYPEDEF_(0x8004131DL) +#define SCHED_E_PAST_END_BOUNDARY _HRESULT_TYPEDEF_(0x8004131EL) +#define SCHED_E_ALREADY_RUNNING _HRESULT_TYPEDEF_(0x8004131FL) +#define SCHED_E_USER_NOT_LOGGED_ON _HRESULT_TYPEDEF_(0x80041320L) +#define SCHED_E_INVALID_TASK_HASH _HRESULT_TYPEDEF_(0x80041321L) +#define SCHED_E_SERVICE_NOT_AVAILABLE _HRESULT_TYPEDEF_(0x80041322L) +#define SCHED_E_SERVICE_TOO_BUSY _HRESULT_TYPEDEF_(0x80041323L) +#define SCHED_E_TASK_ATTEMPTED _HRESULT_TYPEDEF_(0x80041324L) +#define SCHED_S_TASK_QUEUED _HRESULT_TYPEDEF_(0x00041325L) +#define SCHED_E_TASK_DISABLED _HRESULT_TYPEDEF_(0x80041326L) +#define SCHED_E_TASK_NOT_V1_COMPAT _HRESULT_TYPEDEF_(0x80041327L) +#define SCHED_E_START_ON_DEMAND _HRESULT_TYPEDEF_(0x80041328L) + #define E_ACCESSDENIED _HRESULT_TYPEDEF_(0x80070005L) #define E_HANDLE _HRESULT_TYPEDEF_(0x80070006L) #define E_OUTOFMEMORY _HRESULT_TYPEDEF_(0x8007000EL)

1 0

Michael Stefaniuc : d3dxof: Remove unreachable break after return (Smatch).
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5ff42c55f74205cb814bb39fb8fe8fc779bb486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff42c55f74205cb814bb39fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 19 21:33:33 2008 +0200 d3dxof: Remove unreachable break after return (Smatch). --- dlls/d3dxof/d3dxof.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index f16dce1..54d78a1 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -275,7 +275,6 @@ static BOOL is_space(char c) case ' ': case '\t': return TRUE; - break; } return FALSE; } @@ -295,7 +294,6 @@ static BOOL is_operator(char c) case ',': case ';': return TRUE; - break; } return FALSE; } @@ -311,34 +309,24 @@ static WORD get_operator_token(char c) { case '{': return TOKEN_OBRACE; - break; case '}': return TOKEN_CBRACE; - break; case '[': return TOKEN_OBRACKET; - break; case ']': return TOKEN_CBRACKET; - break; case '(': return TOKEN_OPAREN; - break; case ')': return TOKEN_CPAREN; - break; case '<': return TOKEN_OANGLE; - break; case '>': return TOKEN_CANGLE; - break; case ',': return TOKEN_COMMA; - break; case ';': return TOKEN_SEMICOLON; - break; } return 0; }

1 0

H. Verbeet : d3d8: Don't store shader_handle's.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 898c2c9778623690e809ddd9dfe6d89b321377f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898c2c9778623690e809ddd9d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Aug 19 17:50:12 2008 +0200 d3d8: Don't store shader_handle's. They're not stable across table resizes. --- dlls/d3d8/d3d8_private.h | 4 ++-- dlls/d3d8/device.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0da18ca..86adcba 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -600,7 +600,7 @@ struct IDirect3DVertexShader8Impl { const IDirect3DVertexShader8Vtbl *lpVtbl; LONG ref; - shader_handle *handle; + DWORD handle; IDirect3DVertexDeclaration8 *vertex_declaration; IWineD3DVertexShader *wineD3DVertexShader; }; @@ -623,7 +623,7 @@ typedef struct IDirect3DPixelShader8Impl { const IDirect3DPixelShader8Vtbl *lpVtbl; LONG ref; - shader_handle *handle; + DWORD handle; /* The device, to be replaced by an IDirect3DDeviceImpl */ IWineD3DPixelShader *wineD3DPixelShader; } IDirect3DPixelShader8Impl; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d1ae476..a81bf78 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1581,9 +1581,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 IDirect3DVertexShader8_Release((IUnknown *)object); hrc = E_OUTOFMEMORY; } else { - object->handle = handle; *handle = object; - *ppShader = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + object->handle = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + *ppShader = object->handle; load_local_constants(pDeclaration, object->wineD3DVertexShader); TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); @@ -1689,7 +1689,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 ifa IDirect3DVertexShader8Impl *d3d8_shader; hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)&d3d8_shader); IWineD3DVertexShader_Release(pShader); - *ppShader = (d3d8_shader->handle - This->shader_handles) + (VS_HIGHESTFIXEDFXF + 1); + *ppShader = d3d8_shader->handle; } else { *ppShader = 0; hrc = D3D_OK; @@ -1889,9 +1889,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 i IDirect3DVertexShader8_Release((IUnknown *)object); hrc = E_OUTOFMEMORY; } else { - object->handle = handle; *handle = object; - *ppShader = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + object->handle = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + *ppShader = object->handle; TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); } } @@ -1938,7 +1938,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 ifac IDirect3DPixelShader8Impl *d3d8_shader; hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)&d3d8_shader); IWineD3DPixelShader_Release(object); - *ppShader = (d3d8_shader->handle - This->shader_handles) + (VS_HIGHESTFIXEDFXF + 1); + *ppShader = d3d8_shader->handle; } else { *ppShader = (DWORD)NULL; }

1 0

H. Verbeet : wined3d: Move creating a texture id from PreLoad to BindTexture.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: f71fdecdc79177c4add5b2f02e90413ba10593da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71fdecdc79177c4add5b2f02… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Aug 19 17:49:07 2008 +0200 wined3d: Move creating a texture id from PreLoad to BindTexture. This is consistent with BindTexture in basetexture/texture/etc. and has the added benefit that it makes LoadLocation work properly. --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3c56d4c..5e5303d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -8,7 +8,7 @@ * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2006-2008 Stefan D�singer for CodeWeavers - * Copyright 2007 Henri Verbeet + * Copyright 2007-2008 Henri Verbeet * Copyright 2006-2008 Roderick Colenbrander * * This library is free software; you can redistribute it and/or @@ -514,24 +514,9 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); } } - ENTER_GL(); - glEnable(This->glDescription.target);/* make sure texture support is enabled in this context */ - if (!This->glDescription.level) { - if (!This->glDescription.textureName) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - TRACE("Surface %p given name %d\n", This, This->glDescription.textureName); - } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture"); - LEAVE_GL(); - IWineD3DSurface_LoadTexture(iface, FALSE); - /* This is where we should be reducing the amount of GLMemoryUsed */ - } else if (This->glDescription.textureName) { /* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */ - /* assume this is a coding error not a real error for now */ - FIXME("Mipmap surface has a glTexture bound to it!\n"); - LEAVE_GL(); - } + + IWineD3DSurface_LoadTexture(iface, FALSE); + if (This->resource.pool == WINED3DPOOL_DEFAULT) { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; @@ -2361,8 +2346,26 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { if(!device->isInDraw) { ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); } + ENTER_GL(); + + glEnable(This->glDescription.target); + + if (!This->glDescription.level) { + if (!This->glDescription.textureName) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + TRACE("Surface %p given name %d\n", This, This->glDescription.textureName); + } + /* This is where we should be reducing the amount of GLMemoryUsed */ + } else if (This->glDescription.textureName) { + /* Mipmap surfaces should have a base texture container */ + ERR("Mipmap surface has a glTexture bound to it!\n"); + } + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture"); + LEAVE_GL(); } return;

1 0

Juan Lang : crypt32: Always set *pcbStructInfo.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 4ccaaa896fe35f66de57da6feb284051f4cace45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccaaa896fe35f66de57da6fe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 18 12:11:15 2008 -0700 crypt32: Always set *pcbStructInfo. --- dlls/crypt32/decode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3f9a243..1f5348c 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -231,6 +231,8 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, SetLastError(ERROR_MORE_DATA); ret = FALSE; } + else + *pcbStructInfo = bytesNeeded; return ret; }

1 0