Author: cwittich Date: Fri Jan 23 07:29:06 2009 New Revision: 39045
URL: http://svn.reactos.org/svn/reactos?rev=39045&view=rev Log: sync mpr with wine 1.1.13
Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Zh.rc trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c
Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "lbg[NSÌ" + IDS_ENTIRENETWORK "ãããã¯ã¼ã¯å ¨ä½" } + +#pragma code_page(default)
Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE { @@ -29,7 +29,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀ̸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇϽÿÀ:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10
Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -31,7 +31,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¾å ¥ç½ç»å¯ç " -FONT 9, "MS Song" +FONT 9, "MS Shell Dlg" { LTEXT "请è¾å ¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "代ç", -1, 40, 26, 50, 10 @@ -58,7 +58,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¼¸å ¥ç¶²è·¯å¯ç¢¼" -FONT 8, "PMingLiu" +FONT 9, "MS Shell Dlg" { LTEXT "è«è¼¸å ¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "代ç", -1, 40, 26, 50, 10
Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -39,7 +39,7 @@ return x + 'A' - 10; }
-static inline CHAR ctox( CHAR x ) +static inline signed char ctox( CHAR x ) { if( ( x >= '0' ) && ( x <= '9' ) ) return x - '0'; @@ -282,7 +282,7 @@ /* decode the value */ for(j=5; j<val_sz; j+=2 ) { - CHAR hi = ctox( val[j] ), lo = ctox( val[j+1] ); + signed char hi = ctox( val[j] ), lo = ctox( val[j+1] ); if( ( hi < 0 ) || ( lo < 0 ) ) break; val[(j-5)/2] = (hi<<4) | lo;
Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=39... ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -746,8 +746,7 @@ dwScope, dwType, dwUsage, lpNet, &handle); if (ret == WN_SUCCESS) { - *lphEnum = - (HANDLE)_createProviderEnumerator( + *lphEnum = _createProviderEnumerator( dwScope, dwType, dwUsage, index, handle); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -761,7 +760,7 @@ } else if (lpNet->lpRemoteName) { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } @@ -773,13 +772,13 @@ /* comment matches the "Entire Network", enumerate * global scope of every provider */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); } else { /* this is the same as not having passed lpNet */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, NULL); } ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -787,19 +786,18 @@ } else { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, dwType, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } break; case RESOURCE_CONTEXT: - *lphEnum = (HANDLE)_createContextEnumerator(dwScope, dwType, - dwUsage); + *lphEnum = _createContextEnumerator(dwScope, dwType, dwUsage); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; case RESOURCE_REMEMBERED: case RESOURCE_CONNECTED: - *lphEnum = (HANDLE)_createNullEnumerator(); + *lphEnum = _createNullEnumerator(); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; default: @@ -853,8 +851,8 @@ * size is the appropriate usage of this function, so * hopefully it won't be an issue. */ - ret = _thunkNetResourceArrayWToA((LPNETRESOURCEW)localBuffer, - &localCount, lpBuffer, lpBufferSize); + ret = _thunkNetResourceArrayWToA(localBuffer, &localCount, + lpBuffer, lpBufferSize); *lpcCount = localCount; } HeapFree(GetProcessHeap(), 0, localBuffer); @@ -923,8 +921,7 @@ } } strNext = (LPWSTR)((LPBYTE)lpBuffer + count * sizeof(NETRESOURCEW)); - for (i = 0, resource = (LPNETRESOURCEW)lpBuffer; i < count; - i++, resource++) + for (i = 0, resource = lpBuffer; i < count; i++, resource++) { resource->dwScope = RESOURCE_GLOBALNET; resource->dwType = RESOURCETYPE_ANY; @@ -1136,7 +1133,7 @@ } else { - LPNETRESOURCEW lpNet = (LPNETRESOURCEW)lpBuffer; + LPNETRESOURCEW lpNet = lpBuffer;
lpNet->dwScope = RESOURCE_GLOBALNET; lpNet->dwType = enumerator->dwType; @@ -1418,7 +1415,7 @@
if (!(lpBuffer)) ret = WN_OUT_OF_MEMORY; - else + else if (providerTable != NULL) { /* FIXME: For function value of a variable is indifferent, it does * search of all providers in a network. @@ -1861,7 +1858,7 @@ { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer; + LPUNIVERSAL_NAME_INFOA info = lpBuffer;
size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; if (*lpBufferSize < size) @@ -1903,7 +1900,7 @@ { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer; + LPUNIVERSAL_NAME_INFOW info = lpBuffer;
size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size) @@ -2121,7 +2118,7 @@ providerTable->table[providerIndex].dwSpecVersion; lpNetInfoStruct->dwStatus = NO_ERROR; lpNetInfoStruct->dwCharacteristics = 0; - lpNetInfoStruct->dwHandle = (ULONG_PTR)NULL; + lpNetInfoStruct->dwHandle = 0; lpNetInfoStruct->wNetType = HIWORD(providerTable->table[providerIndex].dwNetType); lpNetInfoStruct->dwPrinters = -1;
-
cwittich＠svn.reactos.org