Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEDLG] Sync with Wine Staging 2.9. CORE-13362

Browse source 
0028360 oledlg: Use W-functions to access window property.

svn path=/trunk/; revision=74833
This commit is contained in:
Amine Khaldi 2017-06-03 22:34:33 +00:00
parent 2f788a0264
commit 9b660289c6
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/oledlg/insobjdlg.c
View file

@ -60,7 +60,8 @@ static void UIINSERTOBJECTDLG_AddControl(InsertObjectDlgInfo* pdlgInfo);
typedef HRESULT (*DLLREGISTER) (void); typedef HRESULT (*DLLREGISTER) (void);
extern HINSTANCE OLEDLG_hInstance; extern HINSTANCE OLEDLG_hInstance;
static const char OleUIInsertObjectInfoStr[] = "OleUIInsertObjectInfoStr"; static const WCHAR OleUIInsertObjectInfoStr[] = {'O','l','e','U','I','I','n','s','e','r','t','O','b','j','e','c','t',
'I','n','f','o','S','t','r',0};
/*********************************************************************** /***********************************************************************
* OleUIInsertObjectA (OLEDLG.3) * OleUIInsertObjectA (OLEDLG.3)
@ -112,7 +113,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
*/ */
INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr);
switch(uMsg) switch(uMsg)
{ {
@ -122,7 +123,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
pdlgInfo->hwndSelf = hwnd; pdlgInfo->hwndSelf = hwnd;
SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); SetPropW(hwnd, OleUIInsertObjectInfoStr, pdlgInfo);
UIINSERTOBJECTDLG_InitDialog(pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo);
@ -135,7 +136,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
case WM_DESTROY: case WM_DESTROY:
if (pdlgInfo) if (pdlgInfo)
UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo); UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo);
RemovePropA(hwnd, OleUIInsertObjectInfoStr); RemovePropW(hwnd, OleUIInsertObjectInfoStr);
return FALSE; return FALSE;
default : default :
@ -151,9 +152,9 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
*/ */
static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr);
WORD wNotifyCode = HIWORD(wParam); WORD wNotifyCode = HIWORD(wParam);
WORD wID = LOWORD(wParam); WORD wID = LOWORD(wParam);
InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr);
switch(wID) switch(wID)
{ {

2
reactos/media/doc/README.WINE
View file

@ -143,7 +143,7 @@ reactos/dll/win32/ole32 # Synced to WineStaging-2.9
reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11
reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9 reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9
reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11
reactos/dll/win32/oledlg # Synced to WineStaging-1.9.23 reactos/dll/win32/oledlg # Synced to WineStaging-2.9
reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11 reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11
reactos/dll/win32/olesvr32 # Synced to WineStaging-1.9.11 reactos/dll/win32/olesvr32 # Synced to WineStaging-1.9.11
reactos/dll/win32/olethk32 # Synced to WineStaging-1.9.11 reactos/dll/win32/olethk32 # Synced to WineStaging-1.9.11