Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20026: reactos.org is the preferred name these days
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

reactos.org is the preferred name these days Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-12-09 21:57:24 UTC (rev 20025) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-12-09 22:14:27 UTC (rev 20026) @@ -1131,7 +1131,7 @@ #ifdef _DEBUG create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("http://localhost"))); #else - create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("http://www.reactos.com"))); + create_webchildwindow(WebChildWndInfo(_hmdiclient, TEXT("http://www.reactos.org"))); #endif break;

1 0

[weiden] 20025: implemented DeviceProblemTextA/W()
by weiden＠svn.reactos.com 09 Dec '05

09 Dec '05

implemented DeviceProblemTextA/W() Modified: trunk/reactos/lib/devmgr/devprblm.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/devprblm.c --- trunk/reactos/lib/devmgr/devprblm.c 2005-12-09 21:51:50 UTC (rev 20024) +++ trunk/reactos/lib/devmgr/devprblm.c 2005-12-09 21:57:24 UTC (rev 20025) @@ -321,3 +321,286 @@ return Ret; } + + +static const UINT ProblemStringId[NUM_CM_PROB] = +{ + IDS_DEV_NO_PROBLEM, + IDS_DEV_DEVLOADER_FAILED, + IDS_DEV_NOT_CONFIGURED, + IDS_DEV_OUT_OF_MEMORY, + IDS_DEV_ENTRY_IS_WRONG_TYPE, + IDS_DEV_LACKED_ARBITRATOR, + IDS_DEV_BOOT_CONFIG_CONFLICT, + IDS_DEV_FAILED_FILTER, + IDS_DEV_DEVLOADER_NOT_FOUND, + IDS_DEV_INVALID_DATA, + IDS_DEV_FAILED_START, + IDS_DEV_LIAR, + IDS_DEV_NORMAL_CONFLICT, + IDS_DEV_NOT_VERIFIED, + IDS_DEV_NEED_RESTART, + IDS_DEV_REENUMERATION, + IDS_DEV_PARTIAL_LOG_CONF, + IDS_DEV_UNKNOWN_RESOURCE, + IDS_DEV_REINSTALL, + IDS_DEV_REGISTRY, + IDS_UNKNOWN, /* CM_PROB_VXDLDR, not used on NT */ + IDS_DEV_WILL_BE_REMOVED, + IDS_DEV_DISABLED, + IDS_DEV_DEVLOADER_NOT_READY, + IDS_DEV_DEVICE_NOT_THERE, + IDS_DEV_MOVED, + IDS_DEV_TOO_EARLY, + IDS_DEV_NO_VALID_LOG_CONF, + IDS_DEV_FAILED_INSTALL, + IDS_DEV_HARDWARE_DISABLED, + IDS_DEV_CANT_SHARE_IRQ, + IDS_DEV_FAILED_ADD, + IDS_DEV_DISABLED_SERVICE, + IDS_DEV_TRANSLATION_FAILED, + IDS_DEV_NO_SOFTCONFIG, + IDS_DEV_BIOS_TABLE, + IDS_DEV_IRQ_TRANSLATION_FAILED, + IDS_DEV_FAILED_DRIVER_ENTRY, + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD, + IDS_DEV_DRIVER_FAILED_LOAD, + IDS_DEV_DRIVER_SERVICE_KEY_INVALID, + IDS_DEV_LEGACY_SERVICE_NO_DEVICES, + IDS_DEV_DUPLICATE_DEVICE, + IDS_DEV_FAILED_POST_START, + IDS_DEV_HALTED, + IDS_DEV_PHANTOM, + IDS_DEV_SYSTEM_SHUTDOWN, + IDS_DEV_HELD_FOR_EJECT, + IDS_DEV_DRIVER_BLOCKED, + IDS_DEV_REGISTRY_TOO_LARGE, + IDS_DEV_SETPROPERTIES_FAILED +}; + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceProblemTextA + * + * DESCRIPTION + * Gets the problem text from a problem number displayed in the properties dialog + * + * ARGUMENTS + * hMachine: Machine handle or NULL for the local machine + * DevInst: Device instance handle + * uProblemId: Specifies the problem ID + * lpString: Pointer to a buffer where the string is to be copied to. If the buffer + * is too small, the return value is the required string length in characters, + * excluding the NULL-termination. + * uMaxString: Size of the buffer in characters + * + * RETURN VALUE + * The return value is the length of the string in characters. + * It returns 0 if an error occured. + * + * @implemented + */ +UINT +WINAPI +DeviceProblemTextA(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPSTR lpString, + IN UINT uMaxString) +{ + LPWSTR lpBuffer = NULL; + UINT Ret = 0; + + if (uMaxString != 0) + { + lpBuffer = HeapAlloc(GetProcessHeap(), + 0, + (uMaxString + 1) * sizeof(WCHAR)); + if (lpBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + + Ret = DeviceProblemTextW(hMachine, + dnDevInst, + uProblemId, + lpBuffer, + uMaxString); + + if (lpBuffer != NULL) + { + if (Ret) + { + WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + (int)Ret, + lpString, + (int)uMaxString, + NULL, + NULL); + } + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + } + + return Ret; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceProblemTextW + * + * DESCRIPTION + * Gets the problem text from a problem number displayed in the properties dialog + * + * ARGUMENTS + * hMachine: Machine handle or NULL for the local machine + * DevInst: Device instance handle + * uProblemId: Specifies the problem ID + * lpString: Pointer to a buffer where the string is to be copied to. If the buffer + * is too small, the return value is the required string length in characters, + * excluding the NULL-termination. + * uMaxString: Size of the buffer in characters + * + * RETURN VALUE + * The return value is the length of the string in characters. + * It returns 0 if an error occured. + * + * @implemented + */ +UINT +WINAPI +DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPWSTR lpString, + IN UINT uMaxString) +{ + UINT MessageId = IDS_UNKNOWN; + UINT Ret = 0; + + if (uProblemId < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) + MessageId = ProblemStringId[uProblemId]; + + if (uProblemId == 0) + { + if (uMaxString != 0) + { + Ret = LoadString(hDllInstance, + MessageId, + lpString, + (int)uMaxString); + } + else + { + Ret = (UINT)LengthOfStrResource(hDllInstance, + MessageId); + } + } + else + { + LPWSTR szProblem, szInfo = NULL; + DWORD dwRet; + BOOL AdvFormat = FALSE; + UINT StringIDs[] = + { + MessageId, + IDS_DEVCODE, + }; + + switch (uProblemId) + { + case CM_PROB_DEVLOADER_FAILED: + { + /* FIXME - if not a root bus devloader then use IDS_DEV_DEVLOADER_FAILED2 */ + /* FIXME - get the type string (ie. ISAPNP, PCI or BIOS for root bus devloaders, + or FLOP, ESDI, SCSI, etc for others */ + AdvFormat = (szInfo != NULL); + break; + } + + case CM_PROB_DEVLOADER_NOT_FOUND: + { + /* FIXME - 4 cases: + 1) if it's a missing system devloader: + - get the system devloader name + 2) if it's not a system devloader but still missing: + - get the devloader name (file name?) + 3) if it's not a system devloader but the file can be found: + - use IDS_DEV_DEVLOADER_NOT_FOUND2 + 4) if it's a missing or empty software key + - use IDS_DEV_DEVLOADER_NOT_FOUND3 + - AdvFormat = FALSE! + */ + AdvFormat = (szInfo != NULL); + break; + } + + case CM_PROB_INVALID_DATA: + /* FIXME - if the device isn't enumerated by the BIOS/ACPI use IDS_DEV_INVALID_DATA2 */ + AdvFormat = FALSE; + break; + + case CM_PROB_NORMAL_CONFLICT: + /* FIXME - get resource type (IRQ, DMA, Memory or I/O) */ + AdvFormat = (szInfo != NULL); + break; + + case CM_PROB_UNKNOWN_RESOURCE: + /* FIXME - get the .inf file name */ + AdvFormat = (szInfo != NULL); + break; + + case CM_PROB_DISABLED: + /* FIXME - if the device was disabled by the system use IDS_DEV_DISABLED2 */ + break; + + case CM_PROB_FAILED_ADD: + /* FIXME - get the name of the sub-device with the error */ + AdvFormat = (szInfo != NULL); + break; + } + + if (AdvFormat) + { + StringIDs[1] = IDS_DEVCODE2; + dwRet = LoadAndFormatStringsCat(hDllInstance, + StringIDs, + sizeof(StringIDs) / sizeof(StringIDs[0]), + &szProblem, + szInfo, + uProblemId); + LocalFree((HLOCAL)szInfo); + } + else + { + dwRet = LoadAndFormatStringsCat(hDllInstance, + StringIDs, + sizeof(StringIDs) / sizeof(StringIDs[0]), + &szProblem, + uProblemId); + } + + if (dwRet != 0) + { + if (uMaxString != 0 && uMaxString >= dwRet) + { + wcscpy(lpString, + szProblem); + } + + LocalFree((HLOCAL)szProblem); + + Ret = dwRet; + } + } + + return Ret; +} _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-09 21:51:50 UTC (rev 20024) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-09 21:57:24 UTC (rev 20025) @@ -30,7 +30,7 @@ HINSTANCE hDllInstance = NULL; -static INT +INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) { @@ -401,62 +401,6 @@ } -static const UINT ProblemStringId[NUM_CM_PROB] = -{ - IDS_DEV_NO_PROBLEM, - IDS_DEV_DEVLOADER_FAILED, - IDS_DEV_NOT_CONFIGURED, - IDS_DEV_OUT_OF_MEMORY, - IDS_DEV_ENTRY_IS_WRONG_TYPE, - IDS_DEV_LACKED_ARBITRATOR, - IDS_DEV_BOOT_CONFIG_CONFLICT, - IDS_DEV_FAILED_FILTER, - IDS_DEV_DEVLOADER_NOT_FOUND, - IDS_DEV_INVALID_DATA, - IDS_DEV_FAILED_START, - IDS_DEV_LIAR, - IDS_DEV_NORMAL_CONFLICT, - IDS_DEV_NOT_VERIFIED, - IDS_DEV_NEED_RESTART, - IDS_DEV_REENUMERATION, - IDS_DEV_PARTIAL_LOG_CONF, - IDS_DEV_UNKNOWN_RESOURCE, - IDS_DEV_REINSTALL, - IDS_DEV_REGISTRY, - IDS_UNKNOWN, /* CM_PROB_VXDLDR, not used on NT */ - IDS_DEV_WILL_BE_REMOVED, - IDS_DEV_DISABLED, - IDS_DEV_DEVLOADER_NOT_READY, - IDS_DEV_DEVICE_NOT_THERE, - IDS_DEV_MOVED, - IDS_DEV_TOO_EARLY, - IDS_DEV_NO_VALID_LOG_CONF, - IDS_DEV_FAILED_INSTALL, - IDS_DEV_HARDWARE_DISABLED, - IDS_DEV_CANT_SHARE_IRQ, - IDS_DEV_FAILED_ADD, - IDS_DEV_DISABLED_SERVICE, - IDS_DEV_TRANSLATION_FAILED, - IDS_DEV_NO_SOFTCONFIG, - IDS_DEV_BIOS_TABLE, - IDS_DEV_IRQ_TRANSLATION_FAILED, - IDS_DEV_FAILED_DRIVER_ENTRY, - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD, - IDS_DEV_DRIVER_FAILED_LOAD, - IDS_DEV_DRIVER_SERVICE_KEY_INVALID, - IDS_DEV_LEGACY_SERVICE_NO_DEVICES, - IDS_DEV_DUPLICATE_DEVICE, - IDS_DEV_FAILED_POST_START, - IDS_DEV_HALTED, - IDS_DEV_PHANTOM, - IDS_DEV_SYSTEM_SHUTDOWN, - IDS_DEV_HELD_FOR_EJECT, - IDS_DEV_DRIVER_BLOCKED, - IDS_DEV_REGISTRY_TOO_LARGE, - IDS_DEV_SETPROPERTIES_FAILED -}; - - BOOL GetDeviceStatusString(IN DEVINST DevInst, IN HMACHINE hMachine, @@ -478,109 +422,15 @@ { if (Status & DN_HAS_PROBLEM) { - if (ProblemNumber < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) - MessageId = ProblemStringId[ProblemNumber]; + UINT uRet; - if (ProblemNumber == 0) - { - goto GeneralMessage; - } - else - { - LPWSTR szProblem, szInfo = NULL; - DWORD dwRet; - BOOL AdvFormat = FALSE; - UINT StringIDs[] = - { - MessageId, - IDS_DEVCODE, - }; + uRet = DeviceProblemText(hMachine, + DevInst, + ProblemNumber, + szBuffer, + (BufferSize != 0 ? BufferSize : BufferSize - 1)); - switch (ProblemNumber) - { - case CM_PROB_DEVLOADER_FAILED: - { - /* FIXME - if not a root bus devloader then use IDS_DEV_DEVLOADER_FAILED2 */ - /* FIXME - get the type string (ie. ISAPNP, PCI or BIOS for root bus devloaders, - or FLOP, ESDI, SCSI, etc for others */ - AdvFormat = (szInfo != NULL); - break; - } - - case CM_PROB_DEVLOADER_NOT_FOUND: - { - /* FIXME - 4 cases: - 1) if it's a missing system devloader: - - get the system devloader name - 2) if it's not a system devloader but still missing: - - get the devloader name (file name?) - 3) if it's not a system devloader but the file can be found: - - use IDS_DEV_DEVLOADER_NOT_FOUND2 - 4) if it's a missing or empty software key - - use IDS_DEV_DEVLOADER_NOT_FOUND3 - - AdvFormat = FALSE! - */ - AdvFormat = (szInfo != NULL); - break; - } - - case CM_PROB_INVALID_DATA: - /* FIXME - if the device isn't enumerated by the BIOS/ACPI use IDS_DEV_INVALID_DATA2 */ - AdvFormat = FALSE; - break; - - case CM_PROB_NORMAL_CONFLICT: - /* FIXME - get resource type (IRQ, DMA, Memory or I/O) */ - AdvFormat = (szInfo != NULL); - break; - - case CM_PROB_UNKNOWN_RESOURCE: - /* FIXME - get the .inf file name */ - AdvFormat = (szInfo != NULL); - break; - - case CM_PROB_DISABLED: - /* FIXME - if the device was disabled by the system use IDS_DEV_DISABLED2 */ - break; - - case CM_PROB_FAILED_ADD: - /* FIXME - get the name of the sub-device with the error */ - AdvFormat = (szInfo != NULL); - break; - } - - if (AdvFormat) - { - StringIDs[1] = IDS_DEVCODE2; - dwRet = LoadAndFormatStringsCat(hDllInstance, - StringIDs, - sizeof(StringIDs) / sizeof(StringIDs[0]), - &szProblem, - szInfo, - ProblemNumber); - LocalFree((HLOCAL)szInfo); - } - else - { - dwRet = LoadAndFormatStringsCat(hDllInstance, - StringIDs, - sizeof(StringIDs) / sizeof(StringIDs[0]), - &szProblem, - ProblemNumber); - } - - if (dwRet != 0) - { - wcsncpy(szBuffer, - szProblem, - BufferSize - 1); - szBuffer[BufferSize - 1] = L'\0'; - - LocalFree((HLOCAL)szProblem); - - Ret = TRUE; - } - } + Ret = (uRet != 0 && uRet < BufferSize); } else { @@ -599,13 +449,10 @@ else { GeneralMessage: - if (LoadString(hDllInstance, - MessageId, - szBuffer, - BufferSize)) - { - Ret = TRUE; - } + Ret = LoadString(hDllInstance, + MessageId, + szBuffer, + (int)BufferSize); } return Ret; _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-09 21:51:50 UTC (rev 20024) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-09 21:57:24 UTC (rev 20025) @@ -57,19 +57,19 @@ UINT WINAPI -DeviceProblemTextA(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPSTR lpString, - UINT uMaxString); +DeviceProblemTextA(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPSTR lpString, + IN UINT uMaxString); UINT WINAPI -DeviceProblemTextW(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPWSTR lpString, - UINT uMaxString); +DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPWSTR lpString, + IN UINT uMaxString); BOOL WINAPI @@ -210,6 +210,11 @@ /* MISC.C */ + +INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID); + DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-12-09 21:51:50 UTC (rev 20024) +++ trunk/reactos/lib/devmgr/stubs.c 2005-12-09 21:57:24 UTC (rev 20025) @@ -244,80 +244,6 @@ /*********************************************************************** **** * NAME EXPORTED - * DeviceProblemTextW - * - * DESCRIPTION - * Gets the problem text from a problem number displayed in the properties dialog - * - * ARGUMENTS - * Unknown1: Unknown parameter - * Unknown2: Unknown parameter - * uProblemId: Specifies the problem ID - * lpString: Pointer to a buffer where the string is to be copied to - * uMaxString: Size of the buffer - * - * RETURN VALUE - * The return value is the number of bytes copied into the string buffer. - * It returns 0 if an error occured. - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -UINT -WINAPI -DeviceProblemTextA(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPSTR lpString, - UINT uMaxString) -{ - UNIMPLEMENTED; - return 0; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DeviceProblemTextW - * - * DESCRIPTION - * Gets the problem text from a problem number displayed in the properties dialog - * - * ARGUMENTS - * Unknown1: Unknown parameter - * Unknown2: Unknown parameter - * uProblemId: Specifies the problem ID - * lpString: Pointer to a buffer where the string is to be copied to - * uMaxString: Size of the buffer - * - * RETURN VALUE - * The return value is the number of bytes copied into the string buffer. - * It returns 0 if an error occured. - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -UINT -WINAPI -DeviceProblemTextW(PVOID Unknown1, - PVOID Unknown2, - UINT uProblemId, - LPWSTR lpString, - UINT uMaxString) -{ - UNIMPLEMENTED; - return 0; -} - - -/********************************************************************** ***** - * NAME EXPORTED * DeviceProblemWizard_RunDLLA * * DESCRIPTION

1 0

[gvg] 20024: Work around lack of MSG_PEEK
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

Work around lack of MSG_PEEK Modified: trunk/reactos/lib/wininet/http.c _____ Modified: trunk/reactos/lib/wininet/http.c --- trunk/reactos/lib/wininet/http.c 2005-12-09 21:50:59 UTC (rev 20023) +++ trunk/reactos/lib/wininet/http.c 2005-12-09 21:51:50 UTC (rev 20024) @@ -2024,7 +2024,11 @@ /* * HACK peek at the buffer */ +#if 0 + /* This is Wine code, we don't support MSG_PEEK yet so we have to do it + a bit different */ NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); +#endif /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. @@ -2033,6 +2037,9 @@ memset(buffer, 0, MAX_REPLY_LEN); if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) goto lend; +#if 1 + rc = buflen; +#endif MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* regenerate raw headers */ @@ -2073,6 +2080,9 @@ { LPWSTR * pFieldAndValue; +#if 1 + rc += buflen; +#endif TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );

1 0

[gvg] 20023: Merge from trunk:
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

Merge from trunk: Remove Wine-ism Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c --- branches/ros-branch-0_2_9/reactos/lib/wininet/http.c 2005-12-09 21:50:10 UTC (rev 20022) +++ branches/ros-branch-0_2_9/reactos/lib/wininet/http.c 2005-12-09 21:50:59 UTC (rev 20023) @@ -2024,7 +2024,11 @@ /* * HACK peek at the buffer */ +#if 0 + /* This is Wine code, we don't support MSG_PEEK yet so we have to do it + a bit different */ NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); +#endif /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. @@ -2033,6 +2037,9 @@ memset(buffer, 0, MAX_REPLY_LEN); if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) goto lend; +#if 1 + rc = buflen; +#endif MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* regenerate raw headers */ @@ -2073,6 +2080,9 @@ { LPWSTR * pFieldAndValue; +#if 1 + rc += buflen; +#endif TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); _____ Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c --- branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c 2005-12-09 21:50:10 UTC (rev 20022) +++ branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c 2005-12-09 21:50:59 UTC (rev 20023) @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define TIME_STRING_LEN 30 -#define CP_UNIXCP 65010 /* Wine extension */ time_t ConvertTimeString(LPCWSTR asctime) @@ -151,9 +150,9 @@ else len = strlenW(lpszServerName); - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); + sz = WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); name = HeapAlloc(GetProcessHeap(), 0, sz+1); - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); + WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; *phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name );

1 0

[gvg] 20022: Remove Wine-ism
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

Remove Wine-ism Modified: trunk/reactos/lib/wininet/utility.c _____ Modified: trunk/reactos/lib/wininet/utility.c --- trunk/reactos/lib/wininet/utility.c 2005-12-09 21:48:35 UTC (rev 20021) +++ trunk/reactos/lib/wininet/utility.c 2005-12-09 21:50:10 UTC (rev 20022) @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define TIME_STRING_LEN 30 -#define CP_UNIXCP 65010 /* Wine extension */ time_t ConvertTimeString(LPCWSTR asctime) @@ -151,9 +150,9 @@ else len = strlenW(lpszServerName); - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); + sz = WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); name = HeapAlloc(GetProcessHeap(), 0, sz+1); - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); + WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; *phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name );

1 0

[gvg] 20021: Merge from trunk:
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

Merge from trunk: Tell shdocvw where to get the Mozilla control Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf Modified: branches/ros-branch-0_2_9/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf --- branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf 2005-12-09 21:39:50 UTC (rev 20020) +++ branches/ros-branch-0_2_9/reactos/bootdata/hivesft.inf 2005-12-09 21:48:35 UTC (rev 20021) @@ -739,4 +739,7 @@ HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" +; Where to download the Mozilla ActiveX control +HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://source. winehq.org/mozactivex" + ; EOF _____ Modified: branches/ros-branch-0_2_9/reactos/lib/shdocvw/shdocvw_main.c --- branches/ros-branch-0_2_9/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:39:50 UTC (rev 20020) +++ branches/ros-branch-0_2_9/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:48:35 UTC (rev 20021) @@ -50,7 +50,7 @@ LONG SHDOCVW_refCount = 0; static const WCHAR szMozDlPath[] = { - 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\','R','e','a','c','t','O','S','\\', 's','h','d','o','c','v','w',0 }; @@ -321,7 +321,7 @@ /* find the name of the thing to download */ szUrl[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\shdocvw */ - r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey ); + r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey ); if( r == ERROR_SUCCESS ) { sz = MAX_PATH; @@ -404,7 +404,7 @@ { DWORD r; WCHAR buf[0x100]; - static const WCHAR szWine[] = { 'W','i','n','e',0 }; + static const WCHAR szTitle[] = { 'R','e','a','c','t','O','S',0 }; HANDLE hsem; SetLastError( ERROR_SUCCESS ); @@ -412,7 +412,7 @@ if( GetLastError() != ERROR_ALREADY_EXISTS ) { LoadStringW( shdocvw_hinstance, 1001, buf, sizeof buf/sizeof(WCHAR) ); - r = MessageBoxW(NULL, buf, szWine, MB_YESNO | MB_ICONQUESTION); + r = MessageBoxW(NULL, buf, szTitle, MB_YESNO | MB_ICONQUESTION); if( r != IDYES ) return FALSE; @@ -445,7 +445,7 @@ if( bTried ) { MESSAGE("You need to install the Mozilla ActiveX control to\n"); - MESSAGE("use Wine's builtin CLSID_WebBrowser from SHDOCVW.DLL\n"); + MESSAGE("use ReactOS's builtin CLSID_WebBrowser from SHDOCVW.DLL\n"); return FALSE; } SHDOCVW_TryDownloadMozillaControl();

1 0

[gvg] 20020: Tell shdocvw where to get the Mozilla control
by gvg＠svn.reactos.com 09 Dec '05

09 Dec '05

Tell shdocvw where to get the Mozilla control Modified: trunk/reactos/bootdata/hivesft.inf Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-12-09 21:25:39 UTC (rev 20019) +++ trunk/reactos/bootdata/hivesft.inf 2005-12-09 21:39:50 UTC (rev 20020) @@ -739,4 +739,7 @@ HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" +; Where to download the Mozilla ActiveX control +HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://source. winehq.org/mozactivex" + ; EOF _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:25:39 UTC (rev 20019) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:39:50 UTC (rev 20020) @@ -50,7 +50,7 @@ LONG SHDOCVW_refCount = 0; static const WCHAR szMozDlPath[] = { - 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\','R','e','a','c','t','O','S','\\', 's','h','d','o','c','v','w',0 }; @@ -321,7 +321,7 @@ /* find the name of the thing to download */ szUrl[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\shdocvw */ - r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey ); + r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey ); if( r == ERROR_SUCCESS ) { sz = MAX_PATH; @@ -404,7 +404,7 @@ { DWORD r; WCHAR buf[0x100]; - static const WCHAR szWine[] = { 'W','i','n','e',0 }; + static const WCHAR szTitle[] = { 'R','e','a','c','t','O','S',0 }; HANDLE hsem; SetLastError( ERROR_SUCCESS ); @@ -412,7 +412,7 @@ if( GetLastError() != ERROR_ALREADY_EXISTS ) { LoadStringW( shdocvw_hinstance, 1001, buf, sizeof buf/sizeof(WCHAR) ); - r = MessageBoxW(NULL, buf, szWine, MB_YESNO | MB_ICONQUESTION); + r = MessageBoxW(NULL, buf, szTitle, MB_YESNO | MB_ICONQUESTION); if( r != IDYES ) return FALSE; @@ -445,7 +445,7 @@ if( bTried ) { MESSAGE("You need to install the Mozilla ActiveX control to\n"); - MESSAGE("use Wine's builtin CLSID_WebBrowser from SHDOCVW.DLL\n"); + MESSAGE("use ReactOS's builtin CLSID_WebBrowser from SHDOCVW.DLL\n"); return FALSE; } SHDOCVW_TryDownloadMozillaControl();

1 0

[greatlrd] 20019: take care of NtGdiDdDeleteDirectDrawObject Attempted to lock object 0x8d1f9ad8 that is deleted! problem.
by greatlrd＠svn.reactos.com 09 Dec '05

09 Dec '05

take care of NtGdiDdDeleteDirectDrawObject Attempted to lock object 0x8d1f9ad8 that is deleted! problem. Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 20:58:32 UTC (rev 20018) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 21:25:39 UTC (rev 20019) @@ -210,7 +210,7 @@ if (pDirectDraw == NULL) { - DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED\n"); + DPRINT1("Can not lock DirectDraw handle \n"); return DDHAL_DRIVER_NOTHANDLED; } @@ -799,7 +799,11 @@ ) { DPRINT1("NtGdiDdDeleteSurfaceObject\n"); - return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); + /* FIXME add right GDI_OBJECT_TYPE_ for everthing for now + we are using same type */ + /* return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); */ + return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + }

1 0

[greatlrd] 20018: Adding more debug string on dx api that are being calling
by greatlrd＠svn.reactos.com 09 Dec '05

09 Dec '05

Adding more debug string on dx api that are being calling Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 20:40:52 UTC (rev 20017) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 20:58:32 UTC (rev 20018) @@ -71,6 +71,7 @@ if (!success) { + DPRINT1("DirectDraw creation failed\n"); // DirectDraw creation failed DC_UnlockDc(pDC); return NULL; @@ -80,6 +81,7 @@ if (!hDirectDraw) { /* No more memmory */ + DPRINT1("No more memmory\n"); DC_UnlockDc(pDC); return NULL; } @@ -88,6 +90,7 @@ if (!pDirectDraw) { /* invalid handle */ + DPRINT1("invalid handle\n"); DC_UnlockDc(pDC); return NULL; } @@ -140,7 +143,11 @@ DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (!pDirectDraw) + { + /* Fail to Lock DirectDraw handle */ + DPRINT1(" Fail to Lock DirectDraw handle \n"); return FALSE; + } BOOL success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, @@ -152,29 +159,38 @@ if (!success) { + DPRINT1(" Fail to get DirectDraw driver info \n"); GDIOBJ_UnlockObjByPtr(pDirectDraw); return FALSE; } if (pHalInfo) { + DPRINT1("Found DirectDraw CallBack for 2D Hal\n"); RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); if (pHalInfo->lpD3DHALCallbacks) - { + { + DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof(D3DNTHAL_CALLBACKS)); } if (pHalInfo->lpD3DGlobalDriverData) { + DPRINT1("Found DirectDraw CallBack for 3D Hal Private \n"); RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); } if (pHalInfo->lpD3DBufCallbacks) { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); } - - } + + } + else + { + DPRINT1("No DirectDraw Hal info have been found, it did not fail, it did gather some other info \n"); + } GDIOBJ_UnlockObjByPtr(pDirectDraw); @@ -193,10 +209,16 @@ DPRINT1("NtGdiDdGetDriverInfo\n"); if (pDirectDraw == NULL) + { + DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED\n"); return DDHAL_DRIVER_NOTHANDLED; + } if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFOSET)) + { + DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED\n"); ddRVal = DDHAL_DRIVER_NOTHANDLED; + } else ddRVal = pDirectDraw->Hal.GetDriverInfo(puGetDriverInfoData);

1 0

[greatlrd] 20017: Take care of one BSOD in NtGdiDdCreateDirectDrawObject, it is not correct fix, it is a work around, the HDC can be NULL. it prevent some bsod for my new test apps for directx
by greatlrd＠svn.reactos.com 09 Dec '05

09 Dec '05

Take care of one BSOD in NtGdiDdCreateDirectDrawObject, it is not correct fix, it is a work around, the HDC can be NULL. it prevent some bsod for my new test apps for directx Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 19:28:04 UTC (rev 20016) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-09 20:40:52 UTC (rev 20017) @@ -48,7 +48,13 @@ RtlZeroMemory(&palette_callbacks, sizeof(DD_PALETTECALLBACKS)); palette_callbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - + /* FIXME hdc can be zero for d3d9 */ + /* we need create it, if in that case */ + if (hdc == NULL) + { + return NULL; + } + DC *pDC = DC_LockDc(hdc); if (!pDC) return NULL;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs