wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Stefan Leichter : shell32: Added tests for SHGetFolderPathAndSubDirA.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: b5cc68f629345d936e71d9e450ee45f888139cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cc68f629345d936e71d9e45… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Mar 3 23:44:52 2008 +0100 shell32: Added tests for SHGetFolderPathAndSubDirA. --- dlls/shell32/tests/shlfolder.c | 104 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 59e032e..033447d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -43,6 +43,8 @@ static IMalloc *ppM; static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); +static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); +static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); @@ -57,6 +59,8 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHBindToParent = (void*)GetProcAddress(hmod, "SHBindToParent"); + pSHGetFolderPathA = (void*)GetProcAddress(hmod, "SHGetFolderPathA"); + pSHGetFolderPathAndSubDirA = (void*)GetProcAddress(hmod, "SHGetFolderPathAndSubDirA"); pSHGetPathFromIDListW = (void*)GetProcAddress(hmod, "SHGetPathFromIDListW"); pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); @@ -1365,6 +1369,102 @@ static void test_ITEMIDLIST_format(void) { } } +static void testSHGetFolderPathAndSubDirA(void) +{ + HRESULT ret; + BOOL delret; + DWORD dwret; + int i; + static char wine[] = "wine"; + static char winetemp[] = "wine\\temp"; + static char appdata[MAX_PATH]; + static char testpath[MAX_PATH]; + static char toolongpath[MAX_PATH+1]; + + if(!pSHGetFolderPathA) { + skip("SHGetFolderPathA not present!\n"); + return; + } + if(!SUCCEEDED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + { + skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); + return; + } + + sprintf(testpath, "%s\\%s", appdata, winetemp); + delret = RemoveDirectoryA(testpath); + if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) { + skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + return; + } + + sprintf(testpath, "%s\\%s", appdata, wine); + delret = RemoveDirectoryA(testpath); + if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) { + skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + return; + } + for(i=0; i< MAX_PATH; i++) + toolongpath[i] = '0' + i % 10; + toolongpath[MAX_PATH] = '\0'; + + /* test invalid second parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); + + /* test invalid forth parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, wine, testpath); + ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); + + /* test fifth parameter */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, + "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + + /* test a not existing path */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, + "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); + + /* create a directory inside a not existing directory */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!strncmp(appdata, testpath, strlen(appdata)), + "expected %s to start with %s\n", testpath, appdata); + ok(!lstrcmpA(&testpath[1 + strlen(appdata)], winetemp), + "expected %s to end with %s\n", testpath, winetemp); + dwret = GetFileAttributes(testpath); + ok(FILE_ATTRIBUTE_DIRECTORY | dwret, "expected %x to contain FILE_ATTRIBUTE_DIRECTORY\n", dwret); + + /* cleanup */ + sprintf(testpath, "%s\\%s", appdata, winetemp); + RemoveDirectoryA(testpath); + sprintf(testpath, "%s\\%s", appdata, wine); + RemoveDirectoryA(testpath); +} + + START_TEST(shlfolder) { init_function_pointers(); @@ -1381,6 +1481,10 @@ START_TEST(shlfolder) test_CallForAttributes(); test_FolderShortcut(); test_ITEMIDLIST_format(); + if(pSHGetFolderPathAndSubDirA) + testSHGetFolderPathAndSubDirA(); + else + skip("SHGetFolderPathAndSubDirA not present\n"); OleUninitialize(); }

1 0

Roderick Colenbrander : wgl: Add aux buffers support for use with wglChoosePixelFormatARB.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 257d82705c9efa4fb1e4b59b28c8d916696b90d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=257d82705c9efa4fb1e4b59b2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 3 23:45:25 2008 +0100 wgl: Add aux buffers support for use with wglChoosePixelFormatARB. --- dlls/winex11.drv/opengl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0a3745d..33b09d3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -618,6 +618,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); switch (iWGLAttr[cur]) { + case WGL_AUX_BUFFERS_ARB: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_AUX_BUFFERS, pop); + TRACE("pAttr[%d] = GLX_AUX_BUFFERS: %d\n", cur, pop); + break; case WGL_COLOR_BITS_ARB: pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop);

1 0

Andrew Talbot : kernel32: Assign to structs instead of using memcpy.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 54a376f2286c42164c8ba869da66739410feb6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a376f2286c42164c8ba869d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 3 22:27:46 2008 +0000 kernel32: Assign to structs instead of using memcpy. --- dlls/kernel32/comm.c | 12 +++++++----- dlls/kernel32/cpu.c | 6 +++--- dlls/kernel32/environ.c | 4 ++-- dlls/kernel32/heap.c | 4 ++-- dlls/kernel32/thunk.c | 8 ++++---- dlls/kernel32/time.c | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index ea71a26..7986636 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -477,17 +477,19 @@ BOOL WINAPI BuildCommDCBAndTimeoutsW( COMMTIMEOUTS timeouts; BOOL result; LPCWSTR ptr = devid; - + TRACE("(%s,%p,%p)\n",debugstr_w(devid),lpdcb,lptimeouts); + memset(&timeouts, 0, sizeof timeouts); + /* Set DCBlength. (Windows NT does not do this, but 9x does) */ lpdcb->DCBlength = sizeof(DCB); /* Make a copy of the original data structures to work with since if if there is an error in the device control string the originals should not be modified (except possibly DCBlength) */ - memcpy(&dcb, lpdcb, sizeof(DCB)); - if(lptimeouts) memcpy(&timeouts, lptimeouts, sizeof(COMMTIMEOUTS)); + dcb = *lpdcb; + if(lptimeouts) timeouts = *lptimeouts; ptr = COMM_ParseStart(ptr); @@ -500,8 +502,8 @@ BOOL WINAPI BuildCommDCBAndTimeoutsW( if(result) { - memcpy(lpdcb, &dcb, sizeof(DCB)); - if(lptimeouts) memcpy(lptimeouts, &timeouts, sizeof(COMMTIMEOUTS)); + *lpdcb = dcb; + if(lptimeouts) *lptimeouts = timeouts; return TRUE; } else diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1f3d945..85027eb 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -370,7 +370,7 @@ VOID WINAPI GetSystemInfo( TRACE("si=0x%p\n", si); if (cache) { - memcpy(si,&cachedsi,sizeof(*si)); + *si = cachedsi; return; } memset(PF,0,sizeof(PF)); @@ -392,7 +392,7 @@ VOID WINAPI GetSystemInfo( cachedsi.wProcessorRevision = 0; cache = 1; /* even if there is no more info, we now have a cache entry */ - memcpy(si,&cachedsi,sizeof(*si)); + *si = cachedsi; /* Hmm, reasonable processor feature defaults? */ @@ -788,7 +788,7 @@ VOID WINAPI GetSystemInfo( if (!cachedsi.dwActiveProcessorMask) cachedsi.dwActiveProcessorMask = (1 << cachedsi.dwNumberOfProcessors) - 1; - memcpy(si,&cachedsi,sizeof(*si)); + *si = cachedsi; TRACE("<- CPU arch %d, res'd %d, pagesize %d, minappaddr %p, maxappaddr %p," " act.cpumask %08x, numcpus %d, CPU type %d, allocgran. %d, CPU level %d, CPU rev %d\n", diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 7089c20..aaa9d6e 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -421,7 +421,7 @@ BOOL WINAPI SetStdHandle( DWORD std_handle, HANDLE handle ) */ VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) { - memcpy(info, &startup_infoA, sizeof(startup_infoA)); + *info = startup_infoA; } @@ -430,7 +430,7 @@ VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) */ VOID WINAPI GetStartupInfoW( LPSTARTUPINFOW info ) { - memcpy(info, &startup_infoW, sizeof(startup_infoW)); + *info = startup_infoW; } /****************************************************************** diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 34d4f20..9931c09 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1227,7 +1227,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) } if (time(NULL)==cache_lastchecked) { - memcpy(lpmemex,&cached_memstatus,sizeof(*lpmemex)); + *lpmemex = cached_memstatus; return TRUE; } cache_lastchecked = time(NULL); @@ -1347,7 +1347,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) */ lpmemex->ullAvailExtendedVirtual = 0; - memcpy(&cached_memstatus,lpmemex,sizeof(*lpmemex)); + cached_memstatus = *lpmemex; TRACE("<-- LPMEMORYSTATUSEX: dwLength %d, dwMemoryLoad %d, ullTotalPhys %s, ullAvailPhys %s," " ullTotalPageFile %s, ullAvailPageFile %s, ullTotalVirtual %s, ullAvailVirtual %s\n", diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 5487b34..3533051 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -454,7 +454,7 @@ void WINAPI __regs_QT_Thunk( CONTEXT86 *context ) CONTEXT86 context16; DWORD argsize; - memcpy(&context16,context,sizeof(context16)); + context16 = *context; context16.SegFs = wine_get_fs(); context16.SegGs = wine_get_gs(); @@ -588,7 +588,7 @@ void WINAPI __regs_FT_Thunk( CONTEXT86 *context ) DWORD newstack[32]; LPBYTE oldstack; - memcpy(&context16,context,sizeof(context16)); + context16 = *context; context16.SegFs = wine_get_fs(); context16.SegGs = wine_get_gs(); @@ -753,7 +753,7 @@ void WINAPI __regs_Common32ThkLS( CONTEXT86 *context ) CONTEXT86 context16; DWORD argsize; - memcpy(&context16,context,sizeof(context16)); + context16 = *context; context16.SegFs = wine_get_fs(); context16.SegGs = wine_get_gs(); @@ -814,7 +814,7 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT86 *context ) CONTEXT86 context16; DWORD argsize; - memcpy(&context16,context,sizeof(context16)); + context16 = *context; context16.SegFs = wine_get_fs(); context16.SegGs = wine_get_gs(); diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0ad612d..0a255ed 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -453,7 +453,7 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( if (lpTimeZoneInformation != NULL) { - memcpy(&tzinfo, lpTimeZoneInformation, sizeof(TIME_ZONE_INFORMATION)); + tzinfo = *lpTimeZoneInformation; } else { @@ -499,7 +499,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( if (lpTimeZoneInformation != NULL) { - memcpy(&tzinfo, lpTimeZoneInformation, sizeof(TIME_ZONE_INFORMATION)); + tzinfo = *lpTimeZoneInformation; } else {

1 0

Peter Oberndorfer : cmdlgtst: Remove unneeded DLGPROC casts.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 90b7baa2bc8bc7bc0ed2760ca265892b30bd3875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b7baa2bc8bc7bc0ed2760ca… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Mar 3 21:21:04 2008 +0100 cmdlgtst: Remove unneeded DLGPROC casts. --- programs/cmdlgtst/cmdlgtst.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index d9ae7a9..33727f4 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -813,37 +813,37 @@ static INT_PTR CALLBACK mwcd_About(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l static void mwc_ColorSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "Color_Flags_Dialog", hWnd, (DLGPROC) mwcd_ColorSetup); + int r = DialogBox(g_hInstance, "Color_Flags_Dialog", hWnd, mwcd_ColorSetup); if(r < 0) { MessageBox(hWnd, "Failure opening Color_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } static void mwc_FontSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "Font_Flags_Dialog", hWnd, (DLGPROC) mwcd_FontSetup); + int r = DialogBox(g_hInstance, "Font_Flags_Dialog", hWnd, mwcd_FontSetup); if(r < 0) { MessageBox(hWnd, "Failure opening Font_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } static void mwc_FindReplaceSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "Find_Flags_Dialog", hWnd, (DLGPROC) mwcd_FindSetup); + int r = DialogBox(g_hInstance, "Find_Flags_Dialog", hWnd, mwcd_FindSetup); if(r < 0) { MessageBox(hWnd, "Failure opening Find_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } static void mwc_PrintSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "Print_Flags_Dialog", hWnd, (DLGPROC) mwcd_PrintSetup); + int r = DialogBox(g_hInstance, "Print_Flags_Dialog", hWnd, mwcd_PrintSetup); if(r < 0) { MessageBox(hWnd, "Failure opening Print_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } static void mwc_PageSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "PageSetup_Flags_Dialog", hWnd, (DLGPROC) mwcd_PageSetup); + int r = DialogBox(g_hInstance, "PageSetup_Flags_Dialog", hWnd, mwcd_PageSetup); if(r < 0) { MessageBox(hWnd, "Failure opening PageSetup_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } static void mwc_FileSetup(HWND hWnd) { - int r = DialogBox(g_hInstance, "File_Flags_Dialog", hWnd, (DLGPROC) mwcd_FileSetup); + int r = DialogBox(g_hInstance, "File_Flags_Dialog", hWnd, mwcd_FileSetup); if(r < 0) { MessageBox(hWnd, "Failure opening File_Flags_Dialog box", "Error", MB_ICONASTERISK|MB_OK); } } @@ -964,10 +964,10 @@ static LRESULT CALLBACK EXPORT mainWindowDispatcher( mwc_PageSetup(hWnd); return 1; case CM_H_ABOUT: - DialogBox(g_hInstance, "AboutDialog", hWnd, (DLGPROC) mwcd_About); + DialogBox(g_hInstance, "AboutDialog", hWnd, mwcd_About); return 1; case CM_H_USAGE: - DialogBox(g_hInstance, "UsageDialog", hWnd, (DLGPROC) mwcd_About); + DialogBox(g_hInstance, "UsageDialog", hWnd, mwcd_About); /* return value? *What* return value? */ return 1;

1 0

Peter Oberndorfer : wordpad: Use correct prototype for dialog functions.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: d8b2f161b0e6a1eff5f18574e79fca58b4bcee44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b2f161b0e6a1eff5f18574e… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Mar 3 21:05:34 2008 +0100 wordpad: Use correct prototype for dialog functions. --- programs/wordpad/wordpad.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 300376a..7ef5548 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1212,7 +1212,7 @@ static void number_with_units(LPWSTR buffer, int number) MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN); } -BOOL CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch(message) { @@ -1263,7 +1263,7 @@ BOOL CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara return FALSE; } -BOOL CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch(message) { @@ -1844,7 +1844,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); int ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE), hWnd, - (DLGPROC)newfile_proc); + newfile_proc); if(ret != ID_NEWFILE_ABORT) { @@ -2160,7 +2160,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_DATETIME: { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, (DLGPROC)datetime_proc); + DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc); break; }

1 0

Stefan Dösinger : d3d9: Remove D3D9GetSWInfo.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: b0269c94860e18047597fa6283936864baa7145e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0269c94860e18047597fa628… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 23 22:58:00 2008 +0100 d3d9: Remove D3D9GetSWInfo. --- dlls/d3d9/d3d9.spec | 2 -- dlls/d3d9/d3d9_main.c | 5 ----- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 4b7cf71..a33cba5 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -12,5 +12,3 @@ @ stdcall DebugSetMute() @ stdcall Direct3DCreate9(long) @ stdcall Direct3DCreate9Ex(long ptr) - -@ stdcall D3D9GetSWInfo() diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index b431b82..69ad9c8 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -38,11 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static int D3DPERF_event_level = 0; -HRESULT WINAPI D3D9GetSWInfo(void) { - FIXME("(void): stub\n"); - return 0; -} - void WINAPI DebugSetMute(void) { /* nothing to do */ }

1 0

Stefan Dösinger : d3d9: Reorder the spec file.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 086dd8178f65f39b9f6f4bbe8a4f7f50af686784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086dd8178f65f39b9f6f4bbe8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 23 22:56:41 2008 +0100 d3d9: Reorder the spec file. --- dlls/d3d9/d3d9.spec | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 94500ca..4b7cf71 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -1,12 +1,16 @@ -@ stdcall D3D9GetSWInfo() -@ stdcall DebugSetMute() -@ stdcall Direct3DCreate9(long) @ stdcall Direct3DShaderValidatorCreate9() +@ stub PSGPError +@ stub PSGPSampleTexture @ stdcall D3DPERF_BeginEvent(long wstr) @ stdcall D3DPERF_EndEvent() @ stdcall D3DPERF_GetStatus() -@ stdcall D3DPERF_SetOptions(long) @ stdcall D3DPERF_QueryRepeatFrame() @ stdcall D3DPERF_SetMarker(long wstr) +@ stdcall D3DPERF_SetOptions(long) @ stdcall D3DPERF_SetRegion(long wstr) +@ stub DebugSetLevel +@ stdcall DebugSetMute() +@ stdcall Direct3DCreate9(long) @ stdcall Direct3DCreate9Ex(long ptr) + +@ stdcall D3D9GetSWInfo()

1 0

Stefan Dösinger : d3d9: Implement Direct3DCreate9Ex + tests.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: d7098076e1a8f0fdc7463281d62745f1dff8805a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7098076e1a8f0fdc7463281d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:31:25 2008 +0100 d3d9: Implement Direct3DCreate9Ex + tests. --- dlls/d3d9/d3d9.spec | 1 + dlls/d3d9/d3d9_main.c | 17 ++++ dlls/d3d9/tests/Makefile.in | 1 + dlls/d3d9/tests/d3d9ex.c | 202 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 221 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7098076e1a8f0fdc7463…

1 0

Stefan Dösinger : d3d9: IDirect3DDevice9Ex stub.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: c1a0037b887318ebd324e69364fd269fa2ef48f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a0037b887318ebd324e6936… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:25:35 2008 +0100 d3d9: IDirect3DDevice9Ex stub. --- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 106 +++++++------- dlls/d3d9/device.c | 313 +++++++++++++++++++++++++++++------------ dlls/d3d9/directx.c | 13 ++- dlls/d3d9/indexbuffer.c | 2 +- dlls/d3d9/pixelshader.c | 18 ++-- dlls/d3d9/query.c | 2 +- dlls/d3d9/stateblock.c | 6 +- dlls/d3d9/swapchain.c | 6 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/d3d9/vertexdeclaration.c | 8 +- dlls/d3d9/vertexshader.c | 18 ++-- dlls/d3d9/volumetexture.c | 2 +- 14 files changed, 319 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a0037b887318ebd324e…

1 0

Stefan Dösinger : d3d9: Add an IDirect3D9Ex stub.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: d9f97259939f7273d6325441ae1e82a7bb0691d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f97259939f7273d6325441a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:10:46 2008 +0100 d3d9: Add an IDirect3D9Ex stub. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/directx.c | 80 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 63 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9f97259939f7273d6325…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2008