October 2008 - Wine-commits

Alexandre Julliard : winecfg: Update the drives only when they have changed , instead of trying to compare with the current setup.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: f410cf7c98aa60b7d6beb418b2a342466f4c8ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f410cf7c98aa60b7d6beb418b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 12:15:43 2008 +0200 winecfg: Update the drives only when they have changed, instead of trying to compare with the current setup. --- programs/winecfg/drive.c | 95 +++++++++---------------------------------- programs/winecfg/driveui.c | 7 +++ programs/winecfg/winecfg.h | 1 + 3 files changed, 28 insertions(+), 75 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 1516426..bc3766c 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -103,6 +103,7 @@ BOOL add_drive(char letter, const char *targetpath, const WCHAR *label, DWORD se drives[driveIndex].serial = serial; drives[driveIndex].type = type; drives[driveIndex].in_use = TRUE; + drives[driveIndex].modified = TRUE; return TRUE; } @@ -116,6 +117,7 @@ void delete_drive(struct drive *d) d->label = NULL; d->serial = 0; d->in_use = FALSE; + d->modified = TRUE; } static void set_drive_type( char letter, DWORD type ) @@ -370,6 +372,9 @@ void load_drives(void) drivecount++; } + /* reset modified flags */ + for (i = 0; i < 26; i++) drives[i].modified = FALSE; + WINE_TRACE("found %d drives\n", drivecount); HeapFree(GetProcessHeap(), 0, path); @@ -383,66 +388,37 @@ void apply_drive_changes(void) int i; CHAR devicename[4]; CHAR targetpath[256]; - BOOL foundDrive; - WCHAR volumeNameBuffer[512]; - DWORD serialNumber; - int retval; - BOOL defineDevice; WINE_TRACE("\n"); /* add each drive and remove as we go */ for(i = 0; i < 26; i++) { - defineDevice = FALSE; - foundDrive = FALSE; - volumeNameBuffer[0] = 0; - serialNumber = 0; - snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); + if (!drives[i].modified) continue; + drives[i].modified = FALSE; - /* get a drive */ - if(QueryDosDevice(devicename, targetpath, sizeof(targetpath))) - { - char *cursor; - - /* correct the slashes in the path to be UNIX style */ - while ((cursor = strchr(targetpath, '\\'))) *cursor = '/'; - - foundDrive = TRUE; - } + snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); - /* if we found a drive and have a drive then compare things */ - if(foundDrive && drives[i].in_use) + if (drives[i].in_use) { - WCHAR deviceW[4] = {'a',':','\\',0}; - WINE_TRACE("drives[i].letter: '%c'\n", drives[i].letter); - - deviceW[0] = 'A' + i; - retval = GetVolumeInformationW(deviceW, volumeNameBuffer, sizeof(volumeNameBuffer)/sizeof(WCHAR), - &serialNumber, NULL, NULL, NULL, 0 ); - if(!retval) + /* define this drive */ + /* DefineDosDevice() requires that NO trailing slash be present */ + if(!DefineDosDevice(DDD_RAW_TARGET_PATH, devicename, drives[i].unixpath)) { - WINE_TRACE(" GetVolumeInformation() for '%s' failed\n", devicename); + WINE_ERR(" unable to define devicename of '%s', targetpath of '%s'\n", + devicename, drives[i].unixpath); PRINTERROR(); - volumeNameBuffer[0] = '\0'; - } - - WINE_TRACE(" current path: '%s', new path: '%s'\n", - targetpath, drives[i].unixpath); - - /* compare to what we have */ - /* do we have the same targetpath? */ - if(strcmp(drives[i].unixpath, targetpath)) - { - defineDevice = TRUE; - WINE_TRACE(" making changes to drive '%s'\n", devicename); } else { - WINE_TRACE(" no changes to drive '%s'\n", devicename); + WINE_TRACE(" added devicename of '%s', targetpath of '%s'\n", + devicename, drives[i].unixpath); } + set_drive_label( drives[i].letter, drives[i].label ); + set_drive_serial( drives[i].letter, drives[i].serial ); + set_drive_type( drives[i].letter, drives[i].type ); } - else if(foundDrive && !drives[i].in_use) + else if (QueryDosDevice(devicename, targetpath, sizeof(targetpath))) { /* remove this drive */ if(!DefineDosDevice(DDD_REMOVE_DEFINITION, devicename, drives[i].unixpath)) @@ -460,36 +436,5 @@ void apply_drive_changes(void) set_drive_type( drives[i].letter, DRIVE_UNKNOWN ); continue; } - else if(drives[i].in_use) /* foundDrive must be false from the above check */ - { - defineDevice = TRUE; - } - - /* adding and modifying are the same steps */ - if(defineDevice) - { - /* define this drive */ - /* DefineDosDevice() requires that NO trailing slash be present */ - snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); - if(!DefineDosDevice(DDD_RAW_TARGET_PATH, devicename, drives[i].unixpath)) - { - WINE_ERR(" unable to define devicename of '%s', targetpath of '%s'\n", - devicename, drives[i].unixpath); - PRINTERROR(); - } - else - { - WINE_TRACE(" added devicename of '%s', targetpath of '%s'\n", - devicename, drives[i].unixpath); - } - } - - if (!drives[i].label || lstrcmpW(drives[i].label, volumeNameBuffer)) - set_drive_label( drives[i].letter, drives[i].label ); - - if (drives[i].serial != serialNumber) - set_drive_serial( drives[i].letter, drives[i].serial ); - - set_drive_type( drives[i].letter, drives[i].type ); } } diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 61fba5f..8443537 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -334,6 +334,7 @@ static void on_add_click(HWND dialog) SetFocus(GetDlgItem(dialog, IDC_LIST_DRIVES)); update_controls(dialog); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); } static void on_remove_click(HWND dialog) @@ -372,6 +373,7 @@ static void on_remove_click(HWND dialog) SetFocus(GetDlgItem(dialog, IDC_LIST_DRIVES)); update_controls(dialog); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); } static void update_controls(HWND dialog) @@ -485,6 +487,7 @@ static void on_edit_changed(HWND dialog, WORD id) WCHAR *label = get_textW(dialog, id); HeapFree(GetProcessHeap(), 0, current_drive->label); current_drive->label = label; + current_drive->modified = TRUE; WINE_TRACE("set label to %s\n", wine_dbgstr_w(current_drive->label)); @@ -500,6 +503,7 @@ static void on_edit_changed(HWND dialog, WORD id) path = get_text(dialog, id); HeapFree(GetProcessHeap(), 0, current_drive->unixpath); current_drive->unixpath = path ? path : strdupA("drive_c"); + current_drive->modified = TRUE; WINE_TRACE("set path to %s\n", current_drive->unixpath); @@ -517,6 +521,7 @@ static void on_edit_changed(HWND dialog, WORD id) serial = get_text(dialog, id); current_drive->serial = strtoul( serial, NULL, 16 ); + current_drive->modified = TRUE; WINE_TRACE("set serial to %08x\n", current_drive->serial); @@ -756,6 +761,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) str = get_textW(dialog, IDC_EDIT_SERIAL); current_drive->serial = strtoulW( str, NULL, 16 ); + current_drive->modified = TRUE; /* TODO: we don't have a device at this point */ @@ -787,6 +793,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) enable_labelserial_box(dialog, mode); current_drive->type = type_pairs[selection].sCode; + current_drive->modified = TRUE; break; } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 91cb7b3..807caf7 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -102,6 +102,7 @@ struct drive DWORD type; /* one of the DRIVE_ constants from winbase.h */ BOOL in_use; + BOOL modified; }; #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A'))

1 0

Stefan Leichter : rpcrt4: Add stub for MesEncodeDynBufferHandleCreate.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 79bbddd431bf61e8377b909cfa80e573d1877ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bbddd431bf61e8377b909cf… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Oct 22 20:41:09 2008 +0200 rpcrt4: Add stub for MesEncodeDynBufferHandleCreate. --- dlls/rpcrt4/ndr_es.c | 13 ++++++++++++- dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 3423d39..b0bb7cc 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -156,7 +156,18 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( *pHandle = (handle_t)pEsMsg; - return RPC_S_OK;} + return RPC_S_OK; +} + +/*********************************************************************** + * MesEncodeDynBufferHandleCreate [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **ppBuffer, + ULONG *pEncodedSize, handle_t *pHandle) +{ + FIXME("%p %p %p stub\n", ppBuffer, pEncodedSize, pHandle); + return RPC_S_OK; +} /*********************************************************************** * MesDecodeBufferHandleCreate [RPCRT4.@] diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 1a56c08..2c86e68 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -99,7 +99,7 @@ @ stub MesBufferHandleReset @ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) -@ stub MesEncodeDynBufferHandleCreate +@ stdcall MesEncodeDynBufferHandleCreate(ptr ptr ptr) @ stdcall MesEncodeFixedBufferHandleCreate(ptr long ptr ptr) @ stdcall MesEncodeIncrementalHandleCreate(ptr ptr ptr ptr) @ stdcall MesHandleFree(ptr)

1 0

Andrey Turkin : wordpad: Do not pass resource ids to MessageBox.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 783b855f422341f94e875b4cbc98fa0a9c03b0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=783b855f422341f94e875b4cb… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 21 11:07:09 2008 +0400 wordpad: Do not pass resource ids to MessageBox. --- programs/wordpad/wordpad.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 754ae50..d06b2d9 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -116,6 +116,25 @@ static void DoLoadStrings(void) LoadStringW(hInstance, STRING_UNITS_CM, units_cmW, MAX_STRING_LEN); } +/* Show a message box with resource strings */ +static int MessageBoxWithResStringW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType) +{ + MSGBOXPARAMSW params; + + params.cbSize = sizeof(params); + params.hwndOwner = hWnd; + params.hInstance = GetModuleHandleW(0); + params.lpszText = lpText; + params.lpszCaption = lpCaption; + params.dwStyle = uType; + params.lpszIcon = NULL; + params.dwContextHelpId = 0; + params.lpfnMsgBoxCallback = NULL; + params.dwLanguageId = 0; + return MessageBoxIndirectW(&params); +} + + static void AddButton(HWND hwndToolBar, int nImage, int nCommand) { TBBUTTON button; @@ -289,7 +308,7 @@ static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize) } else { SetWindowTextW(hwndSizeList, sizeBuffer); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } } @@ -747,8 +766,8 @@ static void DoOpenFile(LPCWSTR szOpenFileName) else if (!memcmp(STG_magic, fileStart, sizeof(STG_magic))) { CloseHandle(hFile); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), wszAppTitle, - MB_OK | MB_ICONEXCLAMATION); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), + wszAppTitle, MB_OK | MB_ICONEXCLAMATION); return; } } @@ -863,7 +882,7 @@ static void DialogSaveFile(void) { if(fileformat_flags(sfn.nFilterIndex-1) != SF_RTF) { - if(MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), + if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) { continue; @@ -1161,7 +1180,7 @@ static void HandleCommandLine(LPWSTR cmdline) } if (opt_print) - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1239,7 +1258,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(ret == -1) { pFr->lCustData = -1; - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, MB_OK | MB_ICONASTERISK); } else { @@ -1503,7 +1522,7 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, if(ret != 3) { - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONASTERISK); return FALSE; } else @@ -1615,7 +1634,7 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP if(!number_from_string(buffer, &number, TRUE)) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } else { @@ -1817,7 +1836,7 @@ static LRESULT OnCreate( HWND hWnd ) hDLL = LoadLibraryW(wszRichEditDll); if(!hDLL) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, MB_OK | MB_ICONEXCLAMATION); PostQuitMessage(1); }

1 0

Andrew Talbot : msxml3: Sign-compare warning fix.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 68f0e06434a28030c70b2324936b62b23113219b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f0e06434a28030c70b23249… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 22 21:43:50 2008 +0100 msxml3: Sign-compare warning fix. --- dlls/msxml3/queryresult.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index d38cc19..e0367bc 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -308,7 +308,7 @@ static HRESULT queryresult_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D { queryresult *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); WCHAR *ptr; - DWORD idx=0; + int idx = 0; for(ptr = name; *ptr && isdigitW(*ptr); ptr++) idx = idx*10 + (*ptr-'0');

1 0

Jeff Zaroyko : dsound/tests: Fix failing propset and capture tests on win98 .
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: b9084bc99f794155154676400bbfc48209177058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9084bc99f794155154676400… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Oct 23 16:18:09 2008 +1100 dsound/tests: Fix failing propset and capture tests on win98. --- dlls/dsound/tests/capture.c | 6 +++++- dlls/dsound/tests/propset.c | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2da7fcc..787d670 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -596,9 +596,13 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc1.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco, (DSCBUFFERDESC*)&bufdesc1,&dscbo,NULL); - ok(rc==DS_OK || broken(rc==E_INVALIDARG), + ok(rc==DS_OK || broken(rc==DSERR_INVALIDPARAM), "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " "%s capture buffer: %08x\n",format_string(&wfx), rc); + if (rc==DSERR_INVALIDPARAM) { + skip("broken driver\n"); + goto EXIT; + } if (rc==DS_OK) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 5d87e89..88ea3dc 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -591,8 +591,14 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_LOCHARDWARE|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); - ok(rc==DS_OK&&primary!=NULL,"IDirectSound_CreateSoundBuffer() failed to " + ok((rc==DS_OK&&primary!=NULL) + || broken(rc==DSERR_INVALIDPARAM), + "IDirectSound_CreateSoundBuffer() failed to " "create a hardware 3D primary buffer: %08x\n",rc); + if(rc==DSERR_INVALIDPARAM) { + skip("broken driver\n"); + goto EXIT; + } if (rc==DS_OK&&primary!=NULL) { ZeroMemory(&wfx, sizeof(wfx)); wfx.wFormatTag=WAVE_FORMAT_PCM;

1 0

Jeff Zaroyko : dsound/tests: Fix a failing capture test on win2k.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 29e49bbe8eaf401b3a80f6949047faaccf78bd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e49bbe8eaf401b3a80f6949… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Oct 23 16:51:09 2008 +1100 dsound/tests: Fix a failing capture test on win2k. --- dlls/dsound/tests/capture.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 787d670..b2a377a 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -567,8 +567,9 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, if (winetest_interactive) trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); - ok(((rc==DS_OK)&&(dscbo!=NULL))||(rc==DSERR_BADFORMAT)|| - ((rc==DSERR_NODRIVER))||(rc==DSERR_ALLOCATED)||(rc==E_INVALIDARG)||(rc==E_FAIL), + ok(((rc==DS_OK)&&(dscbo!=NULL)) + || rc==DSERR_BADFORMAT || rc==DSERR_INVALIDCALL || rc==DSERR_NODRIVER + || rc==DSERR_ALLOCATED || rc==E_INVALIDARG || rc==E_FAIL, "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " "%s capture buffer: %08x\n",format_string(&wfx),rc); if (rc==DS_OK) {

1 0

Paul Vriens : oleacc/tests: Fix some failures on Win98 up to W2K.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: c9b8a28576d046d2c98054c3bf53d402e563d9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b8a28576d046d2c98054c3b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 23 09:36:40 2008 +0200 oleacc/tests: Fix some failures on Win98 up to W2K. --- dlls/oleacc/tests/main.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 66b25af..b977a7b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -24,8 +24,8 @@ static void test_getroletext(void) { INT ret, role; - CHAR buf[2], *buff, buff2[100]; - WCHAR bufW[2], *buffW, buff2W[100]; + CHAR buf[2], *buff; + WCHAR bufW[2], *buffW; /* wrong role number */ ret = GetRoleTextA(-1, NULL, 0); @@ -103,11 +103,26 @@ static void test_getroletext(void) /* check returned length for all roles */ for(role = 0; role <= ROLE_SYSTEM_OUTLINEBUTTON; role++){ + CHAR buff2[100]; + WCHAR buff2W[100]; + + /* NT4 and W2K don't clear the buffer on a non existing role in the A-call */ + memset(buff2, 0, sizeof(buff2)); + ret = GetRoleTextA(role, NULL, 0); + /* Win98 up to W2K miss some of the roles */ + if (role >= ROLE_SYSTEM_SPLITBUTTON) + ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); + else + ok(ret > 0, "Expected the role to be present\n"); + GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), "GetRoleTextA: returned length doesn't match returned buffer for role %d\n", role); + /* Win98 and WinMe don't clear the buffer on a non existing role in the W-call */ + memset(buff2W, 0, sizeof(buff2W)); + ret = GetRoleTextW(role, NULL, 0); GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR)); ok(ret == lstrlenW(buff2W),

1 0

Juan Lang : crypt32: Add stub for CertEnumPhysicalStore.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 5aacc1df9f3ea4965f6d9757d62c708902ae776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aacc1df9f3ea4965f6d9757d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 13:27:31 2008 -0700 crypt32: Add stub for CertEnumPhysicalStore. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c820612..5c0c9a0 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -35,6 +35,7 @@ @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) @ stdcall CertEnumCertificatesInStore(long ptr) +@ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) @ stdcall CertFindCRLInStore(long long long long ptr ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 391a95e..834cc1d 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1330,3 +1330,16 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, SetLastError(rc); return ret; } + +BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%p, %08x, %p, %p): stub\n", pvSystemStore, dwFlags, pvArg, + pfnEnum); + else + FIXME("(%s, %08x, %p, %p): stub\n", debugstr_w((LPCWSTR)pvSystemStore), + dwFlags, pvArg, + pfnEnum); + return FALSE; +}

1 0

Juan Lang : include: Fix typos.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 5a36d4892631863f3ad5c673a2e83111d05567da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a36d4892631863f3ad5c673a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 14:58:59 2008 -0700 include: Fix typos. --- include/wincrypt.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index fa40266..e6ce84a 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -860,10 +860,10 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000 #define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000 -#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00001000 -#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00002000 -#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00004000 -#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00008000 +#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 +#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 +#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00040000 +#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00080000 #define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 0x00000001 #define CERT_TRUST_HAS_KEY_MATCH_ISSUER 0x00000002

1 0

Henri Verbeet : dxgi: Add a stub IDXGIDevice implementation.
by Alexandre Julliard 23 Oct '08

23 Oct '08

Module: wine Branch: master Commit: 9e6f21463e9b6d31259a390c713854a01aad48b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6f21463e9b6d31259a390c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 22 17:41:16 2008 +0200 dxgi: Add a stub IDXGIDevice implementation. --- dlls/dxgi/Makefile.in | 1 + dlls/dxgi/device.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 8 ++ 3 files changed, 171 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 77b2b97..2b01f9d 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = dxgi IMPORTS = dxguid uuid kernel32 C_SRCS = \ + device.c \ dxgi_main.c \ factory.c diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c new file mode 100644 index 0000000..9c7f252 --- /dev/null +++ b/dlls/dxgi/device.c @@ -0,0 +1,162 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +/* IUnknown methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice* iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDXGIObject) + || IsEqualGUID(riid, &IID_IDXGIDevice)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IDXGIDevice* iface) +{ + struct dxgi_device *This = (struct dxgi_device *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice* iface) +{ + struct dxgi_device *This = (struct dxgi_device *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IDXGIObject methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IDXGIDevice* iface, REFGUID guid, const IUnknown *object) +{ + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice* iface, REFIID riid, void **parent) +{ + FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + + return E_NOTIMPL; +} + +/* IDXGIDevice methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IDXGIDevice* iface, IDXGIAdapter **adapter) +{ + FIXME("iface %p, adapter %p stub!\n", iface, adapter); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice* iface, + const DXGI_SURFACE_DESC *desc, UINT surface_count, DXGI_USAGE usage, + const DXGI_SHARED_RESOURCE *shared_resource, IDXGISurface **surface) +{ + FIXME("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p stub!\n", + iface, desc, surface_count, usage, shared_resource, surface); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice* iface, + IUnknown *const *resources, DXGI_RESIDENCY *residency, UINT resource_count) +{ + FIXME("iface %p, resources %p, residency %p, resource_count %u stub!\n", + iface, resources, residency, resource_count); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_SetGPUThreadPriority(IDXGIDevice* iface, INT priority) +{ + FIXME("iface %p, priority %d stub!\n", iface, priority); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IDXGIDevice* iface, INT *priority) +{ + FIXME("iface %p, priority %p stub!\n", iface, priority); + + return E_NOTIMPL; +} + +const struct IDXGIDeviceVtbl dxgi_device_vtbl = +{ + /* IUnknown methods */ + dxgi_device_QueryInterface, + dxgi_device_AddRef, + dxgi_device_Release, + /* IDXGIObject methods */ + dxgi_device_SetPrivateData, + dxgi_device_SetPrivateDataInterface, + dxgi_device_GetPrivateData, + dxgi_device_GetParent, + /* IDXGIDevice methods */ + dxgi_device_GetAdapter, + dxgi_device_CreateSurface, + dxgi_device_QueryResourceResidency, + dxgi_device_SetGPUThreadPriority, + dxgi_device_GetGPUThreadPriority, +}; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 0ca3b41..2d6fbc2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -36,4 +36,12 @@ struct dxgi_factory LONG refcount; }; +/* IDXGIDevice */ +extern const struct IDXGIDeviceVtbl dxgi_device_vtbl; +struct dxgi_device +{ + const struct IDXGIDeviceVtbl *vtbl; + LONG refcount; +}; + #endif /* __WINE_DXGI_PRIVATE_H */

1 0