Bug 668663 - OFNHookProc callback in the file picker code should return a UINT_PTR. r=neil
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 01 Jul 2011 18:22:10 +0900
changeset 72706 08a813a4770991aa3b1062797c010533219c19a5
parent 72705 cbb285709139e8a9144d755a4130ece9e313d491
child 72707 72ef7b87222c889991a2a2e112ecc9c9dfb41638
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs668663
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 668663 - OFNHookProc callback in the file picker code should return a UINT_PTR. r=neil
widget/src/windows/nsFilePicker.cpp
--- a/widget/src/windows/nsFilePicker.cpp
+++ b/widget/src/windows/nsFilePicker.cpp
@@ -94,18 +94,18 @@ int CALLBACK BrowseCallbackProc(HWND hwn
                      TRUE /* true because lpData is a path string */,
                      lpData);
   }
   return 0;
 }
 
 // Callback hook which will dynamically allocate a buffer large
 // enough for the file picker dialog.
-static unsigned int CALLBACK FilePickerHook(HWND hwnd, UINT msg,
-                                            WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK FilePickerHook(HWND hwnd, UINT msg,
+                                        WPARAM wParam, LPARAM lParam)
 {
   switch (msg) {
     case WM_INITDIALOG:
       {
         // Finds the child drop down of a File Picker dialog and sets the 
         // maximum amount of text it can hold when typed in manually.
         // A wParam of 0 mean 0x7FFFFFFE characters.
         HWND comboBox = FindWindowEx(GetParent(hwnd), NULL,