ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use GetSystemDefaultLangID() instead of WINE_LanguageId.

This commit is contained in:
Dmitry Timoshkov 2000-06-18 19:31:19 +00:00 committed by Alexandre Julliard
parent 911436bfeb
commit 5890c09983
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
loader/resource.c
View File

@ -36,8 +36,6 @@
DEFAULT_DEBUG_CHANNEL(resource); DEFAULT_DEBUG_CHANNEL(resource);
DECLARE_DEBUG_CHANNEL(accel); DECLARE_DEBUG_CHANNEL(accel);
extern WORD WINE_LanguageId;
#define HRSRC_MAP_BLOCKSIZE 16 #define HRSRC_MAP_BLOCKSIZE 16
typedef struct _HRSRC_ELEM typedef struct _HRSRC_ELEM
@ -449,7 +447,7 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, SEGPTR name, SEGPTR type )
LPCSTR typeStr = HIWORD(type)? PTR_SEG_TO_LIN(type) : (LPCSTR)type; LPCSTR typeStr = HIWORD(type)? PTR_SEG_TO_LIN(type) : (LPCSTR)type;
return RES_FindResource( hModule, typeStr, nameStr, return RES_FindResource( hModule, typeStr, nameStr,
WINE_LanguageId, FALSE, TRUE ); GetSystemDefaultLangID(), FALSE, TRUE );
} }
/********************************************************************** /**********************************************************************
@ -458,7 +456,7 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, SEGPTR name, SEGPTR type )
HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type ) HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
{ {
return RES_FindResource( hModule, type, name, return RES_FindResource( hModule, type, name,
WINE_LanguageId, FALSE, FALSE ); GetSystemDefaultLangID(), FALSE, FALSE );
} }
/********************************************************************** /**********************************************************************
@ -487,7 +485,7 @@ HRSRC WINAPI FindResourceExW( HMODULE hModule,
HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type) HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
{ {
return RES_FindResource( hModule, (LPCSTR)type, (LPCSTR)name, return RES_FindResource( hModule, (LPCSTR)type, (LPCSTR)name,
WINE_LanguageId, TRUE, FALSE ); GetSystemDefaultLangID(), TRUE, FALSE );
} }
/********************************************************************** /**********************************************************************

3
msdos/int21.c
View File

@ -2033,7 +2033,6 @@ void WINAPI DOS3Call( CONTEXT86 *context )
break; break;
case 0x65:{/* GET EXTENDED COUNTRY INFORMATION */ case 0x65:{/* GET EXTENDED COUNTRY INFORMATION */
extern WORD WINE_LanguageId;
BYTE *dataptr=CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context)); BYTE *dataptr=CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context));
TRACE("GET EXTENDED COUNTRY INFORMATION code page %d country %d\n", TRACE("GET EXTENDED COUNTRY INFORMATION code page %d country %d\n",
BX_reg(context), DX_reg(context)); BX_reg(context), DX_reg(context));
@ -2042,7 +2041,7 @@ void WINAPI DOS3Call( CONTEXT86 *context )
TRACE("\tget general internationalization info\n"); TRACE("\tget general internationalization info\n");
dataptr[0] = 0x1; dataptr[0] = 0x1;
*(WORD*)(dataptr+1) = 41; *(WORD*)(dataptr+1) = 41;
*(WORD*)(dataptr+3) = WINE_LanguageId; *(WORD*)(dataptr+3) = GetSystemDefaultLangID();
*(WORD*)(dataptr+5) = CodePage; *(WORD*)(dataptr+5) = CodePage;
*(DWORD*)(dataptr+0x19) = 0; /* FIXME: ptr to case map routine */ *(DWORD*)(dataptr+0x19) = 0; /* FIXME: ptr to case map routine */
break; break;